changed user input handling