added code to say whether or not to use yaw