updated groups to reflect new model