Re speed up (22/31)

Re speed up