Added code to group by CCG