Added some more friend handle stuff