Source Grouping improvement