[REWORD] handshake changes