Implemented new grouping system