temporary stable version for Handshake