Revert "Revert "final add friends""

This reverts commit b3297c5e2eceeb47526ae121d0cce52e756aab13.