Adding joystick support back (part 2)