more code changes on groups...