started to improve the TaskManager