redid 99f3271 and incremented group count