Removed some redundancies from AddFriendFunc