Changed input handling slightly