UPDATE HANDSHAKE. NEEDS REVISION