Adding joystick support back (part 3)