Made more input logic