Angus update for integration with xbox controller and ReCoRVVA wrapper