Small refactor to tasks based on change in base task.