Re speed up (28/31)

Re speed up