Grouping added. Labeling expanded.