Group mgmt overhaul