Handshake integrated into flow