Changed logic of how controller gets the user input