Re speed up (20/31)

Re speed up