Update handshake

preserve