merged Matt's groupings