Rewrote grouping.