Re speed up (19/31)

Re speed up