Adding yaw/pitch to make more sense