Added joystick stuff