half of the group refactoring