Modified input handling