added yaw for envelope control