Some small changes to groupings
My version
Merged