improved TaskManager