Re speed up (15/31)

Re speed up