Re speed up (5/31)

Re speed up