Updated Grouping.java to use concurrent grouping