Re speed up (30/31)

Re speed up