Re speed up (7/31)

Re speed up