update comp and add handshake.address