Tweaking the grouping