Handshake now works partially