Re speed up (6/31)

Re speed up