Adding joystick support back (part 5)