Adding ability to handshake, choke and unchoke