Re speed up (17/31)

Re speed up