Re speed up (13/31)

Re speed up