Refactored inputTasks