Input system in place
fixed merge conflict