cleaned, added addFriend