More changing from uid to friendUid