improved feature grouping