Fix weird mass selectors
Refactored Grouping