Improve grouping.