Merge conflict resolved
Added input handling supprot.