Refactored names & added vectors to input events