Re speed up (16/31)

Re speed up