Updated to the new kinematic