Added the ability to swop Yaw and Roll in controller