Re speed up (23/31)

Re speed up