minor changes to grouping