Adding joystick support back (part 1)