removed failsafe and added joystick method