Improving InputController