Adding additional best_friend
Fixed best_friend conflict