added profiles and friends
merged