Better grouping for tasks
Group completion
Removed queue