Groups overhaul