Changed input handling