base-task-improvements