refactoring, changing from group to role