more code changes for groups...