Finally get the spin/speed right