Better speed up (3/23)

Better speed up