all relationships completed including refactor