Adding joystick support back (part 4)