Added joystick and manual mode control