refactor+inputData