Re speed up (2/31)

Re speed up