refactoring groups
merge conflict again