changed all occurences of controller to joystick