Changed custom format, now with groups
Custom grouping now in grouped format