reintegrated more complex handshakes,etc