Changed friends storage and handshakes
changed handshake