Better speed (10/18)

Better speed