Added more input control