Re speed up (25/31)

Re speed up