Handshaking now works