Re speed up (18/31)

Re speed up