Changed input logic