Finished input handling redesign