Added friends
Merge conflicts, added friends