Re-adding groupingName stuff _again_