Rotation now uses velocity and acceleration