Updated to use Controller rather joypad