Added more user input