Re speed up (4/31)

Re speed up