More work on user input