added grouping for solutions