Better speed (7/18)

Better speed