Overhaul of groups again