Bug with friendlist
Revert "Bug with friendlist"

This reverts commit 9f60275087395d089e58d852df217d93bae6814a.
Fixed friendlist bug - working now