changed to group by TC instead of Build