Re speed up (21/31)

Re speed up