Cleaned up input kinematics