updates to handshake