Changed to support latest artoo-joystick changes