Friends refactoring
Friends refactor