Changed the way user input is chosen