Re speed up (10/31)

Re speed up