Changed the way tasks are assigned