Re speed up (3/31)

Re speed up