Completed groups rework