add handshakes solution