Re speed up (14/31)

Re speed up