Updated the Joystick. Still need some refinement