Joystick mods from stirfire branch