the long awaited YAW fix for CMP kinematics