Improved Yaw and Pitch