Changes because of Input refactoring...