reorganize the tasks some