work on extending TAP handshake