Re speed up (12/31)

Re speed up