Go back to previous version of calculating group, it was more generalized and the performance hit was worth it.