Changes to match groups on main DB