diff --git a/diagrams/simplex-messaging/simplex-creating-alt.mmd b/diagrams/simplex-messaging/simplex-creating-alt.mmd
deleted file mode 100644
index 922a54901..000000000
--- a/diagrams/simplex-messaging/simplex-creating-alt.mmd
+++ /dev/null
@@ -1,16 +0,0 @@
-sequenceDiagram
-  participant B as Bob (sender)
-  participant S as server (conn. ID)
-  participant A as Alice (recipient)
-
-  note over B: out-of-band msg <br> ("public" key SK <br> to sign requests)
-  B -->> A: 1. send out-of-band message to Alice
-
-  note over A: creating connection: <br> - connection ID <br> - key RK to retrieve <br> - key SK to send
-  A ->> S: 2. create secure connection
-  S ->> A: respond with connection URIs
-
-  note over A: out-of-band msg <br> - sender conn. URI <br> - key EK to encrypt
-  A -->> B: 3. send out-of-band message to Bob
-
-  note over S: 4. secure <br> connection ID <br> is established!
diff --git a/diagrams/simplex-messaging/simplex-creating-alt.svg b/diagrams/simplex-messaging/simplex-creating-alt.svg
deleted file mode 100644
index 11a4ed750..000000000
--- a/diagrams/simplex-messaging/simplex-creating-alt.svg
+++ /dev/null
@@ -1,505 +0,0 @@
-<svg id="mermaid-1579462435504" width="100%" xmlns="http://www.w3.org/2000/svg" height="100%" style="max-width:650px;" viewBox="-50 -10 650 629"><style>
-
-
-
-#mermaid-1579462435504 .label {
-  font-family: 'trebuchet ms', verdana, arial;
-  font-family: var(--mermaid-font-family);
-  color: #333; }
-
-#mermaid-1579462435504 .label text {
-  fill: #333; }
-
-#mermaid-1579462435504 .node rect,
-#mermaid-1579462435504 .node circle,
-#mermaid-1579462435504 .node ellipse,
-#mermaid-1579462435504 .node polygon,
-#mermaid-1579462435504 .node path {
-  fill: #ECECFF;
-  stroke: #9370DB;
-  stroke-width: 1px; }
-
-#mermaid-1579462435504 .node .label {
-  text-align: center; }
-
-#mermaid-1579462435504 .node.clickable {
-  cursor: pointer; }
-
-#mermaid-1579462435504 .arrowheadPath {
-  fill: #333333; }
-
-#mermaid-1579462435504 .edgePath .path {
-  stroke: #333333;
-  stroke-width: 1.5px; }
-
-#mermaid-1579462435504 .edgeLabel {
-  background-color: #e8e8e8;
-  text-align: center; }
-
-#mermaid-1579462435504 .cluster rect {
-  fill: #ffffde;
-  stroke: #aaaa33;
-  stroke-width: 1px; }
-
-#mermaid-1579462435504 .cluster text {
-  fill: #333; }
-
-#mermaid-1579462435504 div.mermaidTooltip {
-  position: absolute;
-  text-align: center;
-  max-width: 200px;
-  padding: 2px;
-  font-family: 'trebuchet ms', verdana, arial;
-  font-family: var(--mermaid-font-family);
-  font-size: 12px;
-  background: #ffffde;
-  border: 1px solid #aaaa33;
-  border-radius: 2px;
-  pointer-events: none;
-  z-index: 100; }
-
-#mermaid-1579462435504 .actor {
-  stroke: #CCCCFF;
-  fill: #ECECFF; }
-
-#mermaid-1579462435504 text.actor {
-  fill: black;
-  stroke: none; }
-
-#mermaid-1579462435504 .actor-line {
-  stroke: grey; }
-
-#mermaid-1579462435504 .messageLine0 {
-  stroke-width: 1.5;
-  stroke-dasharray: '2 2';
-  stroke: #333; }
-
-#mermaid-1579462435504 .messageLine1 {
-  stroke-width: 1.5;
-  stroke-dasharray: '2 2';
-  stroke: #333; }
-
-#mermaid-1579462435504 #arrowhead {
-  fill: #333; }
-
-#mermaid-1579462435504 .sequenceNumber {
-  fill: white; }
-
-#mermaid-1579462435504 #sequencenumber {
-  fill: #333; }
-
-#mermaid-1579462435504 #crosshead path {
-  fill: #333 !important;
-  stroke: #333 !important; }
-
-#mermaid-1579462435504 .messageText {
-  fill: #333;
-  stroke: none; }
-
-#mermaid-1579462435504 .labelBox {
-  stroke: #CCCCFF;
-  fill: #ECECFF; }
-
-#mermaid-1579462435504 .labelText {
-  fill: black;
-  stroke: none; }
-
-#mermaid-1579462435504 .loopText {
-  fill: black;
-  stroke: none; }
-
-#mermaid-1579462435504 .loopLine {
-  stroke-width: 2;
-  stroke-dasharray: '2 2';
-  stroke: #CCCCFF; }
-
-#mermaid-1579462435504 .note {
-  stroke: #aaaa33;
-  fill: #fff5ad; }
-
-#mermaid-1579462435504 .noteText {
-  fill: black;
-  stroke: none;
-  font-family: 'trebuchet ms', verdana, arial;
-  font-family: var(--mermaid-font-family);
-  font-size: 14px; }
-
-#mermaid-1579462435504 .activation0 {
-  fill: #f4f4f4;
-  stroke: #666; }
-
-#mermaid-1579462435504 .activation1 {
-  fill: #f4f4f4;
-  stroke: #666; }
-
-#mermaid-1579462435504 .activation2 {
-  fill: #f4f4f4;
-  stroke: #666; }
-
-
-#mermaid-1579462435504 .mermaid-main-font {
-  font-family: "trebuchet ms", verdana, arial;
-  font-family: var(--mermaid-font-family); }
-
-#mermaid-1579462435504 .section {
-  stroke: none;
-  opacity: 0.2; }
-
-#mermaid-1579462435504 .section0 {
-  fill: rgba(102, 102, 255, 0.49); }
-
-#mermaid-1579462435504 .section2 {
-  fill: #fff400; }
-
-#mermaid-1579462435504 .section1,
-#mermaid-1579462435504 .section3 {
-  fill: white;
-  opacity: 0.2; }
-
-#mermaid-1579462435504 .sectionTitle0 {
-  fill: #333; }
-
-#mermaid-1579462435504 .sectionTitle1 {
-  fill: #333; }
-
-#mermaid-1579462435504 .sectionTitle2 {
-  fill: #333; }
-
-#mermaid-1579462435504 .sectionTitle3 {
-  fill: #333; }
-
-#mermaid-1579462435504 .sectionTitle {
-  text-anchor: start;
-  font-size: 11px;
-  text-height: 14px;
-  font-family: 'trebuchet ms', verdana, arial;
-  font-family: var(--mermaid-font-family); }
-
-
-#mermaid-1579462435504 .grid .tick {
-  stroke: lightgrey;
-  opacity: 0.8;
-  shape-rendering: crispEdges; }
-#mermaid-1579462435504   .grid .tick text {
-    font-family: 'trebuchet ms', verdana, arial;
-    font-family: var(--mermaid-font-family); }
-
-#mermaid-1579462435504 .grid path {
-  stroke-width: 0; }
-
-
-#mermaid-1579462435504 .today {
-  fill: none;
-  stroke: red;
-  stroke-width: 2px; }
-
-
-
-#mermaid-1579462435504 .task {
-  stroke-width: 2; }
-
-#mermaid-1579462435504 .taskText {
-  text-anchor: middle;
-  font-family: 'trebuchet ms', verdana, arial;
-  font-family: var(--mermaid-font-family); }
-
-#mermaid-1579462435504 .taskText:not([font-size]) {
-  font-size: 11px; }
-
-#mermaid-1579462435504 .taskTextOutsideRight {
-  fill: black;
-  text-anchor: start;
-  font-size: 11px;
-  font-family: 'trebuchet ms', verdana, arial;
-  font-family: var(--mermaid-font-family); }
-
-#mermaid-1579462435504 .taskTextOutsideLeft {
-  fill: black;
-  text-anchor: end;
-  font-size: 11px; }
-
-
-#mermaid-1579462435504 .task.clickable {
-  cursor: pointer; }
-
-#mermaid-1579462435504 .taskText.clickable {
-  cursor: pointer;
-  fill: #003163 !important;
-  font-weight: bold; }
-
-#mermaid-1579462435504 .taskTextOutsideLeft.clickable {
-  cursor: pointer;
-  fill: #003163 !important;
-  font-weight: bold; }
-
-#mermaid-1579462435504 .taskTextOutsideRight.clickable {
-  cursor: pointer;
-  fill: #003163 !important;
-  font-weight: bold; }
-
-
-#mermaid-1579462435504 .taskText0,
-#mermaid-1579462435504 .taskText1,
-#mermaid-1579462435504 .taskText2,
-#mermaid-1579462435504 .taskText3 {
-  fill: white; }
-
-#mermaid-1579462435504 .task0,
-#mermaid-1579462435504 .task1,
-#mermaid-1579462435504 .task2,
-#mermaid-1579462435504 .task3 {
-  fill: #8a90dd;
-  stroke: #534fbc; }
-
-#mermaid-1579462435504 .taskTextOutside0,
-#mermaid-1579462435504 .taskTextOutside2 {
-  fill: black; }
-
-#mermaid-1579462435504 .taskTextOutside1,
-#mermaid-1579462435504 .taskTextOutside3 {
-  fill: black; }
-
-
-#mermaid-1579462435504 .active0,
-#mermaid-1579462435504 .active1,
-#mermaid-1579462435504 .active2,
-#mermaid-1579462435504 .active3 {
-  fill: #bfc7ff;
-  stroke: #534fbc; }
-
-#mermaid-1579462435504 .activeText0,
-#mermaid-1579462435504 .activeText1,
-#mermaid-1579462435504 .activeText2,
-#mermaid-1579462435504 .activeText3 {
-  fill: black !important; }
-
-
-#mermaid-1579462435504 .done0,
-#mermaid-1579462435504 .done1,
-#mermaid-1579462435504 .done2,
-#mermaid-1579462435504 .done3 {
-  stroke: grey;
-  fill: lightgrey;
-  stroke-width: 2; }
-
-#mermaid-1579462435504 .doneText0,
-#mermaid-1579462435504 .doneText1,
-#mermaid-1579462435504 .doneText2,
-#mermaid-1579462435504 .doneText3 {
-  fill: black !important; }
-
-
-#mermaid-1579462435504 .crit0,
-#mermaid-1579462435504 .crit1,
-#mermaid-1579462435504 .crit2,
-#mermaid-1579462435504 .crit3 {
-  stroke: #ff8888;
-  fill: red;
-  stroke-width: 2; }
-
-#mermaid-1579462435504 .activeCrit0,
-#mermaid-1579462435504 .activeCrit1,
-#mermaid-1579462435504 .activeCrit2,
-#mermaid-1579462435504 .activeCrit3 {
-  stroke: #ff8888;
-  fill: #bfc7ff;
-  stroke-width: 2; }
-
-#mermaid-1579462435504 .doneCrit0,
-#mermaid-1579462435504 .doneCrit1,
-#mermaid-1579462435504 .doneCrit2,
-#mermaid-1579462435504 .doneCrit3 {
-  stroke: #ff8888;
-  fill: lightgrey;
-  stroke-width: 2;
-  cursor: pointer;
-  shape-rendering: crispEdges; }
-
-#mermaid-1579462435504 .milestone {
-  transform: rotate(45deg) scale(0.8, 0.8); }
-
-#mermaid-1579462435504 .milestoneText {
-  font-style: italic; }
-
-#mermaid-1579462435504 .doneCritText0,
-#mermaid-1579462435504 .doneCritText1,
-#mermaid-1579462435504 .doneCritText2,
-#mermaid-1579462435504 .doneCritText3 {
-  fill: black !important; }
-
-#mermaid-1579462435504 .activeCritText0,
-#mermaid-1579462435504 .activeCritText1,
-#mermaid-1579462435504 .activeCritText2,
-#mermaid-1579462435504 .activeCritText3 {
-  fill: black !important; }
-
-#mermaid-1579462435504 .titleText {
-  text-anchor: middle;
-  font-size: 18px;
-  fill: black;
-  font-family: 'trebuchet ms', verdana, arial;
-  font-family: var(--mermaid-font-family); }
-
-#mermaid-1579462435504 g.classGroup text {
-  fill: #9370DB;
-  stroke: none;
-  font-family: 'trebuchet ms', verdana, arial;
-  font-family: var(--mermaid-font-family);
-  font-size: 10px; }
-#mermaid-1579462435504   g.classGroup text .title {
-    font-weight: bolder; }
-
-#mermaid-1579462435504 g.clickable {
-  cursor: pointer; }
-
-#mermaid-1579462435504 g.classGroup rect {
-  fill: #ECECFF;
-  stroke: #9370DB; }
-
-#mermaid-1579462435504 g.classGroup line {
-  stroke: #9370DB;
-  stroke-width: 1; }
-
-#mermaid-1579462435504 .classLabel .box {
-  stroke: none;
-  stroke-width: 0;
-  fill: #ECECFF;
-  opacity: 0.5; }
-
-#mermaid-1579462435504 .classLabel .label {
-  fill: #9370DB;
-  font-size: 10px; }
-
-#mermaid-1579462435504 .relation {
-  stroke: #9370DB;
-  stroke-width: 1;
-  fill: none; }
-
-#mermaid-1579462435504 .dashed-line {
-  stroke-dasharray: 3; }
-
-#mermaid-1579462435504 #compositionStart {
-  fill: #9370DB;
-  stroke: #9370DB;
-  stroke-width: 1; }
-
-#mermaid-1579462435504 #compositionEnd {
-  fill: #9370DB;
-  stroke: #9370DB;
-  stroke-width: 1; }
-
-#mermaid-1579462435504 #aggregationStart {
-  fill: #ECECFF;
-  stroke: #9370DB;
-  stroke-width: 1; }
-
-#mermaid-1579462435504 #aggregationEnd {
-  fill: #ECECFF;
-  stroke: #9370DB;
-  stroke-width: 1; }
-
-#mermaid-1579462435504 #dependencyStart {
-  fill: #9370DB;
-  stroke: #9370DB;
-  stroke-width: 1; }
-
-#mermaid-1579462435504 #dependencyEnd {
-  fill: #9370DB;
-  stroke: #9370DB;
-  stroke-width: 1; }
-
-#mermaid-1579462435504 #extensionStart {
-  fill: #9370DB;
-  stroke: #9370DB;
-  stroke-width: 1; }
-
-#mermaid-1579462435504 #extensionEnd {
-  fill: #9370DB;
-  stroke: #9370DB;
-  stroke-width: 1; }
-
-#mermaid-1579462435504 .commit-id,
-#mermaid-1579462435504 .commit-msg,
-#mermaid-1579462435504 .branch-label {
-  fill: lightgrey;
-  color: lightgrey;
-  font-family: 'trebuchet ms', verdana, arial;
-  font-family: var(--mermaid-font-family); }
-
-#mermaid-1579462435504 .pieTitleText {
-  text-anchor: middle;
-  font-size: 25px;
-  fill: black;
-  font-family: 'trebuchet ms', verdana, arial;
-  font-family: var(--mermaid-font-family); }
-
-#mermaid-1579462435504 .slice {
-  font-family: 'trebuchet ms', verdana, arial;
-  font-family: var(--mermaid-font-family); }
-
-#mermaid-1579462435504 g.stateGroup text {
-  fill: #9370DB;
-  stroke: none;
-  font-size: 10px;
-  font-family: 'trebuchet ms', verdana, arial;
-  font-family: var(--mermaid-font-family); }
-
-#mermaid-1579462435504 g.stateGroup text {
-  fill: #9370DB;
-  stroke: none;
-  font-size: 10px; }
-
-#mermaid-1579462435504 g.stateGroup .state-title {
-  font-weight: bolder;
-  fill: black; }
-
-#mermaid-1579462435504 g.stateGroup rect {
-  fill: #ECECFF;
-  stroke: #9370DB; }
-
-#mermaid-1579462435504 g.stateGroup line {
-  stroke: #9370DB;
-  stroke-width: 1; }
-
-#mermaid-1579462435504 .transition {
-  stroke: #9370DB;
-  stroke-width: 1;
-  fill: none; }
-
-#mermaid-1579462435504 .stateGroup .composit {
-  fill: white;
-  border-bottom: 1px; }
-
-#mermaid-1579462435504 .stateGroup .alt-composit {
-  fill: #e0e0e0;
-  border-bottom: 1px; }
-
-#mermaid-1579462435504 .state-note {
-  stroke: #aaaa33;
-  fill: #fff5ad; }
-#mermaid-1579462435504   .state-note text {
-    fill: black;
-    stroke: none;
-    font-size: 10px; }
-
-#mermaid-1579462435504 .stateLabel .box {
-  stroke: none;
-  stroke-width: 0;
-  fill: #ECECFF;
-  opacity: 0.5; }
-
-#mermaid-1579462435504 .stateLabel text {
-  fill: black;
-  font-size: 10px;
-  font-weight: bold;
-  font-family: 'trebuchet ms', verdana, arial;
-  font-family: var(--mermaid-font-family); }
-
-:root {
-  --mermaid-font-family: '"trebuchet ms", verdana, arial';
-  --mermaid-font-family: "Comic Sans MS", "Comic Sans", cursive; }
-
-:root { --mermaid-font-family: "trebuchet ms", verdana, arial;}</style><style>#mermaid-1579462435504 {
-    color: rgb(0, 0, 0);
-    font: normal normal 400 normal 16px / normal "trebuchet ms", verdana, arial;
-  }</style><g></g><g><line id="actor840" x1="75" y1="5" x2="75" y2="618" class="actor-line" stroke-width="0.5px" stroke="#999"></line><rect x="0" y="0" fill="#eaeaea" stroke="#666" width="150" height="65" rx="3" ry="3" class="actor"></rect><text x="75" y="32.5" dominant-baseline="central" alignment-baseline="central" class="actor" style="text-anchor: middle; font-size: 14px;"><tspan x="75" dy="0">Bob (sender)</tspan></text></g><g><line id="actor841" x1="275" y1="5" x2="275" y2="618" class="actor-line" stroke-width="0.5px" stroke="#999"></line><rect x="200" y="0" fill="#eaeaea" stroke="#666" width="150" height="65" rx="3" ry="3" class="actor"></rect><text x="275" y="32.5" dominant-baseline="central" alignment-baseline="central" class="actor" style="text-anchor: middle; font-size: 14px;"><tspan x="275" dy="0">server (conn. ID)</tspan></text></g><g><line id="actor842" x1="475" y1="5" x2="475" y2="618" class="actor-line" stroke-width="0.5px" stroke="#999"></line><rect x="400" y="0" fill="#eaeaea" stroke="#666" width="150" height="65" rx="3" ry="3" class="actor"></rect><text x="475" y="32.5" dominant-baseline="central" alignment-baseline="central" class="actor" style="text-anchor: middle; font-size: 14px;"><tspan x="475" dy="0">Alice (recipient)</tspan></text></g><defs><marker id="arrowhead" refX="5" refY="2" markerWidth="6" markerHeight="4" orient="auto"><path d="M 0,0 V 4 L6,2 Z"></path></marker></defs><defs><marker id="crosshead" markerWidth="15" markerHeight="8" orient="auto" refX="16" refY="4"><path fill="black" stroke="#000000" stroke-width="1px" d="M 9,2 V 6 L16,4 Z" style="stroke-dasharray: 0, 0;"></path><path fill="none" stroke="#000000" stroke-width="1px" d="M 0,1 L 6,7 M 6,1 L 0,7" style="stroke-dasharray: 0, 0;"></path></marker></defs><defs><marker id="sequencenumber" refX="15" refY="15" markerWidth="60" markerHeight="40" orient="auto"><circle cx="15" cy="15" r="6"></circle></marker></defs><g><rect x="0" y="75" fill="#EDF2AE" stroke="#666" width="150" height="68" rx="0" ry="0" class="note"></rect><text x="-4" y="99" class="noteText"><tspan x="16">out-of-band msg </tspan></text><text x="-4" y="115" class="noteText"><tspan x="16"> ("public" key SK </tspan></text><text x="-4" y="131" class="noteText"><tspan x="16"> to sign requests)</tspan></text></g><g><text x="275" y="171" class="messageText" style="text-anchor: middle;">1. send out-of-band message to Alice</text><line x1="75" y1="178" x2="475" y2="178" class="messageLine1" stroke-width="2" stroke="black" marker-end="url(#arrowhead)" style="stroke-dasharray: 3, 3; fill: none;"></line></g><g><rect x="400" y="188" fill="#EDF2AE" stroke="#666" width="150" height="84" rx="0" ry="0" class="note"></rect><text x="396" y="212" class="noteText"><tspan x="416">creating connection: </tspan></text><text x="396" y="228" class="noteText"><tspan x="416"> - connection ID </tspan></text><text x="396" y="244" class="noteText"><tspan x="416"> - key RK to retrieve </tspan></text><text x="396" y="260" class="noteText"><tspan x="416"> - key SK to send</tspan></text></g><g><text x="375" y="300" class="messageText" style="text-anchor: middle;">2. create secure connection</text><line x1="475" y1="307" x2="275" y2="307" class="messageLine0" stroke-width="2" stroke="black" marker-end="url(#arrowhead)" style="fill: none;"></line></g><g><text x="375" y="335" class="messageText" style="text-anchor: middle;">respond with connection URIs</text><line x1="275" y1="342" x2="475" y2="342" class="messageLine0" stroke-width="2" stroke="black" marker-end="url(#arrowhead)" style="fill: none;"></line></g><g><rect x="400" y="352" fill="#EDF2AE" stroke="#666" width="150" height="68" rx="0" ry="0" class="note"></rect><text x="396" y="376" class="noteText"><tspan x="416">out-of-band msg </tspan></text><text x="396" y="392" class="noteText"><tspan x="416"> - sender conn. URI </tspan></text><text x="396" y="408" class="noteText"><tspan x="416"> - key EK to encrypt</tspan></text></g><g><text x="275" y="448" class="messageText" style="text-anchor: middle;">3. send out-of-band message to Bob</text><line x1="475" y1="455" x2="75" y2="455" class="messageLine1" stroke-width="2" stroke="black" marker-end="url(#arrowhead)" style="stroke-dasharray: 3, 3; fill: none;"></line></g><g><rect x="200" y="465" fill="#EDF2AE" stroke="#666" width="150" height="68" rx="0" ry="0" class="note"></rect><text x="196" y="489" class="noteText"><tspan x="216">4. secure </tspan></text><text x="196" y="505" class="noteText"><tspan x="216"> connection ID </tspan></text><text x="196" y="521" class="noteText"><tspan x="216"> is established!</tspan></text></g><g><rect x="0" y="553" fill="#eaeaea" stroke="#666" width="150" height="65" rx="3" ry="3" class="actor"></rect><text x="75" y="585.5" dominant-baseline="central" alignment-baseline="central" class="actor" style="text-anchor: middle; font-size: 14px;"><tspan x="75" dy="0">Bob (sender)</tspan></text></g><g><rect x="200" y="553" fill="#eaeaea" stroke="#666" width="150" height="65" rx="3" ry="3" class="actor"></rect><text x="275" y="585.5" dominant-baseline="central" alignment-baseline="central" class="actor" style="text-anchor: middle; font-size: 14px;"><tspan x="275" dy="0">server (conn. ID)</tspan></text></g><g><rect x="400" y="553" fill="#eaeaea" stroke="#666" width="150" height="65" rx="3" ry="3" class="actor"></rect><text x="475" y="585.5" dominant-baseline="central" alignment-baseline="central" class="actor" style="text-anchor: middle; font-size: 14px;"><tspan x="475" dy="0">Alice (recipient)</tspan></text></g></svg>
\ No newline at end of file
diff --git a/diagrams/simplex-messaging/simplex-creating.mmd b/diagrams/simplex-messaging/simplex-creating.mmd
index c0edf03ba..4a395b25a 100644
--- a/diagrams/simplex-messaging/simplex-creating.mmd
+++ b/diagrams/simplex-messaging/simplex-creating.mmd
@@ -1,9 +1,9 @@
 sequenceDiagram
   participant B as Bob (sender)
-  participant S as server (conn. ID)
+  participant S as server (conn. RU)
   participant A as Alice (recipient)
 
-  note over A: creating connection <br> (connection ID and <br> "public" key RK <br> for msg retrieval)
+  note over A: creating connection <br> ("public" key RK <br> for msg retrieval)
   A ->> S: 1. create connection
   S ->> A: respond with connection URIs
 
@@ -17,4 +17,4 @@ sequenceDiagram
   note over A: decrypt message <br> ("private" key EK)
   A ->> S: 5. secure connection
 
-  note over S: 6. secure <br> connection ID <br> is established!
+  note over S: 6. secure <br> connection RU <br> is established!
diff --git a/diagrams/simplex-messaging/simplex-creating.svg b/diagrams/simplex-messaging/simplex-creating.svg
index 970a1c7ad..e547359ca 100644
--- a/diagrams/simplex-messaging/simplex-creating.svg
+++ b/diagrams/simplex-messaging/simplex-creating.svg
@@ -1,50 +1,50 @@
-<svg id="mermaid-1579371424557" width="100%" xmlns="http://www.w3.org/2000/svg" height="100%" style="max-width:650px;" viewBox="-50 -10 650 825"><style>
+<svg id="mermaid-1579981452819" width="100%" xmlns="http://www.w3.org/2000/svg" height="100%" style="max-width:650px;" viewBox="-50 -10 650 809"><style>
 
 
 
-#mermaid-1579371424557 .label {
+#mermaid-1579981452819 .label {
   font-family: 'trebuchet ms', verdana, arial;
   font-family: var(--mermaid-font-family);
   color: #333; }
 
-#mermaid-1579371424557 .label text {
+#mermaid-1579981452819 .label text {
   fill: #333; }
 
-#mermaid-1579371424557 .node rect,
-#mermaid-1579371424557 .node circle,
-#mermaid-1579371424557 .node ellipse,
-#mermaid-1579371424557 .node polygon,
-#mermaid-1579371424557 .node path {
+#mermaid-1579981452819 .node rect,
+#mermaid-1579981452819 .node circle,
+#mermaid-1579981452819 .node ellipse,
+#mermaid-1579981452819 .node polygon,
+#mermaid-1579981452819 .node path {
   fill: #ECECFF;
   stroke: #9370DB;
   stroke-width: 1px; }
 
-#mermaid-1579371424557 .node .label {
+#mermaid-1579981452819 .node .label {
   text-align: center; }
 
-#mermaid-1579371424557 .node.clickable {
+#mermaid-1579981452819 .node.clickable {
   cursor: pointer; }
 
-#mermaid-1579371424557 .arrowheadPath {
+#mermaid-1579981452819 .arrowheadPath {
   fill: #333333; }
 
-#mermaid-1579371424557 .edgePath .path {
+#mermaid-1579981452819 .edgePath .path {
   stroke: #333333;
   stroke-width: 1.5px; }
 
-#mermaid-1579371424557 .edgeLabel {
+#mermaid-1579981452819 .edgeLabel {
   background-color: #e8e8e8;
   text-align: center; }
 
-#mermaid-1579371424557 .cluster rect {
+#mermaid-1579981452819 .cluster rect {
   fill: #ffffde;
   stroke: #aaaa33;
   stroke-width: 1px; }
 
-#mermaid-1579371424557 .cluster text {
+#mermaid-1579981452819 .cluster text {
   fill: #333; }
 
-#mermaid-1579371424557 div.mermaidTooltip {
+#mermaid-1579981452819 div.mermaidTooltip {
   position: absolute;
   text-align: center;
   max-width: 200px;
@@ -58,117 +58,117 @@
   pointer-events: none;
   z-index: 100; }
 
-#mermaid-1579371424557 .actor {
+#mermaid-1579981452819 .actor {
   stroke: #CCCCFF;
   fill: #ECECFF; }
 
-#mermaid-1579371424557 text.actor {
+#mermaid-1579981452819 text.actor {
   fill: black;
   stroke: none; }
 
-#mermaid-1579371424557 .actor-line {
+#mermaid-1579981452819 .actor-line {
   stroke: grey; }
 
-#mermaid-1579371424557 .messageLine0 {
+#mermaid-1579981452819 .messageLine0 {
   stroke-width: 1.5;
   stroke-dasharray: '2 2';
   stroke: #333; }
 
-#mermaid-1579371424557 .messageLine1 {
+#mermaid-1579981452819 .messageLine1 {
   stroke-width: 1.5;
   stroke-dasharray: '2 2';
   stroke: #333; }
 
-#mermaid-1579371424557 #arrowhead {
+#mermaid-1579981452819 #arrowhead {
   fill: #333; }
 
-#mermaid-1579371424557 .sequenceNumber {
+#mermaid-1579981452819 .sequenceNumber {
   fill: white; }
 
-#mermaid-1579371424557 #sequencenumber {
+#mermaid-1579981452819 #sequencenumber {
   fill: #333; }
 
-#mermaid-1579371424557 #crosshead path {
+#mermaid-1579981452819 #crosshead path {
   fill: #333 !important;
   stroke: #333 !important; }
 
-#mermaid-1579371424557 .messageText {
+#mermaid-1579981452819 .messageText {
   fill: #333;
   stroke: none; }
 
-#mermaid-1579371424557 .labelBox {
+#mermaid-1579981452819 .labelBox {
   stroke: #CCCCFF;
   fill: #ECECFF; }
 
-#mermaid-1579371424557 .labelText {
+#mermaid-1579981452819 .labelText {
   fill: black;
   stroke: none; }
 
-#mermaid-1579371424557 .loopText {
+#mermaid-1579981452819 .loopText {
   fill: black;
   stroke: none; }
 
-#mermaid-1579371424557 .loopLine {
+#mermaid-1579981452819 .loopLine {
   stroke-width: 2;
   stroke-dasharray: '2 2';
   stroke: #CCCCFF; }
 
-#mermaid-1579371424557 .note {
+#mermaid-1579981452819 .note {
   stroke: #aaaa33;
   fill: #fff5ad; }
 
-#mermaid-1579371424557 .noteText {
+#mermaid-1579981452819 .noteText {
   fill: black;
   stroke: none;
   font-family: 'trebuchet ms', verdana, arial;
   font-family: var(--mermaid-font-family);
   font-size: 14px; }
 
-#mermaid-1579371424557 .activation0 {
+#mermaid-1579981452819 .activation0 {
   fill: #f4f4f4;
   stroke: #666; }
 
-#mermaid-1579371424557 .activation1 {
+#mermaid-1579981452819 .activation1 {
   fill: #f4f4f4;
   stroke: #666; }
 
-#mermaid-1579371424557 .activation2 {
+#mermaid-1579981452819 .activation2 {
   fill: #f4f4f4;
   stroke: #666; }
 
 
-#mermaid-1579371424557 .mermaid-main-font {
+#mermaid-1579981452819 .mermaid-main-font {
   font-family: "trebuchet ms", verdana, arial;
   font-family: var(--mermaid-font-family); }
 
-#mermaid-1579371424557 .section {
+#mermaid-1579981452819 .section {
   stroke: none;
   opacity: 0.2; }
 
-#mermaid-1579371424557 .section0 {
+#mermaid-1579981452819 .section0 {
   fill: rgba(102, 102, 255, 0.49); }
 
-#mermaid-1579371424557 .section2 {
+#mermaid-1579981452819 .section2 {
   fill: #fff400; }
 
-#mermaid-1579371424557 .section1,
-#mermaid-1579371424557 .section3 {
+#mermaid-1579981452819 .section1,
+#mermaid-1579981452819 .section3 {
   fill: white;
   opacity: 0.2; }
 
-#mermaid-1579371424557 .sectionTitle0 {
+#mermaid-1579981452819 .sectionTitle0 {
   fill: #333; }
 
-#mermaid-1579371424557 .sectionTitle1 {
+#mermaid-1579981452819 .sectionTitle1 {
   fill: #333; }
 
-#mermaid-1579371424557 .sectionTitle2 {
+#mermaid-1579981452819 .sectionTitle2 {
   fill: #333; }
 
-#mermaid-1579371424557 .sectionTitle3 {
+#mermaid-1579981452819 .sectionTitle3 {
   fill: #333; }
 
-#mermaid-1579371424557 .sectionTitle {
+#mermaid-1579981452819 .sectionTitle {
   text-anchor: start;
   font-size: 11px;
   text-height: 14px;
@@ -176,319 +176,319 @@
   font-family: var(--mermaid-font-family); }
 
 
-#mermaid-1579371424557 .grid .tick {
+#mermaid-1579981452819 .grid .tick {
   stroke: lightgrey;
   opacity: 0.8;
   shape-rendering: crispEdges; }
-#mermaid-1579371424557   .grid .tick text {
+#mermaid-1579981452819   .grid .tick text {
     font-family: 'trebuchet ms', verdana, arial;
     font-family: var(--mermaid-font-family); }
 
-#mermaid-1579371424557 .grid path {
+#mermaid-1579981452819 .grid path {
   stroke-width: 0; }
 
 
-#mermaid-1579371424557 .today {
+#mermaid-1579981452819 .today {
   fill: none;
   stroke: red;
   stroke-width: 2px; }
 
 
 
-#mermaid-1579371424557 .task {
+#mermaid-1579981452819 .task {
   stroke-width: 2; }
 
-#mermaid-1579371424557 .taskText {
+#mermaid-1579981452819 .taskText {
   text-anchor: middle;
   font-family: 'trebuchet ms', verdana, arial;
   font-family: var(--mermaid-font-family); }
 
-#mermaid-1579371424557 .taskText:not([font-size]) {
+#mermaid-1579981452819 .taskText:not([font-size]) {
   font-size: 11px; }
 
-#mermaid-1579371424557 .taskTextOutsideRight {
+#mermaid-1579981452819 .taskTextOutsideRight {
   fill: black;
   text-anchor: start;
   font-size: 11px;
   font-family: 'trebuchet ms', verdana, arial;
   font-family: var(--mermaid-font-family); }
 
-#mermaid-1579371424557 .taskTextOutsideLeft {
+#mermaid-1579981452819 .taskTextOutsideLeft {
   fill: black;
   text-anchor: end;
   font-size: 11px; }
 
 
-#mermaid-1579371424557 .task.clickable {
+#mermaid-1579981452819 .task.clickable {
   cursor: pointer; }
 
-#mermaid-1579371424557 .taskText.clickable {
+#mermaid-1579981452819 .taskText.clickable {
   cursor: pointer;
   fill: #003163 !important;
   font-weight: bold; }
 
-#mermaid-1579371424557 .taskTextOutsideLeft.clickable {
+#mermaid-1579981452819 .taskTextOutsideLeft.clickable {
   cursor: pointer;
   fill: #003163 !important;
   font-weight: bold; }
 
-#mermaid-1579371424557 .taskTextOutsideRight.clickable {
+#mermaid-1579981452819 .taskTextOutsideRight.clickable {
   cursor: pointer;
   fill: #003163 !important;
   font-weight: bold; }
 
 
-#mermaid-1579371424557 .taskText0,
-#mermaid-1579371424557 .taskText1,
-#mermaid-1579371424557 .taskText2,
-#mermaid-1579371424557 .taskText3 {
+#mermaid-1579981452819 .taskText0,
+#mermaid-1579981452819 .taskText1,
+#mermaid-1579981452819 .taskText2,
+#mermaid-1579981452819 .taskText3 {
   fill: white; }
 
-#mermaid-1579371424557 .task0,
-#mermaid-1579371424557 .task1,
-#mermaid-1579371424557 .task2,
-#mermaid-1579371424557 .task3 {
+#mermaid-1579981452819 .task0,
+#mermaid-1579981452819 .task1,
+#mermaid-1579981452819 .task2,
+#mermaid-1579981452819 .task3 {
   fill: #8a90dd;
   stroke: #534fbc; }
 
-#mermaid-1579371424557 .taskTextOutside0,
-#mermaid-1579371424557 .taskTextOutside2 {
+#mermaid-1579981452819 .taskTextOutside0,
+#mermaid-1579981452819 .taskTextOutside2 {
   fill: black; }
 
-#mermaid-1579371424557 .taskTextOutside1,
-#mermaid-1579371424557 .taskTextOutside3 {
+#mermaid-1579981452819 .taskTextOutside1,
+#mermaid-1579981452819 .taskTextOutside3 {
   fill: black; }
 
 
-#mermaid-1579371424557 .active0,
-#mermaid-1579371424557 .active1,
-#mermaid-1579371424557 .active2,
-#mermaid-1579371424557 .active3 {
+#mermaid-1579981452819 .active0,
+#mermaid-1579981452819 .active1,
+#mermaid-1579981452819 .active2,
+#mermaid-1579981452819 .active3 {
   fill: #bfc7ff;
   stroke: #534fbc; }
 
-#mermaid-1579371424557 .activeText0,
-#mermaid-1579371424557 .activeText1,
-#mermaid-1579371424557 .activeText2,
-#mermaid-1579371424557 .activeText3 {
+#mermaid-1579981452819 .activeText0,
+#mermaid-1579981452819 .activeText1,
+#mermaid-1579981452819 .activeText2,
+#mermaid-1579981452819 .activeText3 {
   fill: black !important; }
 
 
-#mermaid-1579371424557 .done0,
-#mermaid-1579371424557 .done1,
-#mermaid-1579371424557 .done2,
-#mermaid-1579371424557 .done3 {
+#mermaid-1579981452819 .done0,
+#mermaid-1579981452819 .done1,
+#mermaid-1579981452819 .done2,
+#mermaid-1579981452819 .done3 {
   stroke: grey;
   fill: lightgrey;
   stroke-width: 2; }
 
-#mermaid-1579371424557 .doneText0,
-#mermaid-1579371424557 .doneText1,
-#mermaid-1579371424557 .doneText2,
-#mermaid-1579371424557 .doneText3 {
+#mermaid-1579981452819 .doneText0,
+#mermaid-1579981452819 .doneText1,
+#mermaid-1579981452819 .doneText2,
+#mermaid-1579981452819 .doneText3 {
   fill: black !important; }
 
 
-#mermaid-1579371424557 .crit0,
-#mermaid-1579371424557 .crit1,
-#mermaid-1579371424557 .crit2,
-#mermaid-1579371424557 .crit3 {
+#mermaid-1579981452819 .crit0,
+#mermaid-1579981452819 .crit1,
+#mermaid-1579981452819 .crit2,
+#mermaid-1579981452819 .crit3 {
   stroke: #ff8888;
   fill: red;
   stroke-width: 2; }
 
-#mermaid-1579371424557 .activeCrit0,
-#mermaid-1579371424557 .activeCrit1,
-#mermaid-1579371424557 .activeCrit2,
-#mermaid-1579371424557 .activeCrit3 {
+#mermaid-1579981452819 .activeCrit0,
+#mermaid-1579981452819 .activeCrit1,
+#mermaid-1579981452819 .activeCrit2,
+#mermaid-1579981452819 .activeCrit3 {
   stroke: #ff8888;
   fill: #bfc7ff;
   stroke-width: 2; }
 
-#mermaid-1579371424557 .doneCrit0,
-#mermaid-1579371424557 .doneCrit1,
-#mermaid-1579371424557 .doneCrit2,
-#mermaid-1579371424557 .doneCrit3 {
+#mermaid-1579981452819 .doneCrit0,
+#mermaid-1579981452819 .doneCrit1,
+#mermaid-1579981452819 .doneCrit2,
+#mermaid-1579981452819 .doneCrit3 {
   stroke: #ff8888;
   fill: lightgrey;
   stroke-width: 2;
   cursor: pointer;
   shape-rendering: crispEdges; }
 
-#mermaid-1579371424557 .milestone {
+#mermaid-1579981452819 .milestone {
   transform: rotate(45deg) scale(0.8, 0.8); }
 
-#mermaid-1579371424557 .milestoneText {
+#mermaid-1579981452819 .milestoneText {
   font-style: italic; }
 
-#mermaid-1579371424557 .doneCritText0,
-#mermaid-1579371424557 .doneCritText1,
-#mermaid-1579371424557 .doneCritText2,
-#mermaid-1579371424557 .doneCritText3 {
+#mermaid-1579981452819 .doneCritText0,
+#mermaid-1579981452819 .doneCritText1,
+#mermaid-1579981452819 .doneCritText2,
+#mermaid-1579981452819 .doneCritText3 {
   fill: black !important; }
 
-#mermaid-1579371424557 .activeCritText0,
-#mermaid-1579371424557 .activeCritText1,
-#mermaid-1579371424557 .activeCritText2,
-#mermaid-1579371424557 .activeCritText3 {
+#mermaid-1579981452819 .activeCritText0,
+#mermaid-1579981452819 .activeCritText1,
+#mermaid-1579981452819 .activeCritText2,
+#mermaid-1579981452819 .activeCritText3 {
   fill: black !important; }
 
-#mermaid-1579371424557 .titleText {
+#mermaid-1579981452819 .titleText {
   text-anchor: middle;
   font-size: 18px;
   fill: black;
   font-family: 'trebuchet ms', verdana, arial;
   font-family: var(--mermaid-font-family); }
 
-#mermaid-1579371424557 g.classGroup text {
+#mermaid-1579981452819 g.classGroup text {
   fill: #9370DB;
   stroke: none;
   font-family: 'trebuchet ms', verdana, arial;
   font-family: var(--mermaid-font-family);
   font-size: 10px; }
-#mermaid-1579371424557   g.classGroup text .title {
+#mermaid-1579981452819   g.classGroup text .title {
     font-weight: bolder; }
 
-#mermaid-1579371424557 g.clickable {
+#mermaid-1579981452819 g.clickable {
   cursor: pointer; }
 
-#mermaid-1579371424557 g.classGroup rect {
+#mermaid-1579981452819 g.classGroup rect {
   fill: #ECECFF;
   stroke: #9370DB; }
 
-#mermaid-1579371424557 g.classGroup line {
+#mermaid-1579981452819 g.classGroup line {
   stroke: #9370DB;
   stroke-width: 1; }
 
-#mermaid-1579371424557 .classLabel .box {
+#mermaid-1579981452819 .classLabel .box {
   stroke: none;
   stroke-width: 0;
   fill: #ECECFF;
   opacity: 0.5; }
 
-#mermaid-1579371424557 .classLabel .label {
+#mermaid-1579981452819 .classLabel .label {
   fill: #9370DB;
   font-size: 10px; }
 
-#mermaid-1579371424557 .relation {
+#mermaid-1579981452819 .relation {
   stroke: #9370DB;
   stroke-width: 1;
   fill: none; }
 
-#mermaid-1579371424557 .dashed-line {
+#mermaid-1579981452819 .dashed-line {
   stroke-dasharray: 3; }
 
-#mermaid-1579371424557 #compositionStart {
+#mermaid-1579981452819 #compositionStart {
   fill: #9370DB;
   stroke: #9370DB;
   stroke-width: 1; }
 
-#mermaid-1579371424557 #compositionEnd {
+#mermaid-1579981452819 #compositionEnd {
   fill: #9370DB;
   stroke: #9370DB;
   stroke-width: 1; }
 
-#mermaid-1579371424557 #aggregationStart {
+#mermaid-1579981452819 #aggregationStart {
   fill: #ECECFF;
   stroke: #9370DB;
   stroke-width: 1; }
 
-#mermaid-1579371424557 #aggregationEnd {
+#mermaid-1579981452819 #aggregationEnd {
   fill: #ECECFF;
   stroke: #9370DB;
   stroke-width: 1; }
 
-#mermaid-1579371424557 #dependencyStart {
+#mermaid-1579981452819 #dependencyStart {
   fill: #9370DB;
   stroke: #9370DB;
   stroke-width: 1; }
 
-#mermaid-1579371424557 #dependencyEnd {
+#mermaid-1579981452819 #dependencyEnd {
   fill: #9370DB;
   stroke: #9370DB;
   stroke-width: 1; }
 
-#mermaid-1579371424557 #extensionStart {
+#mermaid-1579981452819 #extensionStart {
   fill: #9370DB;
   stroke: #9370DB;
   stroke-width: 1; }
 
-#mermaid-1579371424557 #extensionEnd {
+#mermaid-1579981452819 #extensionEnd {
   fill: #9370DB;
   stroke: #9370DB;
   stroke-width: 1; }
 
-#mermaid-1579371424557 .commit-id,
-#mermaid-1579371424557 .commit-msg,
-#mermaid-1579371424557 .branch-label {
+#mermaid-1579981452819 .commit-id,
+#mermaid-1579981452819 .commit-msg,
+#mermaid-1579981452819 .branch-label {
   fill: lightgrey;
   color: lightgrey;
   font-family: 'trebuchet ms', verdana, arial;
   font-family: var(--mermaid-font-family); }
 
-#mermaid-1579371424557 .pieTitleText {
+#mermaid-1579981452819 .pieTitleText {
   text-anchor: middle;
   font-size: 25px;
   fill: black;
   font-family: 'trebuchet ms', verdana, arial;
   font-family: var(--mermaid-font-family); }
 
-#mermaid-1579371424557 .slice {
+#mermaid-1579981452819 .slice {
   font-family: 'trebuchet ms', verdana, arial;
   font-family: var(--mermaid-font-family); }
 
-#mermaid-1579371424557 g.stateGroup text {
+#mermaid-1579981452819 g.stateGroup text {
   fill: #9370DB;
   stroke: none;
   font-size: 10px;
   font-family: 'trebuchet ms', verdana, arial;
   font-family: var(--mermaid-font-family); }
 
-#mermaid-1579371424557 g.stateGroup text {
+#mermaid-1579981452819 g.stateGroup text {
   fill: #9370DB;
   stroke: none;
   font-size: 10px; }
 
-#mermaid-1579371424557 g.stateGroup .state-title {
+#mermaid-1579981452819 g.stateGroup .state-title {
   font-weight: bolder;
   fill: black; }
 
-#mermaid-1579371424557 g.stateGroup rect {
+#mermaid-1579981452819 g.stateGroup rect {
   fill: #ECECFF;
   stroke: #9370DB; }
 
-#mermaid-1579371424557 g.stateGroup line {
+#mermaid-1579981452819 g.stateGroup line {
   stroke: #9370DB;
   stroke-width: 1; }
 
-#mermaid-1579371424557 .transition {
+#mermaid-1579981452819 .transition {
   stroke: #9370DB;
   stroke-width: 1;
   fill: none; }
 
-#mermaid-1579371424557 .stateGroup .composit {
+#mermaid-1579981452819 .stateGroup .composit {
   fill: white;
   border-bottom: 1px; }
 
-#mermaid-1579371424557 .stateGroup .alt-composit {
+#mermaid-1579981452819 .stateGroup .alt-composit {
   fill: #e0e0e0;
   border-bottom: 1px; }
 
-#mermaid-1579371424557 .state-note {
+#mermaid-1579981452819 .state-note {
   stroke: #aaaa33;
   fill: #fff5ad; }
-#mermaid-1579371424557   .state-note text {
+#mermaid-1579981452819   .state-note text {
     fill: black;
     stroke: none;
     font-size: 10px; }
 
-#mermaid-1579371424557 .stateLabel .box {
+#mermaid-1579981452819 .stateLabel .box {
   stroke: none;
   stroke-width: 0;
   fill: #ECECFF;
   opacity: 0.5; }
 
-#mermaid-1579371424557 .stateLabel text {
+#mermaid-1579981452819 .stateLabel text {
   fill: black;
   font-size: 10px;
   font-weight: bold;
@@ -499,7 +499,7 @@
   --mermaid-font-family: '"trebuchet ms", verdana, arial';
   --mermaid-font-family: "Comic Sans MS", "Comic Sans", cursive; }
 
-:root { --mermaid-font-family: "trebuchet ms", verdana, arial;}</style><style>#mermaid-1579371424557 {
+:root { --mermaid-font-family: "trebuchet ms", verdana, arial;}</style><style>#mermaid-1579981452819 {
     color: rgb(0, 0, 0);
     font: normal normal 400 normal 16px / normal "trebuchet ms", verdana, arial;
-  }</style><g></g><g><line id="actor1680" x1="75" y1="5" x2="75" y2="814" class="actor-line" stroke-width="0.5px" stroke="#999"></line><rect x="0" y="0" fill="#eaeaea" stroke="#666" width="150" height="65" rx="3" ry="3" class="actor"></rect><text x="75" y="32.5" dominant-baseline="central" alignment-baseline="central" class="actor" style="text-anchor: middle; font-size: 14px;"><tspan x="75" dy="0">Bob (sender)</tspan></text></g><g><line id="actor1681" x1="275" y1="5" x2="275" y2="814" class="actor-line" stroke-width="0.5px" stroke="#999"></line><rect x="200" y="0" fill="#eaeaea" stroke="#666" width="150" height="65" rx="3" ry="3" class="actor"></rect><text x="275" y="32.5" dominant-baseline="central" alignment-baseline="central" class="actor" style="text-anchor: middle; font-size: 14px;"><tspan x="275" dy="0">server (conn. ID)</tspan></text></g><g><line id="actor1682" x1="475" y1="5" x2="475" y2="814" class="actor-line" stroke-width="0.5px" stroke="#999"></line><rect x="400" y="0" fill="#eaeaea" stroke="#666" width="150" height="65" rx="3" ry="3" class="actor"></rect><text x="475" y="32.5" dominant-baseline="central" alignment-baseline="central" class="actor" style="text-anchor: middle; font-size: 14px;"><tspan x="475" dy="0">Alice (recipient)</tspan></text></g><defs><marker id="arrowhead" refX="5" refY="2" markerWidth="6" markerHeight="4" orient="auto"><path d="M 0,0 V 4 L6,2 Z"></path></marker></defs><defs><marker id="crosshead" markerWidth="15" markerHeight="8" orient="auto" refX="16" refY="4"><path fill="black" stroke="#000000" stroke-width="1px" d="M 9,2 V 6 L16,4 Z" style="stroke-dasharray: 0, 0;"></path><path fill="none" stroke="#000000" stroke-width="1px" d="M 0,1 L 6,7 M 6,1 L 0,7" style="stroke-dasharray: 0, 0;"></path></marker></defs><defs><marker id="sequencenumber" refX="15" refY="15" markerWidth="60" markerHeight="40" orient="auto"><circle cx="15" cy="15" r="6"></circle></marker></defs><g><rect x="400" y="75" fill="#EDF2AE" stroke="#666" width="150" height="84" rx="0" ry="0" class="note"></rect><text x="396" y="99" class="noteText"><tspan x="416">creating connection </tspan></text><text x="396" y="115" class="noteText"><tspan x="416"> (connection ID and </tspan></text><text x="396" y="131" class="noteText"><tspan x="416"> "public" key RK </tspan></text><text x="396" y="147" class="noteText"><tspan x="416"> for msg retrieval)</tspan></text></g><g><text x="375" y="187" class="messageText" style="text-anchor: middle;">1. create connection</text><line x1="475" y1="194" x2="275" y2="194" class="messageLine0" stroke-width="2" stroke="black" marker-end="url(#arrowhead)" style="fill: none;"></line></g><g><text x="375" y="222" class="messageText" style="text-anchor: middle;">respond with connection URIs</text><line x1="275" y1="229" x2="475" y2="229" class="messageLine0" stroke-width="2" stroke="black" marker-end="url(#arrowhead)" style="fill: none;"></line></g><g><rect x="400" y="239" fill="#EDF2AE" stroke="#666" width="150" height="84" rx="0" ry="0" class="note"></rect><text x="396" y="263" class="noteText"><tspan x="416">out-of-band msg </tspan></text><text x="396" y="279" class="noteText"><tspan x="416"> (sender conn. URI </tspan></text><text x="396" y="295" class="noteText"><tspan x="416"> and "public" key EK </tspan></text><text x="396" y="311" class="noteText"><tspan x="416"> to encrypt msgs)</tspan></text></g><g><text x="275" y="351" class="messageText" style="text-anchor: middle;">2. send out-of-band message</text><line x1="475" y1="358" x2="75" y2="358" class="messageLine1" stroke-width="2" stroke="black" marker-end="url(#arrowhead)" style="stroke-dasharray: 3, 3; fill: none;"></line></g><g><rect x="0" y="368" fill="#EDF2AE" stroke="#666" width="150" height="116" rx="0" ry="0" class="note"></rect><text x="-4" y="392" class="noteText"><tspan x="16">accept connection </tspan></text><text x="-4" y="408" class="noteText"><tspan x="16"> ("public" key SK for </tspan></text><text x="-4" y="424" class="noteText"><tspan x="16">  sending messages </tspan></text><text x="-4" y="440" class="noteText"><tspan x="16"> and any optional </tspan></text><text x="-4" y="456" class="noteText"><tspan x="16"> info encrypted with </tspan></text><text x="-4" y="472" class="noteText"><tspan x="16"> "public" key EK)</tspan></text></g><g><text x="175" y="512" class="messageText" style="text-anchor: middle;">3. confirm connection (req not signed)</text><line x1="75" y1="519" x2="275" y2="519" class="messageLine0" stroke-width="2" stroke="black" marker-end="url(#arrowhead)" style="fill: none;"></line></g><g><text x="375" y="547" class="messageText" style="text-anchor: middle;">4. retrieve Bob's message (RK-signed req)</text><line x1="275" y1="554" x2="475" y2="554" class="messageLine0" stroke-width="2" stroke="black" marker-end="url(#arrowhead)" style="fill: none;"></line></g><g><rect x="400" y="564" fill="#EDF2AE" stroke="#666" width="150" height="52" rx="0" ry="0" class="note"></rect><text x="396" y="588" class="noteText"><tspan x="416">decrypt message </tspan></text><text x="396" y="604" class="noteText"><tspan x="416"> ("private" key EK)</tspan></text></g><g><text x="375" y="644" class="messageText" style="text-anchor: middle;">5. secure connection</text><line x1="475" y1="651" x2="275" y2="651" class="messageLine0" stroke-width="2" stroke="black" marker-end="url(#arrowhead)" style="fill: none;"></line></g><g><rect x="200" y="661" fill="#EDF2AE" stroke="#666" width="150" height="68" rx="0" ry="0" class="note"></rect><text x="196" y="685" class="noteText"><tspan x="216">6. secure </tspan></text><text x="196" y="701" class="noteText"><tspan x="216"> connection ID </tspan></text><text x="196" y="717" class="noteText"><tspan x="216"> is established!</tspan></text></g><g><rect x="0" y="749" fill="#eaeaea" stroke="#666" width="150" height="65" rx="3" ry="3" class="actor"></rect><text x="75" y="781.5" dominant-baseline="central" alignment-baseline="central" class="actor" style="text-anchor: middle; font-size: 14px;"><tspan x="75" dy="0">Bob (sender)</tspan></text></g><g><rect x="200" y="749" fill="#eaeaea" stroke="#666" width="150" height="65" rx="3" ry="3" class="actor"></rect><text x="275" y="781.5" dominant-baseline="central" alignment-baseline="central" class="actor" style="text-anchor: middle; font-size: 14px;"><tspan x="275" dy="0">server (conn. ID)</tspan></text></g><g><rect x="400" y="749" fill="#eaeaea" stroke="#666" width="150" height="65" rx="3" ry="3" class="actor"></rect><text x="475" y="781.5" dominant-baseline="central" alignment-baseline="central" class="actor" style="text-anchor: middle; font-size: 14px;"><tspan x="475" dy="0">Alice (recipient)</tspan></text></g></svg>
\ No newline at end of file
+  }</style><g></g><g><line id="actor306" x1="75" y1="5" x2="75" y2="798" class="actor-line" stroke-width="0.5px" stroke="#999"></line><rect x="0" y="0" fill="#eaeaea" stroke="#666" width="150" height="65" rx="3" ry="3" class="actor"></rect><text x="75" y="32.5" dominant-baseline="central" alignment-baseline="central" class="actor" style="text-anchor: middle; font-size: 14px;"><tspan x="75" dy="0">Bob (sender)</tspan></text></g><g><line id="actor307" x1="275" y1="5" x2="275" y2="798" class="actor-line" stroke-width="0.5px" stroke="#999"></line><rect x="200" y="0" fill="#eaeaea" stroke="#666" width="150" height="65" rx="3" ry="3" class="actor"></rect><text x="275" y="32.5" dominant-baseline="central" alignment-baseline="central" class="actor" style="text-anchor: middle; font-size: 14px;"><tspan x="275" dy="0">server (conn. RU)</tspan></text></g><g><line id="actor308" x1="475" y1="5" x2="475" y2="798" class="actor-line" stroke-width="0.5px" stroke="#999"></line><rect x="400" y="0" fill="#eaeaea" stroke="#666" width="150" height="65" rx="3" ry="3" class="actor"></rect><text x="475" y="32.5" dominant-baseline="central" alignment-baseline="central" class="actor" style="text-anchor: middle; font-size: 14px;"><tspan x="475" dy="0">Alice (recipient)</tspan></text></g><defs><marker id="arrowhead" refX="5" refY="2" markerWidth="6" markerHeight="4" orient="auto"><path d="M 0,0 V 4 L6,2 Z"></path></marker></defs><defs><marker id="crosshead" markerWidth="15" markerHeight="8" orient="auto" refX="16" refY="4"><path fill="black" stroke="#000000" stroke-width="1px" d="M 9,2 V 6 L16,4 Z" style="stroke-dasharray: 0, 0;"></path><path fill="none" stroke="#000000" stroke-width="1px" d="M 0,1 L 6,7 M 6,1 L 0,7" style="stroke-dasharray: 0, 0;"></path></marker></defs><defs><marker id="sequencenumber" refX="15" refY="15" markerWidth="60" markerHeight="40" orient="auto"><circle cx="15" cy="15" r="6"></circle></marker></defs><g><rect x="400" y="75" fill="#EDF2AE" stroke="#666" width="150" height="68" rx="0" ry="0" class="note"></rect><text x="396" y="99" class="noteText"><tspan x="416">creating connection </tspan></text><text x="396" y="115" class="noteText"><tspan x="416"> ("public" key RK </tspan></text><text x="396" y="131" class="noteText"><tspan x="416"> for msg retrieval)</tspan></text></g><g><text x="375" y="171" class="messageText" style="text-anchor: middle;">1. create connection</text><line x1="475" y1="178" x2="275" y2="178" class="messageLine0" stroke-width="2" stroke="black" marker-end="url(#arrowhead)" style="fill: none;"></line></g><g><text x="375" y="206" class="messageText" style="text-anchor: middle;">respond with connection URIs</text><line x1="275" y1="213" x2="475" y2="213" class="messageLine0" stroke-width="2" stroke="black" marker-end="url(#arrowhead)" style="fill: none;"></line></g><g><rect x="400" y="223" fill="#EDF2AE" stroke="#666" width="150" height="84" rx="0" ry="0" class="note"></rect><text x="396" y="247" class="noteText"><tspan x="416">out-of-band msg </tspan></text><text x="396" y="263" class="noteText"><tspan x="416"> (sender conn. URI </tspan></text><text x="396" y="279" class="noteText"><tspan x="416"> and "public" key EK </tspan></text><text x="396" y="295" class="noteText"><tspan x="416"> to encrypt msgs)</tspan></text></g><g><text x="275" y="335" class="messageText" style="text-anchor: middle;">2. send out-of-band message</text><line x1="475" y1="342" x2="75" y2="342" class="messageLine1" stroke-width="2" stroke="black" marker-end="url(#arrowhead)" style="stroke-dasharray: 3, 3; fill: none;"></line></g><g><rect x="0" y="352" fill="#EDF2AE" stroke="#666" width="150" height="116" rx="0" ry="0" class="note"></rect><text x="-4" y="376" class="noteText"><tspan x="16">accept connection </tspan></text><text x="-4" y="392" class="noteText"><tspan x="16"> ("public" key SK for </tspan></text><text x="-4" y="408" class="noteText"><tspan x="16">  sending messages </tspan></text><text x="-4" y="424" class="noteText"><tspan x="16"> and any optional </tspan></text><text x="-4" y="440" class="noteText"><tspan x="16"> info encrypted with </tspan></text><text x="-4" y="456" class="noteText"><tspan x="16"> "public" key EK)</tspan></text></g><g><text x="175" y="496" class="messageText" style="text-anchor: middle;">3. confirm connection (req not signed)</text><line x1="75" y1="503" x2="275" y2="503" class="messageLine0" stroke-width="2" stroke="black" marker-end="url(#arrowhead)" style="fill: none;"></line></g><g><text x="375" y="531" class="messageText" style="text-anchor: middle;">4. retrieve Bob's message (RK-signed req)</text><line x1="275" y1="538" x2="475" y2="538" class="messageLine0" stroke-width="2" stroke="black" marker-end="url(#arrowhead)" style="fill: none;"></line></g><g><rect x="400" y="548" fill="#EDF2AE" stroke="#666" width="150" height="52" rx="0" ry="0" class="note"></rect><text x="396" y="572" class="noteText"><tspan x="416">decrypt message </tspan></text><text x="396" y="588" class="noteText"><tspan x="416"> ("private" key EK)</tspan></text></g><g><text x="375" y="628" class="messageText" style="text-anchor: middle;">5. secure connection</text><line x1="475" y1="635" x2="275" y2="635" class="messageLine0" stroke-width="2" stroke="black" marker-end="url(#arrowhead)" style="fill: none;"></line></g><g><rect x="200" y="645" fill="#EDF2AE" stroke="#666" width="150" height="68" rx="0" ry="0" class="note"></rect><text x="196" y="669" class="noteText"><tspan x="216">6. secure </tspan></text><text x="196" y="685" class="noteText"><tspan x="216"> connection RU </tspan></text><text x="196" y="701" class="noteText"><tspan x="216"> is established!</tspan></text></g><g><rect x="0" y="733" fill="#eaeaea" stroke="#666" width="150" height="65" rx="3" ry="3" class="actor"></rect><text x="75" y="765.5" dominant-baseline="central" alignment-baseline="central" class="actor" style="text-anchor: middle; font-size: 14px;"><tspan x="75" dy="0">Bob (sender)</tspan></text></g><g><rect x="200" y="733" fill="#eaeaea" stroke="#666" width="150" height="65" rx="3" ry="3" class="actor"></rect><text x="275" y="765.5" dominant-baseline="central" alignment-baseline="central" class="actor" style="text-anchor: middle; font-size: 14px;"><tspan x="275" dy="0">server (conn. RU)</tspan></text></g><g><rect x="400" y="733" fill="#eaeaea" stroke="#666" width="150" height="65" rx="3" ry="3" class="actor"></rect><text x="475" y="765.5" dominant-baseline="central" alignment-baseline="central" class="actor" style="text-anchor: middle; font-size: 14px;"><tspan x="475" dy="0">Alice (recipient)</tspan></text></g></svg>
\ No newline at end of file
diff --git a/diagrams/simplex-messaging/simplex-using.mmd b/diagrams/simplex-messaging/simplex-using.mmd
index c2b88bb7c..d23567b42 100644
--- a/diagrams/simplex-messaging/simplex-using.mmd
+++ b/diagrams/simplex-messaging/simplex-using.mmd
@@ -1,10 +1,10 @@
 sequenceDiagram
   participant B as Bob (sender)
-  participant S as server (conn. ID)
+  participant S as server (conn. RU)
   participant A as Alice (recipient)
 
   note over B: encrypt message <br> ("public" key EK)
-  B ->> S: 1. send message (SK-signed req)
+  B ->> S: 1. send message to SU (SK-signed req)
 
-  S ->> A: 2. retrieve messages (RK-signed req)
+  S ->> A: 2. retrieve messages from RU (RK-signed req)
   note over A: decrypt message <br> ("private" key EK)
diff --git a/diagrams/simplex-messaging/simplex-using.svg b/diagrams/simplex-messaging/simplex-using.svg
index 8ecf95742..9200f2756 100644
--- a/diagrams/simplex-messaging/simplex-using.svg
+++ b/diagrams/simplex-messaging/simplex-using.svg
@@ -1,50 +1,50 @@
-<svg id="mermaid-1579371509656" width="100%" xmlns="http://www.w3.org/2000/svg" height="100%" style="max-width:650px;" viewBox="-50 -10 650 355"><style>
+<svg id="mermaid-1579982240806" width="100%" xmlns="http://www.w3.org/2000/svg" height="100%" style="max-width:650px;" viewBox="-50 -10 650 355"><style>
 
 
 
-#mermaid-1579371509656 .label {
+#mermaid-1579982240806 .label {
   font-family: 'trebuchet ms', verdana, arial;
   font-family: var(--mermaid-font-family);
   color: #333; }
 
-#mermaid-1579371509656 .label text {
+#mermaid-1579982240806 .label text {
   fill: #333; }
 
-#mermaid-1579371509656 .node rect,
-#mermaid-1579371509656 .node circle,
-#mermaid-1579371509656 .node ellipse,
-#mermaid-1579371509656 .node polygon,
-#mermaid-1579371509656 .node path {
+#mermaid-1579982240806 .node rect,
+#mermaid-1579982240806 .node circle,
+#mermaid-1579982240806 .node ellipse,
+#mermaid-1579982240806 .node polygon,
+#mermaid-1579982240806 .node path {
   fill: #ECECFF;
   stroke: #9370DB;
   stroke-width: 1px; }
 
-#mermaid-1579371509656 .node .label {
+#mermaid-1579982240806 .node .label {
   text-align: center; }
 
-#mermaid-1579371509656 .node.clickable {
+#mermaid-1579982240806 .node.clickable {
   cursor: pointer; }
 
-#mermaid-1579371509656 .arrowheadPath {
+#mermaid-1579982240806 .arrowheadPath {
   fill: #333333; }
 
-#mermaid-1579371509656 .edgePath .path {
+#mermaid-1579982240806 .edgePath .path {
   stroke: #333333;
   stroke-width: 1.5px; }
 
-#mermaid-1579371509656 .edgeLabel {
+#mermaid-1579982240806 .edgeLabel {
   background-color: #e8e8e8;
   text-align: center; }
 
-#mermaid-1579371509656 .cluster rect {
+#mermaid-1579982240806 .cluster rect {
   fill: #ffffde;
   stroke: #aaaa33;
   stroke-width: 1px; }
 
-#mermaid-1579371509656 .cluster text {
+#mermaid-1579982240806 .cluster text {
   fill: #333; }
 
-#mermaid-1579371509656 div.mermaidTooltip {
+#mermaid-1579982240806 div.mermaidTooltip {
   position: absolute;
   text-align: center;
   max-width: 200px;
@@ -58,117 +58,117 @@
   pointer-events: none;
   z-index: 100; }
 
-#mermaid-1579371509656 .actor {
+#mermaid-1579982240806 .actor {
   stroke: #CCCCFF;
   fill: #ECECFF; }
 
-#mermaid-1579371509656 text.actor {
+#mermaid-1579982240806 text.actor {
   fill: black;
   stroke: none; }
 
-#mermaid-1579371509656 .actor-line {
+#mermaid-1579982240806 .actor-line {
   stroke: grey; }
 
-#mermaid-1579371509656 .messageLine0 {
+#mermaid-1579982240806 .messageLine0 {
   stroke-width: 1.5;
   stroke-dasharray: '2 2';
   stroke: #333; }
 
-#mermaid-1579371509656 .messageLine1 {
+#mermaid-1579982240806 .messageLine1 {
   stroke-width: 1.5;
   stroke-dasharray: '2 2';
   stroke: #333; }
 
-#mermaid-1579371509656 #arrowhead {
+#mermaid-1579982240806 #arrowhead {
   fill: #333; }
 
-#mermaid-1579371509656 .sequenceNumber {
+#mermaid-1579982240806 .sequenceNumber {
   fill: white; }
 
-#mermaid-1579371509656 #sequencenumber {
+#mermaid-1579982240806 #sequencenumber {
   fill: #333; }
 
-#mermaid-1579371509656 #crosshead path {
+#mermaid-1579982240806 #crosshead path {
   fill: #333 !important;
   stroke: #333 !important; }
 
-#mermaid-1579371509656 .messageText {
+#mermaid-1579982240806 .messageText {
   fill: #333;
   stroke: none; }
 
-#mermaid-1579371509656 .labelBox {
+#mermaid-1579982240806 .labelBox {
   stroke: #CCCCFF;
   fill: #ECECFF; }
 
-#mermaid-1579371509656 .labelText {
+#mermaid-1579982240806 .labelText {
   fill: black;
   stroke: none; }
 
-#mermaid-1579371509656 .loopText {
+#mermaid-1579982240806 .loopText {
   fill: black;
   stroke: none; }
 
-#mermaid-1579371509656 .loopLine {
+#mermaid-1579982240806 .loopLine {
   stroke-width: 2;
   stroke-dasharray: '2 2';
   stroke: #CCCCFF; }
 
-#mermaid-1579371509656 .note {
+#mermaid-1579982240806 .note {
   stroke: #aaaa33;
   fill: #fff5ad; }
 
-#mermaid-1579371509656 .noteText {
+#mermaid-1579982240806 .noteText {
   fill: black;
   stroke: none;
   font-family: 'trebuchet ms', verdana, arial;
   font-family: var(--mermaid-font-family);
   font-size: 14px; }
 
-#mermaid-1579371509656 .activation0 {
+#mermaid-1579982240806 .activation0 {
   fill: #f4f4f4;
   stroke: #666; }
 
-#mermaid-1579371509656 .activation1 {
+#mermaid-1579982240806 .activation1 {
   fill: #f4f4f4;
   stroke: #666; }
 
-#mermaid-1579371509656 .activation2 {
+#mermaid-1579982240806 .activation2 {
   fill: #f4f4f4;
   stroke: #666; }
 
 
-#mermaid-1579371509656 .mermaid-main-font {
+#mermaid-1579982240806 .mermaid-main-font {
   font-family: "trebuchet ms", verdana, arial;
   font-family: var(--mermaid-font-family); }
 
-#mermaid-1579371509656 .section {
+#mermaid-1579982240806 .section {
   stroke: none;
   opacity: 0.2; }
 
-#mermaid-1579371509656 .section0 {
+#mermaid-1579982240806 .section0 {
   fill: rgba(102, 102, 255, 0.49); }
 
-#mermaid-1579371509656 .section2 {
+#mermaid-1579982240806 .section2 {
   fill: #fff400; }
 
-#mermaid-1579371509656 .section1,
-#mermaid-1579371509656 .section3 {
+#mermaid-1579982240806 .section1,
+#mermaid-1579982240806 .section3 {
   fill: white;
   opacity: 0.2; }
 
-#mermaid-1579371509656 .sectionTitle0 {
+#mermaid-1579982240806 .sectionTitle0 {
   fill: #333; }
 
-#mermaid-1579371509656 .sectionTitle1 {
+#mermaid-1579982240806 .sectionTitle1 {
   fill: #333; }
 
-#mermaid-1579371509656 .sectionTitle2 {
+#mermaid-1579982240806 .sectionTitle2 {
   fill: #333; }
 
-#mermaid-1579371509656 .sectionTitle3 {
+#mermaid-1579982240806 .sectionTitle3 {
   fill: #333; }
 
-#mermaid-1579371509656 .sectionTitle {
+#mermaid-1579982240806 .sectionTitle {
   text-anchor: start;
   font-size: 11px;
   text-height: 14px;
@@ -176,319 +176,319 @@
   font-family: var(--mermaid-font-family); }
 
 
-#mermaid-1579371509656 .grid .tick {
+#mermaid-1579982240806 .grid .tick {
   stroke: lightgrey;
   opacity: 0.8;
   shape-rendering: crispEdges; }
-#mermaid-1579371509656   .grid .tick text {
+#mermaid-1579982240806   .grid .tick text {
     font-family: 'trebuchet ms', verdana, arial;
     font-family: var(--mermaid-font-family); }
 
-#mermaid-1579371509656 .grid path {
+#mermaid-1579982240806 .grid path {
   stroke-width: 0; }
 
 
-#mermaid-1579371509656 .today {
+#mermaid-1579982240806 .today {
   fill: none;
   stroke: red;
   stroke-width: 2px; }
 
 
 
-#mermaid-1579371509656 .task {
+#mermaid-1579982240806 .task {
   stroke-width: 2; }
 
-#mermaid-1579371509656 .taskText {
+#mermaid-1579982240806 .taskText {
   text-anchor: middle;
   font-family: 'trebuchet ms', verdana, arial;
   font-family: var(--mermaid-font-family); }
 
-#mermaid-1579371509656 .taskText:not([font-size]) {
+#mermaid-1579982240806 .taskText:not([font-size]) {
   font-size: 11px; }
 
-#mermaid-1579371509656 .taskTextOutsideRight {
+#mermaid-1579982240806 .taskTextOutsideRight {
   fill: black;
   text-anchor: start;
   font-size: 11px;
   font-family: 'trebuchet ms', verdana, arial;
   font-family: var(--mermaid-font-family); }
 
-#mermaid-1579371509656 .taskTextOutsideLeft {
+#mermaid-1579982240806 .taskTextOutsideLeft {
   fill: black;
   text-anchor: end;
   font-size: 11px; }
 
 
-#mermaid-1579371509656 .task.clickable {
+#mermaid-1579982240806 .task.clickable {
   cursor: pointer; }
 
-#mermaid-1579371509656 .taskText.clickable {
+#mermaid-1579982240806 .taskText.clickable {
   cursor: pointer;
   fill: #003163 !important;
   font-weight: bold; }
 
-#mermaid-1579371509656 .taskTextOutsideLeft.clickable {
+#mermaid-1579982240806 .taskTextOutsideLeft.clickable {
   cursor: pointer;
   fill: #003163 !important;
   font-weight: bold; }
 
-#mermaid-1579371509656 .taskTextOutsideRight.clickable {
+#mermaid-1579982240806 .taskTextOutsideRight.clickable {
   cursor: pointer;
   fill: #003163 !important;
   font-weight: bold; }
 
 
-#mermaid-1579371509656 .taskText0,
-#mermaid-1579371509656 .taskText1,
-#mermaid-1579371509656 .taskText2,
-#mermaid-1579371509656 .taskText3 {
+#mermaid-1579982240806 .taskText0,
+#mermaid-1579982240806 .taskText1,
+#mermaid-1579982240806 .taskText2,
+#mermaid-1579982240806 .taskText3 {
   fill: white; }
 
-#mermaid-1579371509656 .task0,
-#mermaid-1579371509656 .task1,
-#mermaid-1579371509656 .task2,
-#mermaid-1579371509656 .task3 {
+#mermaid-1579982240806 .task0,
+#mermaid-1579982240806 .task1,
+#mermaid-1579982240806 .task2,
+#mermaid-1579982240806 .task3 {
   fill: #8a90dd;
   stroke: #534fbc; }
 
-#mermaid-1579371509656 .taskTextOutside0,
-#mermaid-1579371509656 .taskTextOutside2 {
+#mermaid-1579982240806 .taskTextOutside0,
+#mermaid-1579982240806 .taskTextOutside2 {
   fill: black; }
 
-#mermaid-1579371509656 .taskTextOutside1,
-#mermaid-1579371509656 .taskTextOutside3 {
+#mermaid-1579982240806 .taskTextOutside1,
+#mermaid-1579982240806 .taskTextOutside3 {
   fill: black; }
 
 
-#mermaid-1579371509656 .active0,
-#mermaid-1579371509656 .active1,
-#mermaid-1579371509656 .active2,
-#mermaid-1579371509656 .active3 {
+#mermaid-1579982240806 .active0,
+#mermaid-1579982240806 .active1,
+#mermaid-1579982240806 .active2,
+#mermaid-1579982240806 .active3 {
   fill: #bfc7ff;
   stroke: #534fbc; }
 
-#mermaid-1579371509656 .activeText0,
-#mermaid-1579371509656 .activeText1,
-#mermaid-1579371509656 .activeText2,
-#mermaid-1579371509656 .activeText3 {
+#mermaid-1579982240806 .activeText0,
+#mermaid-1579982240806 .activeText1,
+#mermaid-1579982240806 .activeText2,
+#mermaid-1579982240806 .activeText3 {
   fill: black !important; }
 
 
-#mermaid-1579371509656 .done0,
-#mermaid-1579371509656 .done1,
-#mermaid-1579371509656 .done2,
-#mermaid-1579371509656 .done3 {
+#mermaid-1579982240806 .done0,
+#mermaid-1579982240806 .done1,
+#mermaid-1579982240806 .done2,
+#mermaid-1579982240806 .done3 {
   stroke: grey;
   fill: lightgrey;
   stroke-width: 2; }
 
-#mermaid-1579371509656 .doneText0,
-#mermaid-1579371509656 .doneText1,
-#mermaid-1579371509656 .doneText2,
-#mermaid-1579371509656 .doneText3 {
+#mermaid-1579982240806 .doneText0,
+#mermaid-1579982240806 .doneText1,
+#mermaid-1579982240806 .doneText2,
+#mermaid-1579982240806 .doneText3 {
   fill: black !important; }
 
 
-#mermaid-1579371509656 .crit0,
-#mermaid-1579371509656 .crit1,
-#mermaid-1579371509656 .crit2,
-#mermaid-1579371509656 .crit3 {
+#mermaid-1579982240806 .crit0,
+#mermaid-1579982240806 .crit1,
+#mermaid-1579982240806 .crit2,
+#mermaid-1579982240806 .crit3 {
   stroke: #ff8888;
   fill: red;
   stroke-width: 2; }
 
-#mermaid-1579371509656 .activeCrit0,
-#mermaid-1579371509656 .activeCrit1,
-#mermaid-1579371509656 .activeCrit2,
-#mermaid-1579371509656 .activeCrit3 {
+#mermaid-1579982240806 .activeCrit0,
+#mermaid-1579982240806 .activeCrit1,
+#mermaid-1579982240806 .activeCrit2,
+#mermaid-1579982240806 .activeCrit3 {
   stroke: #ff8888;
   fill: #bfc7ff;
   stroke-width: 2; }
 
-#mermaid-1579371509656 .doneCrit0,
-#mermaid-1579371509656 .doneCrit1,
-#mermaid-1579371509656 .doneCrit2,
-#mermaid-1579371509656 .doneCrit3 {
+#mermaid-1579982240806 .doneCrit0,
+#mermaid-1579982240806 .doneCrit1,
+#mermaid-1579982240806 .doneCrit2,
+#mermaid-1579982240806 .doneCrit3 {
   stroke: #ff8888;
   fill: lightgrey;
   stroke-width: 2;
   cursor: pointer;
   shape-rendering: crispEdges; }
 
-#mermaid-1579371509656 .milestone {
+#mermaid-1579982240806 .milestone {
   transform: rotate(45deg) scale(0.8, 0.8); }
 
-#mermaid-1579371509656 .milestoneText {
+#mermaid-1579982240806 .milestoneText {
   font-style: italic; }
 
-#mermaid-1579371509656 .doneCritText0,
-#mermaid-1579371509656 .doneCritText1,
-#mermaid-1579371509656 .doneCritText2,
-#mermaid-1579371509656 .doneCritText3 {
+#mermaid-1579982240806 .doneCritText0,
+#mermaid-1579982240806 .doneCritText1,
+#mermaid-1579982240806 .doneCritText2,
+#mermaid-1579982240806 .doneCritText3 {
   fill: black !important; }
 
-#mermaid-1579371509656 .activeCritText0,
-#mermaid-1579371509656 .activeCritText1,
-#mermaid-1579371509656 .activeCritText2,
-#mermaid-1579371509656 .activeCritText3 {
+#mermaid-1579982240806 .activeCritText0,
+#mermaid-1579982240806 .activeCritText1,
+#mermaid-1579982240806 .activeCritText2,
+#mermaid-1579982240806 .activeCritText3 {
   fill: black !important; }
 
-#mermaid-1579371509656 .titleText {
+#mermaid-1579982240806 .titleText {
   text-anchor: middle;
   font-size: 18px;
   fill: black;
   font-family: 'trebuchet ms', verdana, arial;
   font-family: var(--mermaid-font-family); }
 
-#mermaid-1579371509656 g.classGroup text {
+#mermaid-1579982240806 g.classGroup text {
   fill: #9370DB;
   stroke: none;
   font-family: 'trebuchet ms', verdana, arial;
   font-family: var(--mermaid-font-family);
   font-size: 10px; }
-#mermaid-1579371509656   g.classGroup text .title {
+#mermaid-1579982240806   g.classGroup text .title {
     font-weight: bolder; }
 
-#mermaid-1579371509656 g.clickable {
+#mermaid-1579982240806 g.clickable {
   cursor: pointer; }
 
-#mermaid-1579371509656 g.classGroup rect {
+#mermaid-1579982240806 g.classGroup rect {
   fill: #ECECFF;
   stroke: #9370DB; }
 
-#mermaid-1579371509656 g.classGroup line {
+#mermaid-1579982240806 g.classGroup line {
   stroke: #9370DB;
   stroke-width: 1; }
 
-#mermaid-1579371509656 .classLabel .box {
+#mermaid-1579982240806 .classLabel .box {
   stroke: none;
   stroke-width: 0;
   fill: #ECECFF;
   opacity: 0.5; }
 
-#mermaid-1579371509656 .classLabel .label {
+#mermaid-1579982240806 .classLabel .label {
   fill: #9370DB;
   font-size: 10px; }
 
-#mermaid-1579371509656 .relation {
+#mermaid-1579982240806 .relation {
   stroke: #9370DB;
   stroke-width: 1;
   fill: none; }
 
-#mermaid-1579371509656 .dashed-line {
+#mermaid-1579982240806 .dashed-line {
   stroke-dasharray: 3; }
 
-#mermaid-1579371509656 #compositionStart {
+#mermaid-1579982240806 #compositionStart {
   fill: #9370DB;
   stroke: #9370DB;
   stroke-width: 1; }
 
-#mermaid-1579371509656 #compositionEnd {
+#mermaid-1579982240806 #compositionEnd {
   fill: #9370DB;
   stroke: #9370DB;
   stroke-width: 1; }
 
-#mermaid-1579371509656 #aggregationStart {
+#mermaid-1579982240806 #aggregationStart {
   fill: #ECECFF;
   stroke: #9370DB;
   stroke-width: 1; }
 
-#mermaid-1579371509656 #aggregationEnd {
+#mermaid-1579982240806 #aggregationEnd {
   fill: #ECECFF;
   stroke: #9370DB;
   stroke-width: 1; }
 
-#mermaid-1579371509656 #dependencyStart {
+#mermaid-1579982240806 #dependencyStart {
   fill: #9370DB;
   stroke: #9370DB;
   stroke-width: 1; }
 
-#mermaid-1579371509656 #dependencyEnd {
+#mermaid-1579982240806 #dependencyEnd {
   fill: #9370DB;
   stroke: #9370DB;
   stroke-width: 1; }
 
-#mermaid-1579371509656 #extensionStart {
+#mermaid-1579982240806 #extensionStart {
   fill: #9370DB;
   stroke: #9370DB;
   stroke-width: 1; }
 
-#mermaid-1579371509656 #extensionEnd {
+#mermaid-1579982240806 #extensionEnd {
   fill: #9370DB;
   stroke: #9370DB;
   stroke-width: 1; }
 
-#mermaid-1579371509656 .commit-id,
-#mermaid-1579371509656 .commit-msg,
-#mermaid-1579371509656 .branch-label {
+#mermaid-1579982240806 .commit-id,
+#mermaid-1579982240806 .commit-msg,
+#mermaid-1579982240806 .branch-label {
   fill: lightgrey;
   color: lightgrey;
   font-family: 'trebuchet ms', verdana, arial;
   font-family: var(--mermaid-font-family); }
 
-#mermaid-1579371509656 .pieTitleText {
+#mermaid-1579982240806 .pieTitleText {
   text-anchor: middle;
   font-size: 25px;
   fill: black;
   font-family: 'trebuchet ms', verdana, arial;
   font-family: var(--mermaid-font-family); }
 
-#mermaid-1579371509656 .slice {
+#mermaid-1579982240806 .slice {
   font-family: 'trebuchet ms', verdana, arial;
   font-family: var(--mermaid-font-family); }
 
-#mermaid-1579371509656 g.stateGroup text {
+#mermaid-1579982240806 g.stateGroup text {
   fill: #9370DB;
   stroke: none;
   font-size: 10px;
   font-family: 'trebuchet ms', verdana, arial;
   font-family: var(--mermaid-font-family); }
 
-#mermaid-1579371509656 g.stateGroup text {
+#mermaid-1579982240806 g.stateGroup text {
   fill: #9370DB;
   stroke: none;
   font-size: 10px; }
 
-#mermaid-1579371509656 g.stateGroup .state-title {
+#mermaid-1579982240806 g.stateGroup .state-title {
   font-weight: bolder;
   fill: black; }
 
-#mermaid-1579371509656 g.stateGroup rect {
+#mermaid-1579982240806 g.stateGroup rect {
   fill: #ECECFF;
   stroke: #9370DB; }
 
-#mermaid-1579371509656 g.stateGroup line {
+#mermaid-1579982240806 g.stateGroup line {
   stroke: #9370DB;
   stroke-width: 1; }
 
-#mermaid-1579371509656 .transition {
+#mermaid-1579982240806 .transition {
   stroke: #9370DB;
   stroke-width: 1;
   fill: none; }
 
-#mermaid-1579371509656 .stateGroup .composit {
+#mermaid-1579982240806 .stateGroup .composit {
   fill: white;
   border-bottom: 1px; }
 
-#mermaid-1579371509656 .stateGroup .alt-composit {
+#mermaid-1579982240806 .stateGroup .alt-composit {
   fill: #e0e0e0;
   border-bottom: 1px; }
 
-#mermaid-1579371509656 .state-note {
+#mermaid-1579982240806 .state-note {
   stroke: #aaaa33;
   fill: #fff5ad; }
-#mermaid-1579371509656   .state-note text {
+#mermaid-1579982240806   .state-note text {
     fill: black;
     stroke: none;
     font-size: 10px; }
 
-#mermaid-1579371509656 .stateLabel .box {
+#mermaid-1579982240806 .stateLabel .box {
   stroke: none;
   stroke-width: 0;
   fill: #ECECFF;
   opacity: 0.5; }
 
-#mermaid-1579371509656 .stateLabel text {
+#mermaid-1579982240806 .stateLabel text {
   fill: black;
   font-size: 10px;
   font-weight: bold;
@@ -499,7 +499,7 @@
   --mermaid-font-family: '"trebuchet ms", verdana, arial';
   --mermaid-font-family: "Comic Sans MS", "Comic Sans", cursive; }
 
-:root { --mermaid-font-family: "trebuchet ms", verdana, arial;}</style><style>#mermaid-1579371509656 {
+:root { --mermaid-font-family: "trebuchet ms", verdana, arial;}</style><style>#mermaid-1579982240806 {
     color: rgb(0, 0, 0);
     font: normal normal 400 normal 16px / normal "trebuchet ms", verdana, arial;
-  }</style><g></g><g><line id="actor1692" x1="75" y1="5" x2="75" y2="344" class="actor-line" stroke-width="0.5px" stroke="#999"></line><rect x="0" y="0" fill="#eaeaea" stroke="#666" width="150" height="65" rx="3" ry="3" class="actor"></rect><text x="75" y="32.5" dominant-baseline="central" alignment-baseline="central" class="actor" style="text-anchor: middle; font-size: 14px;"><tspan x="75" dy="0">Bob (sender)</tspan></text></g><g><line id="actor1693" x1="275" y1="5" x2="275" y2="344" class="actor-line" stroke-width="0.5px" stroke="#999"></line><rect x="200" y="0" fill="#eaeaea" stroke="#666" width="150" height="65" rx="3" ry="3" class="actor"></rect><text x="275" y="32.5" dominant-baseline="central" alignment-baseline="central" class="actor" style="text-anchor: middle; font-size: 14px;"><tspan x="275" dy="0">server (conn. ID)</tspan></text></g><g><line id="actor1694" x1="475" y1="5" x2="475" y2="344" class="actor-line" stroke-width="0.5px" stroke="#999"></line><rect x="400" y="0" fill="#eaeaea" stroke="#666" width="150" height="65" rx="3" ry="3" class="actor"></rect><text x="475" y="32.5" dominant-baseline="central" alignment-baseline="central" class="actor" style="text-anchor: middle; font-size: 14px;"><tspan x="475" dy="0">Alice (recipient)</tspan></text></g><defs><marker id="arrowhead" refX="5" refY="2" markerWidth="6" markerHeight="4" orient="auto"><path d="M 0,0 V 4 L6,2 Z"></path></marker></defs><defs><marker id="crosshead" markerWidth="15" markerHeight="8" orient="auto" refX="16" refY="4"><path fill="black" stroke="#000000" stroke-width="1px" d="M 9,2 V 6 L16,4 Z" style="stroke-dasharray: 0, 0;"></path><path fill="none" stroke="#000000" stroke-width="1px" d="M 0,1 L 6,7 M 6,1 L 0,7" style="stroke-dasharray: 0, 0;"></path></marker></defs><defs><marker id="sequencenumber" refX="15" refY="15" markerWidth="60" markerHeight="40" orient="auto"><circle cx="15" cy="15" r="6"></circle></marker></defs><g><rect x="0" y="75" fill="#EDF2AE" stroke="#666" width="150" height="52" rx="0" ry="0" class="note"></rect><text x="-4" y="99" class="noteText"><tspan x="16">encrypt message </tspan></text><text x="-4" y="115" class="noteText"><tspan x="16"> ("public" key EK)</tspan></text></g><g><text x="175" y="155" class="messageText" style="text-anchor: middle;">1. send message (SK-signed req)</text><line x1="75" y1="162" x2="275" y2="162" class="messageLine0" stroke-width="2" stroke="black" marker-end="url(#arrowhead)" style="fill: none;"></line></g><g><text x="375" y="190" class="messageText" style="text-anchor: middle;">2. retrieve messages (RK-signed req)</text><line x1="275" y1="197" x2="475" y2="197" class="messageLine0" stroke-width="2" stroke="black" marker-end="url(#arrowhead)" style="fill: none;"></line></g><g><rect x="400" y="207" fill="#EDF2AE" stroke="#666" width="150" height="52" rx="0" ry="0" class="note"></rect><text x="396" y="231" class="noteText"><tspan x="416">decrypt message </tspan></text><text x="396" y="247" class="noteText"><tspan x="416"> ("private" key EK)</tspan></text></g><g><rect x="0" y="279" fill="#eaeaea" stroke="#666" width="150" height="65" rx="3" ry="3" class="actor"></rect><text x="75" y="311.5" dominant-baseline="central" alignment-baseline="central" class="actor" style="text-anchor: middle; font-size: 14px;"><tspan x="75" dy="0">Bob (sender)</tspan></text></g><g><rect x="200" y="279" fill="#eaeaea" stroke="#666" width="150" height="65" rx="3" ry="3" class="actor"></rect><text x="275" y="311.5" dominant-baseline="central" alignment-baseline="central" class="actor" style="text-anchor: middle; font-size: 14px;"><tspan x="275" dy="0">server (conn. ID)</tspan></text></g><g><rect x="400" y="279" fill="#eaeaea" stroke="#666" width="150" height="65" rx="3" ry="3" class="actor"></rect><text x="475" y="311.5" dominant-baseline="central" alignment-baseline="central" class="actor" style="text-anchor: middle; font-size: 14px;"><tspan x="475" dy="0">Alice (recipient)</tspan></text></g></svg>
\ No newline at end of file
+  }</style><g></g><g><line id="actor420" x1="75" y1="5" x2="75" y2="344" class="actor-line" stroke-width="0.5px" stroke="#999"></line><rect x="0" y="0" fill="#eaeaea" stroke="#666" width="150" height="65" rx="3" ry="3" class="actor"></rect><text x="75" y="32.5" dominant-baseline="central" alignment-baseline="central" class="actor" style="text-anchor: middle; font-size: 14px;"><tspan x="75" dy="0">Bob (sender)</tspan></text></g><g><line id="actor421" x1="275" y1="5" x2="275" y2="344" class="actor-line" stroke-width="0.5px" stroke="#999"></line><rect x="200" y="0" fill="#eaeaea" stroke="#666" width="150" height="65" rx="3" ry="3" class="actor"></rect><text x="275" y="32.5" dominant-baseline="central" alignment-baseline="central" class="actor" style="text-anchor: middle; font-size: 14px;"><tspan x="275" dy="0">server (conn. RU)</tspan></text></g><g><line id="actor422" x1="475" y1="5" x2="475" y2="344" class="actor-line" stroke-width="0.5px" stroke="#999"></line><rect x="400" y="0" fill="#eaeaea" stroke="#666" width="150" height="65" rx="3" ry="3" class="actor"></rect><text x="475" y="32.5" dominant-baseline="central" alignment-baseline="central" class="actor" style="text-anchor: middle; font-size: 14px;"><tspan x="475" dy="0">Alice (recipient)</tspan></text></g><defs><marker id="arrowhead" refX="5" refY="2" markerWidth="6" markerHeight="4" orient="auto"><path d="M 0,0 V 4 L6,2 Z"></path></marker></defs><defs><marker id="crosshead" markerWidth="15" markerHeight="8" orient="auto" refX="16" refY="4"><path fill="black" stroke="#000000" stroke-width="1px" d="M 9,2 V 6 L16,4 Z" style="stroke-dasharray: 0, 0;"></path><path fill="none" stroke="#000000" stroke-width="1px" d="M 0,1 L 6,7 M 6,1 L 0,7" style="stroke-dasharray: 0, 0;"></path></marker></defs><defs><marker id="sequencenumber" refX="15" refY="15" markerWidth="60" markerHeight="40" orient="auto"><circle cx="15" cy="15" r="6"></circle></marker></defs><g><rect x="0" y="75" fill="#EDF2AE" stroke="#666" width="150" height="52" rx="0" ry="0" class="note"></rect><text x="-4" y="99" class="noteText"><tspan x="16">encrypt message </tspan></text><text x="-4" y="115" class="noteText"><tspan x="16"> ("public" key EK)</tspan></text></g><g><text x="175" y="155" class="messageText" style="text-anchor: middle;">1. send message to SU (SK-signed req)</text><line x1="75" y1="162" x2="275" y2="162" class="messageLine0" stroke-width="2" stroke="black" marker-end="url(#arrowhead)" style="fill: none;"></line></g><g><text x="375" y="190" class="messageText" style="text-anchor: middle;">2. retrieve messages from RU (RK-signed req)</text><line x1="275" y1="197" x2="475" y2="197" class="messageLine0" stroke-width="2" stroke="black" marker-end="url(#arrowhead)" style="fill: none;"></line></g><g><rect x="400" y="207" fill="#EDF2AE" stroke="#666" width="150" height="52" rx="0" ry="0" class="note"></rect><text x="396" y="231" class="noteText"><tspan x="416">decrypt message </tspan></text><text x="396" y="247" class="noteText"><tspan x="416"> ("private" key EK)</tspan></text></g><g><rect x="0" y="279" fill="#eaeaea" stroke="#666" width="150" height="65" rx="3" ry="3" class="actor"></rect><text x="75" y="311.5" dominant-baseline="central" alignment-baseline="central" class="actor" style="text-anchor: middle; font-size: 14px;"><tspan x="75" dy="0">Bob (sender)</tspan></text></g><g><rect x="200" y="279" fill="#eaeaea" stroke="#666" width="150" height="65" rx="3" ry="3" class="actor"></rect><text x="275" y="311.5" dominant-baseline="central" alignment-baseline="central" class="actor" style="text-anchor: middle; font-size: 14px;"><tspan x="275" dy="0">server (conn. RU)</tspan></text></g><g><rect x="400" y="279" fill="#eaeaea" stroke="#666" width="150" height="65" rx="3" ry="3" class="actor"></rect><text x="475" y="311.5" dominant-baseline="central" alignment-baseline="central" class="actor" style="text-anchor: middle; font-size: 14px;"><tspan x="475" dy="0">Alice (recipient)</tspan></text></g></svg>
\ No newline at end of file
diff --git a/diagrams/simplex-messaging/simplex.mmd b/diagrams/simplex-messaging/simplex.mmd
index 7baa9de7c..c9d4c64ca 100644
--- a/diagrams/simplex-messaging/simplex.mmd
+++ b/diagrams/simplex-messaging/simplex.mmd
@@ -3,9 +3,9 @@ graph LR
   VR{{"verify recipient (RK)"}}
 
   S(sender) -->|msg| VS
-  subgraph "server (connection ID)"
+  subgraph "server (connection RU)"
     VS --> DB[("storage")]
     DB --> VR
   end
   R(recipient) -->|"1) req"| VR
-  VR -->|"2) msg"| R
+  VR -->|"2) msg"| R
\ No newline at end of file
diff --git a/diagrams/simplex-messaging/simplex.svg b/diagrams/simplex-messaging/simplex.svg
index 2a9105735..ea9979477 100644
--- a/diagrams/simplex-messaging/simplex.svg
+++ b/diagrams/simplex-messaging/simplex.svg
@@ -1,50 +1,50 @@
-<svg id="mermaid-1579371602972" width="918.03125" xmlns="http://www.w3.org/2000/svg" height="157.95216369628906" viewBox="0 0 918.03125 157.95216369628906"><style>
+<svg id="mermaid-1579981583566" width="918.03125" xmlns="http://www.w3.org/2000/svg" height="157.95216369628906" viewBox="0 0 918.03125 157.95216369628906"><style>
 
 
 
-#mermaid-1579371602972 .label {
+#mermaid-1579981583566 .label {
   font-family: 'trebuchet ms', verdana, arial;
   font-family: var(--mermaid-font-family);
   color: #333; }
 
-#mermaid-1579371602972 .label text {
+#mermaid-1579981583566 .label text {
   fill: #333; }
 
-#mermaid-1579371602972 .node rect,
-#mermaid-1579371602972 .node circle,
-#mermaid-1579371602972 .node ellipse,
-#mermaid-1579371602972 .node polygon,
-#mermaid-1579371602972 .node path {
+#mermaid-1579981583566 .node rect,
+#mermaid-1579981583566 .node circle,
+#mermaid-1579981583566 .node ellipse,
+#mermaid-1579981583566 .node polygon,
+#mermaid-1579981583566 .node path {
   fill: #ECECFF;
   stroke: #9370DB;
   stroke-width: 1px; }
 
-#mermaid-1579371602972 .node .label {
+#mermaid-1579981583566 .node .label {
   text-align: center; }
 
-#mermaid-1579371602972 .node.clickable {
+#mermaid-1579981583566 .node.clickable {
   cursor: pointer; }
 
-#mermaid-1579371602972 .arrowheadPath {
+#mermaid-1579981583566 .arrowheadPath {
   fill: #333333; }
 
-#mermaid-1579371602972 .edgePath .path {
+#mermaid-1579981583566 .edgePath .path {
   stroke: #333333;
   stroke-width: 1.5px; }
 
-#mermaid-1579371602972 .edgeLabel {
+#mermaid-1579981583566 .edgeLabel {
   background-color: #e8e8e8;
   text-align: center; }
 
-#mermaid-1579371602972 .cluster rect {
+#mermaid-1579981583566 .cluster rect {
   fill: #ffffde;
   stroke: #aaaa33;
   stroke-width: 1px; }
 
-#mermaid-1579371602972 .cluster text {
+#mermaid-1579981583566 .cluster text {
   fill: #333; }
 
-#mermaid-1579371602972 div.mermaidTooltip {
+#mermaid-1579981583566 div.mermaidTooltip {
   position: absolute;
   text-align: center;
   max-width: 200px;
@@ -58,117 +58,117 @@
   pointer-events: none;
   z-index: 100; }
 
-#mermaid-1579371602972 .actor {
+#mermaid-1579981583566 .actor {
   stroke: #CCCCFF;
   fill: #ECECFF; }
 
-#mermaid-1579371602972 text.actor {
+#mermaid-1579981583566 text.actor {
   fill: black;
   stroke: none; }
 
-#mermaid-1579371602972 .actor-line {
+#mermaid-1579981583566 .actor-line {
   stroke: grey; }
 
-#mermaid-1579371602972 .messageLine0 {
+#mermaid-1579981583566 .messageLine0 {
   stroke-width: 1.5;
   stroke-dasharray: '2 2';
   stroke: #333; }
 
-#mermaid-1579371602972 .messageLine1 {
+#mermaid-1579981583566 .messageLine1 {
   stroke-width: 1.5;
   stroke-dasharray: '2 2';
   stroke: #333; }
 
-#mermaid-1579371602972 #arrowhead {
+#mermaid-1579981583566 #arrowhead {
   fill: #333; }
 
-#mermaid-1579371602972 .sequenceNumber {
+#mermaid-1579981583566 .sequenceNumber {
   fill: white; }
 
-#mermaid-1579371602972 #sequencenumber {
+#mermaid-1579981583566 #sequencenumber {
   fill: #333; }
 
-#mermaid-1579371602972 #crosshead path {
+#mermaid-1579981583566 #crosshead path {
   fill: #333 !important;
   stroke: #333 !important; }
 
-#mermaid-1579371602972 .messageText {
+#mermaid-1579981583566 .messageText {
   fill: #333;
   stroke: none; }
 
-#mermaid-1579371602972 .labelBox {
+#mermaid-1579981583566 .labelBox {
   stroke: #CCCCFF;
   fill: #ECECFF; }
 
-#mermaid-1579371602972 .labelText {
+#mermaid-1579981583566 .labelText {
   fill: black;
   stroke: none; }
 
-#mermaid-1579371602972 .loopText {
+#mermaid-1579981583566 .loopText {
   fill: black;
   stroke: none; }
 
-#mermaid-1579371602972 .loopLine {
+#mermaid-1579981583566 .loopLine {
   stroke-width: 2;
   stroke-dasharray: '2 2';
   stroke: #CCCCFF; }
 
-#mermaid-1579371602972 .note {
+#mermaid-1579981583566 .note {
   stroke: #aaaa33;
   fill: #fff5ad; }
 
-#mermaid-1579371602972 .noteText {
+#mermaid-1579981583566 .noteText {
   fill: black;
   stroke: none;
   font-family: 'trebuchet ms', verdana, arial;
   font-family: var(--mermaid-font-family);
   font-size: 14px; }
 
-#mermaid-1579371602972 .activation0 {
+#mermaid-1579981583566 .activation0 {
   fill: #f4f4f4;
   stroke: #666; }
 
-#mermaid-1579371602972 .activation1 {
+#mermaid-1579981583566 .activation1 {
   fill: #f4f4f4;
   stroke: #666; }
 
-#mermaid-1579371602972 .activation2 {
+#mermaid-1579981583566 .activation2 {
   fill: #f4f4f4;
   stroke: #666; }
 
 
-#mermaid-1579371602972 .mermaid-main-font {
+#mermaid-1579981583566 .mermaid-main-font {
   font-family: "trebuchet ms", verdana, arial;
   font-family: var(--mermaid-font-family); }
 
-#mermaid-1579371602972 .section {
+#mermaid-1579981583566 .section {
   stroke: none;
   opacity: 0.2; }
 
-#mermaid-1579371602972 .section0 {
+#mermaid-1579981583566 .section0 {
   fill: rgba(102, 102, 255, 0.49); }
 
-#mermaid-1579371602972 .section2 {
+#mermaid-1579981583566 .section2 {
   fill: #fff400; }
 
-#mermaid-1579371602972 .section1,
-#mermaid-1579371602972 .section3 {
+#mermaid-1579981583566 .section1,
+#mermaid-1579981583566 .section3 {
   fill: white;
   opacity: 0.2; }
 
-#mermaid-1579371602972 .sectionTitle0 {
+#mermaid-1579981583566 .sectionTitle0 {
   fill: #333; }
 
-#mermaid-1579371602972 .sectionTitle1 {
+#mermaid-1579981583566 .sectionTitle1 {
   fill: #333; }
 
-#mermaid-1579371602972 .sectionTitle2 {
+#mermaid-1579981583566 .sectionTitle2 {
   fill: #333; }
 
-#mermaid-1579371602972 .sectionTitle3 {
+#mermaid-1579981583566 .sectionTitle3 {
   fill: #333; }
 
-#mermaid-1579371602972 .sectionTitle {
+#mermaid-1579981583566 .sectionTitle {
   text-anchor: start;
   font-size: 11px;
   text-height: 14px;
@@ -176,319 +176,319 @@
   font-family: var(--mermaid-font-family); }
 
 
-#mermaid-1579371602972 .grid .tick {
+#mermaid-1579981583566 .grid .tick {
   stroke: lightgrey;
   opacity: 0.8;
   shape-rendering: crispEdges; }
-#mermaid-1579371602972   .grid .tick text {
+#mermaid-1579981583566   .grid .tick text {
     font-family: 'trebuchet ms', verdana, arial;
     font-family: var(--mermaid-font-family); }
 
-#mermaid-1579371602972 .grid path {
+#mermaid-1579981583566 .grid path {
   stroke-width: 0; }
 
 
-#mermaid-1579371602972 .today {
+#mermaid-1579981583566 .today {
   fill: none;
   stroke: red;
   stroke-width: 2px; }
 
 
 
-#mermaid-1579371602972 .task {
+#mermaid-1579981583566 .task {
   stroke-width: 2; }
 
-#mermaid-1579371602972 .taskText {
+#mermaid-1579981583566 .taskText {
   text-anchor: middle;
   font-family: 'trebuchet ms', verdana, arial;
   font-family: var(--mermaid-font-family); }
 
-#mermaid-1579371602972 .taskText:not([font-size]) {
+#mermaid-1579981583566 .taskText:not([font-size]) {
   font-size: 11px; }
 
-#mermaid-1579371602972 .taskTextOutsideRight {
+#mermaid-1579981583566 .taskTextOutsideRight {
   fill: black;
   text-anchor: start;
   font-size: 11px;
   font-family: 'trebuchet ms', verdana, arial;
   font-family: var(--mermaid-font-family); }
 
-#mermaid-1579371602972 .taskTextOutsideLeft {
+#mermaid-1579981583566 .taskTextOutsideLeft {
   fill: black;
   text-anchor: end;
   font-size: 11px; }
 
 
-#mermaid-1579371602972 .task.clickable {
+#mermaid-1579981583566 .task.clickable {
   cursor: pointer; }
 
-#mermaid-1579371602972 .taskText.clickable {
+#mermaid-1579981583566 .taskText.clickable {
   cursor: pointer;
   fill: #003163 !important;
   font-weight: bold; }
 
-#mermaid-1579371602972 .taskTextOutsideLeft.clickable {
+#mermaid-1579981583566 .taskTextOutsideLeft.clickable {
   cursor: pointer;
   fill: #003163 !important;
   font-weight: bold; }
 
-#mermaid-1579371602972 .taskTextOutsideRight.clickable {
+#mermaid-1579981583566 .taskTextOutsideRight.clickable {
   cursor: pointer;
   fill: #003163 !important;
   font-weight: bold; }
 
 
-#mermaid-1579371602972 .taskText0,
-#mermaid-1579371602972 .taskText1,
-#mermaid-1579371602972 .taskText2,
-#mermaid-1579371602972 .taskText3 {
+#mermaid-1579981583566 .taskText0,
+#mermaid-1579981583566 .taskText1,
+#mermaid-1579981583566 .taskText2,
+#mermaid-1579981583566 .taskText3 {
   fill: white; }
 
-#mermaid-1579371602972 .task0,
-#mermaid-1579371602972 .task1,
-#mermaid-1579371602972 .task2,
-#mermaid-1579371602972 .task3 {
+#mermaid-1579981583566 .task0,
+#mermaid-1579981583566 .task1,
+#mermaid-1579981583566 .task2,
+#mermaid-1579981583566 .task3 {
   fill: #8a90dd;
   stroke: #534fbc; }
 
-#mermaid-1579371602972 .taskTextOutside0,
-#mermaid-1579371602972 .taskTextOutside2 {
+#mermaid-1579981583566 .taskTextOutside0,
+#mermaid-1579981583566 .taskTextOutside2 {
   fill: black; }
 
-#mermaid-1579371602972 .taskTextOutside1,
-#mermaid-1579371602972 .taskTextOutside3 {
+#mermaid-1579981583566 .taskTextOutside1,
+#mermaid-1579981583566 .taskTextOutside3 {
   fill: black; }
 
 
-#mermaid-1579371602972 .active0,
-#mermaid-1579371602972 .active1,
-#mermaid-1579371602972 .active2,
-#mermaid-1579371602972 .active3 {
+#mermaid-1579981583566 .active0,
+#mermaid-1579981583566 .active1,
+#mermaid-1579981583566 .active2,
+#mermaid-1579981583566 .active3 {
   fill: #bfc7ff;
   stroke: #534fbc; }
 
-#mermaid-1579371602972 .activeText0,
-#mermaid-1579371602972 .activeText1,
-#mermaid-1579371602972 .activeText2,
-#mermaid-1579371602972 .activeText3 {
+#mermaid-1579981583566 .activeText0,
+#mermaid-1579981583566 .activeText1,
+#mermaid-1579981583566 .activeText2,
+#mermaid-1579981583566 .activeText3 {
   fill: black !important; }
 
 
-#mermaid-1579371602972 .done0,
-#mermaid-1579371602972 .done1,
-#mermaid-1579371602972 .done2,
-#mermaid-1579371602972 .done3 {
+#mermaid-1579981583566 .done0,
+#mermaid-1579981583566 .done1,
+#mermaid-1579981583566 .done2,
+#mermaid-1579981583566 .done3 {
   stroke: grey;
   fill: lightgrey;
   stroke-width: 2; }
 
-#mermaid-1579371602972 .doneText0,
-#mermaid-1579371602972 .doneText1,
-#mermaid-1579371602972 .doneText2,
-#mermaid-1579371602972 .doneText3 {
+#mermaid-1579981583566 .doneText0,
+#mermaid-1579981583566 .doneText1,
+#mermaid-1579981583566 .doneText2,
+#mermaid-1579981583566 .doneText3 {
   fill: black !important; }
 
 
-#mermaid-1579371602972 .crit0,
-#mermaid-1579371602972 .crit1,
-#mermaid-1579371602972 .crit2,
-#mermaid-1579371602972 .crit3 {
+#mermaid-1579981583566 .crit0,
+#mermaid-1579981583566 .crit1,
+#mermaid-1579981583566 .crit2,
+#mermaid-1579981583566 .crit3 {
   stroke: #ff8888;
   fill: red;
   stroke-width: 2; }
 
-#mermaid-1579371602972 .activeCrit0,
-#mermaid-1579371602972 .activeCrit1,
-#mermaid-1579371602972 .activeCrit2,
-#mermaid-1579371602972 .activeCrit3 {
+#mermaid-1579981583566 .activeCrit0,
+#mermaid-1579981583566 .activeCrit1,
+#mermaid-1579981583566 .activeCrit2,
+#mermaid-1579981583566 .activeCrit3 {
   stroke: #ff8888;
   fill: #bfc7ff;
   stroke-width: 2; }
 
-#mermaid-1579371602972 .doneCrit0,
-#mermaid-1579371602972 .doneCrit1,
-#mermaid-1579371602972 .doneCrit2,
-#mermaid-1579371602972 .doneCrit3 {
+#mermaid-1579981583566 .doneCrit0,
+#mermaid-1579981583566 .doneCrit1,
+#mermaid-1579981583566 .doneCrit2,
+#mermaid-1579981583566 .doneCrit3 {
   stroke: #ff8888;
   fill: lightgrey;
   stroke-width: 2;
   cursor: pointer;
   shape-rendering: crispEdges; }
 
-#mermaid-1579371602972 .milestone {
+#mermaid-1579981583566 .milestone {
   transform: rotate(45deg) scale(0.8, 0.8); }
 
-#mermaid-1579371602972 .milestoneText {
+#mermaid-1579981583566 .milestoneText {
   font-style: italic; }
 
-#mermaid-1579371602972 .doneCritText0,
-#mermaid-1579371602972 .doneCritText1,
-#mermaid-1579371602972 .doneCritText2,
-#mermaid-1579371602972 .doneCritText3 {
+#mermaid-1579981583566 .doneCritText0,
+#mermaid-1579981583566 .doneCritText1,
+#mermaid-1579981583566 .doneCritText2,
+#mermaid-1579981583566 .doneCritText3 {
   fill: black !important; }
 
-#mermaid-1579371602972 .activeCritText0,
-#mermaid-1579371602972 .activeCritText1,
-#mermaid-1579371602972 .activeCritText2,
-#mermaid-1579371602972 .activeCritText3 {
+#mermaid-1579981583566 .activeCritText0,
+#mermaid-1579981583566 .activeCritText1,
+#mermaid-1579981583566 .activeCritText2,
+#mermaid-1579981583566 .activeCritText3 {
   fill: black !important; }
 
-#mermaid-1579371602972 .titleText {
+#mermaid-1579981583566 .titleText {
   text-anchor: middle;
   font-size: 18px;
   fill: black;
   font-family: 'trebuchet ms', verdana, arial;
   font-family: var(--mermaid-font-family); }
 
-#mermaid-1579371602972 g.classGroup text {
+#mermaid-1579981583566 g.classGroup text {
   fill: #9370DB;
   stroke: none;
   font-family: 'trebuchet ms', verdana, arial;
   font-family: var(--mermaid-font-family);
   font-size: 10px; }
-#mermaid-1579371602972   g.classGroup text .title {
+#mermaid-1579981583566   g.classGroup text .title {
     font-weight: bolder; }
 
-#mermaid-1579371602972 g.clickable {
+#mermaid-1579981583566 g.clickable {
   cursor: pointer; }
 
-#mermaid-1579371602972 g.classGroup rect {
+#mermaid-1579981583566 g.classGroup rect {
   fill: #ECECFF;
   stroke: #9370DB; }
 
-#mermaid-1579371602972 g.classGroup line {
+#mermaid-1579981583566 g.classGroup line {
   stroke: #9370DB;
   stroke-width: 1; }
 
-#mermaid-1579371602972 .classLabel .box {
+#mermaid-1579981583566 .classLabel .box {
   stroke: none;
   stroke-width: 0;
   fill: #ECECFF;
   opacity: 0.5; }
 
-#mermaid-1579371602972 .classLabel .label {
+#mermaid-1579981583566 .classLabel .label {
   fill: #9370DB;
   font-size: 10px; }
 
-#mermaid-1579371602972 .relation {
+#mermaid-1579981583566 .relation {
   stroke: #9370DB;
   stroke-width: 1;
   fill: none; }
 
-#mermaid-1579371602972 .dashed-line {
+#mermaid-1579981583566 .dashed-line {
   stroke-dasharray: 3; }
 
-#mermaid-1579371602972 #compositionStart {
+#mermaid-1579981583566 #compositionStart {
   fill: #9370DB;
   stroke: #9370DB;
   stroke-width: 1; }
 
-#mermaid-1579371602972 #compositionEnd {
+#mermaid-1579981583566 #compositionEnd {
   fill: #9370DB;
   stroke: #9370DB;
   stroke-width: 1; }
 
-#mermaid-1579371602972 #aggregationStart {
+#mermaid-1579981583566 #aggregationStart {
   fill: #ECECFF;
   stroke: #9370DB;
   stroke-width: 1; }
 
-#mermaid-1579371602972 #aggregationEnd {
+#mermaid-1579981583566 #aggregationEnd {
   fill: #ECECFF;
   stroke: #9370DB;
   stroke-width: 1; }
 
-#mermaid-1579371602972 #dependencyStart {
+#mermaid-1579981583566 #dependencyStart {
   fill: #9370DB;
   stroke: #9370DB;
   stroke-width: 1; }
 
-#mermaid-1579371602972 #dependencyEnd {
+#mermaid-1579981583566 #dependencyEnd {
   fill: #9370DB;
   stroke: #9370DB;
   stroke-width: 1; }
 
-#mermaid-1579371602972 #extensionStart {
+#mermaid-1579981583566 #extensionStart {
   fill: #9370DB;
   stroke: #9370DB;
   stroke-width: 1; }
 
-#mermaid-1579371602972 #extensionEnd {
+#mermaid-1579981583566 #extensionEnd {
   fill: #9370DB;
   stroke: #9370DB;
   stroke-width: 1; }
 
-#mermaid-1579371602972 .commit-id,
-#mermaid-1579371602972 .commit-msg,
-#mermaid-1579371602972 .branch-label {
+#mermaid-1579981583566 .commit-id,
+#mermaid-1579981583566 .commit-msg,
+#mermaid-1579981583566 .branch-label {
   fill: lightgrey;
   color: lightgrey;
   font-family: 'trebuchet ms', verdana, arial;
   font-family: var(--mermaid-font-family); }
 
-#mermaid-1579371602972 .pieTitleText {
+#mermaid-1579981583566 .pieTitleText {
   text-anchor: middle;
   font-size: 25px;
   fill: black;
   font-family: 'trebuchet ms', verdana, arial;
   font-family: var(--mermaid-font-family); }
 
-#mermaid-1579371602972 .slice {
+#mermaid-1579981583566 .slice {
   font-family: 'trebuchet ms', verdana, arial;
   font-family: var(--mermaid-font-family); }
 
-#mermaid-1579371602972 g.stateGroup text {
+#mermaid-1579981583566 g.stateGroup text {
   fill: #9370DB;
   stroke: none;
   font-size: 10px;
   font-family: 'trebuchet ms', verdana, arial;
   font-family: var(--mermaid-font-family); }
 
-#mermaid-1579371602972 g.stateGroup text {
+#mermaid-1579981583566 g.stateGroup text {
   fill: #9370DB;
   stroke: none;
   font-size: 10px; }
 
-#mermaid-1579371602972 g.stateGroup .state-title {
+#mermaid-1579981583566 g.stateGroup .state-title {
   font-weight: bolder;
   fill: black; }
 
-#mermaid-1579371602972 g.stateGroup rect {
+#mermaid-1579981583566 g.stateGroup rect {
   fill: #ECECFF;
   stroke: #9370DB; }
 
-#mermaid-1579371602972 g.stateGroup line {
+#mermaid-1579981583566 g.stateGroup line {
   stroke: #9370DB;
   stroke-width: 1; }
 
-#mermaid-1579371602972 .transition {
+#mermaid-1579981583566 .transition {
   stroke: #9370DB;
   stroke-width: 1;
   fill: none; }
 
-#mermaid-1579371602972 .stateGroup .composit {
+#mermaid-1579981583566 .stateGroup .composit {
   fill: white;
   border-bottom: 1px; }
 
-#mermaid-1579371602972 .stateGroup .alt-composit {
+#mermaid-1579981583566 .stateGroup .alt-composit {
   fill: #e0e0e0;
   border-bottom: 1px; }
 
-#mermaid-1579371602972 .state-note {
+#mermaid-1579981583566 .state-note {
   stroke: #aaaa33;
   fill: #fff5ad; }
-#mermaid-1579371602972   .state-note text {
+#mermaid-1579981583566   .state-note text {
     fill: black;
     stroke: none;
     font-size: 10px; }
 
-#mermaid-1579371602972 .stateLabel .box {
+#mermaid-1579981583566 .stateLabel .box {
   stroke: none;
   stroke-width: 0;
   fill: #ECECFF;
   opacity: 0.5; }
 
-#mermaid-1579371602972 .stateLabel text {
+#mermaid-1579981583566 .stateLabel text {
   fill: black;
   font-size: 10px;
   font-weight: bold;
@@ -499,7 +499,7 @@
   --mermaid-font-family: '"trebuchet ms", verdana, arial';
   --mermaid-font-family: "Comic Sans MS", "Comic Sans", cursive; }
 
-:root { --mermaid-font-family: "trebuchet ms", verdana, arial;}</style><style>#mermaid-1579371602972 {
+:root { --mermaid-font-family: "trebuchet ms", verdana, arial;}</style><style>#mermaid-1579981583566 {
     color: rgb(0, 0, 0);
     font: normal normal 400 normal 16px / normal "trebuchet ms", verdana, arial;
-  }</style><g transform="translate(0, 0)"><g class="output"><g class="clusters"><g class="cluster" id="subGraph0" transform="translate(441.0234375,78.97608375549316)" style="opacity: 1;"><rect width="574.828125" height="141.95216751098633" x="-287.4140625" y="-70.97608375549316"></rect><g class="label" transform="translate(0, -56.97608184814453)" id="mermaid-1579371602972Text"><g transform="translate(-79.3671875,-9.5)"><foreignObject width="158.734375" height="19"><div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">server (connection ID)</div></foreignObject></g></g></g></g><g class="edgePaths"><g class="edgePath" style="opacity: 1;"><path class="path" d="M75.8125,81.65072250366211L114.7109375,81.65072250366211L153.609375,81.65072250366211L179.109375,82.15072250366211" marker-end="url(#arrowhead15212)" style="fill:none"></path><defs><marker id="arrowhead15212" viewBox="0 0 10 10" refX="9" refY="5" markerUnits="strokeWidth" markerWidth="8" markerHeight="6" orient="auto"><path d="M 0 0 L 10 5 L 0 10 z" class="arrowheadPath" style="stroke-width: 1; stroke-dasharray: 1, 0;"></path></marker></defs></g><g class="edgePath" style="opacity: 1;"><path class="path" d="M345.859375,82.15072250366211L370.359375,81.65072250366211L395.359375,81.65072250366211" marker-end="url(#arrowhead15213)" style="fill:none"></path><defs><marker id="arrowhead15213" viewBox="0 0 10 10" refX="9" refY="5" markerUnits="strokeWidth" markerWidth="8" markerHeight="6" orient="auto"><path d="M 0 0 L 10 5 L 0 10 z" class="arrowheadPath" style="stroke-width: 1; stroke-dasharray: 1, 0;"></path></marker></defs></g><g class="edgePath" style="opacity: 1;"><path class="path" d="M468.15625,81.65072250366211L493.15625,81.65072250366211L518.65625,82.15072250366211" marker-end="url(#arrowhead15214)" style="fill:none"></path><defs><marker id="arrowhead15214" viewBox="0 0 10 10" refX="9" refY="5" markerUnits="strokeWidth" markerWidth="8" markerHeight="6" orient="auto"><path d="M 0 0 L 10 5 L 0 10 z" class="arrowheadPath" style="stroke-width: 1; stroke-dasharray: 1, 0;"></path></marker></defs></g><g class="edgePath" style="opacity: 1;"><path class="path" d="M825.3125,92.91773484360841L776.875,105.80144500732422L728.4375,105.80144500732422L695.313512735249,99.39869703316417" marker-end="url(#arrowhead15215)" style="fill:none"></path><defs><marker id="arrowhead15215" viewBox="0 0 10 10" refX="9" refY="5" markerUnits="strokeWidth" markerWidth="8" markerHeight="6" orient="auto"><path d="M 0 0 L 10 5 L 0 10 z" class="arrowheadPath" style="stroke-width: 1; stroke-dasharray: 1, 0;"></path></marker></defs></g><g class="edgePath" style="opacity: 1;"><path class="path" d="M696.8471344903717,67.9699914844054L728.4375,62.15072250366211L776.875,62.15072250366211L825.3125,72.5534070674205" marker-end="url(#arrowhead15216)" style="fill:none"></path><defs><marker id="arrowhead15216" viewBox="0 0 10 10" refX="9" refY="5" markerUnits="strokeWidth" markerWidth="8" markerHeight="6" orient="auto"><path d="M 0 0 L 10 5 L 0 10 z" class="arrowheadPath" style="stroke-width: 1; stroke-dasharray: 1, 0;"></path></marker></defs></g></g><g class="edgeLabels"><g class="edgeLabel" transform="translate(114.7109375,81.65072250366211)" style="opacity: 1;"><g transform="translate(-13.8984375,-9.5)" class="label"><foreignObject width="27.796875" height="19"><div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;"><span class="edgeLabel">msg</span></div></foreignObject></g></g><g class="edgeLabel" transform="" style="opacity: 1;"><g transform="translate(0,0)" class="label"><foreignObject width="0" height="0"><div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;"><span class="edgeLabel"></span></div></foreignObject></g></g><g class="edgeLabel" transform="" style="opacity: 1;"><g transform="translate(0,0)" class="label"><foreignObject width="0" height="0"><div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;"><span class="edgeLabel"></span></div></foreignObject></g></g><g class="edgeLabel" transform="translate(776.875,105.80144500732422)" style="opacity: 1;"><g transform="translate(-21.4765625,-9.5)" class="label"><foreignObject width="42.953125" height="19"><div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;"><span class="edgeLabel">1) req</span></div></foreignObject></g></g><g class="edgeLabel" transform="translate(776.875,62.15072250366211)" style="opacity: 1;"><g transform="translate(-23.4375,-9.5)" class="label"><foreignObject width="46.875" height="19"><div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;"><span class="edgeLabel">2) msg</span></div></foreignObject></g></g></g><g class="nodes"><g class="node" id="DB" label-offset-y="9.200963741211785" transform="translate(431.7578125,81.65072250366211)" style="opacity: 1;"><path d="M 0,9.200963741211785 a 36.3984375,9.200963741211785 0,0,0 72.796875 0 a 36.3984375,9.200963741211785 0,0,0 -72.796875 0 l 0,48.20096374121179 a 36.3984375,9.200963741211785 0,0,0 72.796875 0 l 0,-48.20096374121179" transform="translate(-36.3984375,-33.30144561181768)" class="label-container"></path><g class="label" transform="translate(0,0)"><g transform="translate(-26.3984375,-9.5)"><foreignObject width="52.796875" height="19"><div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">storage</div></foreignObject></g></g></g><g class="node" id="VS" transform="translate(261.984375,81.65072250366211)" style="opacity: 1;"><polygon points="9.75,0 157,0 166.75,-19.5 157,-39 9.75,-39 0,-19.5" transform="translate(-83.375,19.5)" class="label-container"></polygon><g class="label" transform="translate(0,0)"><g transform="translate(-63.625,-9.5)"><foreignObject width="127.25" height="19"><div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">verify sender (SK)</div></foreignObject></g></g></g><g class="node" id="VR" transform="translate(610.796875,81.65072250366211)" style="opacity: 1;"><polygon points="9.75,0 175.53125,0 185.28125,-19.5 175.53125,-39 9.75,-39 0,-19.5" transform="translate(-92.640625,19.5)" class="label-container"></polygon><g class="label" transform="translate(0,0)"><g transform="translate(-72.890625,-9.5)"><foreignObject width="145.78125" height="19"><div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">verify recipient (RK)</div></foreignObject></g></g></g><g class="node" id="S" transform="translate(41.90625,81.65072250366211)" style="opacity: 1;"><rect rx="5" ry="5" x="-33.90625" y="-19.5" width="67.8125" height="39" class="label-container"></rect><g class="label" transform="translate(0,0)"><g transform="translate(-23.90625,-9.5)"><foreignObject width="47.8125" height="19"><div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">sender</div></foreignObject></g></g></g><g class="node" id="R" transform="translate(867.671875,81.65072250366211)" style="opacity: 1;"><rect rx="5" ry="5" x="-42.359375" y="-19.5" width="84.71875" height="39" class="label-container"></rect><g class="label" transform="translate(0,0)"><g transform="translate(-32.359375,-9.5)"><foreignObject width="64.71875" height="19"><div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">recipient</div></foreignObject></g></g></g></g></g></g></svg>
\ No newline at end of file
+  }</style><g transform="translate(0, 0)"><g class="output"><g class="clusters"><g class="cluster" id="subGraph0" transform="translate(441.0234375,78.97608375549316)" style="opacity: 1;"><rect width="574.828125" height="141.95216751098633" x="-287.4140625" y="-70.97608375549316"></rect><g class="label" transform="translate(0, -56.97608184814453)" id="mermaid-1579981583566Text"><g transform="translate(-82.078125,-9.5)"><foreignObject width="164.15625" height="19"><div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">server (connection RU)</div></foreignObject></g></g></g></g><g class="edgePaths"><g class="edgePath" style="opacity: 1;"><path class="path" d="M75.8125,81.65072250366211L114.7109375,81.65072250366211L153.609375,81.65072250366211L179.109375,82.15072250366211" marker-end="url(#arrowhead644)" style="fill:none"></path><defs><marker id="arrowhead644" viewBox="0 0 10 10" refX="9" refY="5" markerUnits="strokeWidth" markerWidth="8" markerHeight="6" orient="auto"><path d="M 0 0 L 10 5 L 0 10 z" class="arrowheadPath" style="stroke-width: 1; stroke-dasharray: 1, 0;"></path></marker></defs></g><g class="edgePath" style="opacity: 1;"><path class="path" d="M345.859375,82.15072250366211L370.359375,81.65072250366211L395.359375,81.65072250366211" marker-end="url(#arrowhead645)" style="fill:none"></path><defs><marker id="arrowhead645" viewBox="0 0 10 10" refX="9" refY="5" markerUnits="strokeWidth" markerWidth="8" markerHeight="6" orient="auto"><path d="M 0 0 L 10 5 L 0 10 z" class="arrowheadPath" style="stroke-width: 1; stroke-dasharray: 1, 0;"></path></marker></defs></g><g class="edgePath" style="opacity: 1;"><path class="path" d="M468.15625,81.65072250366211L493.15625,81.65072250366211L518.65625,82.15072250366211" marker-end="url(#arrowhead646)" style="fill:none"></path><defs><marker id="arrowhead646" viewBox="0 0 10 10" refX="9" refY="5" markerUnits="strokeWidth" markerWidth="8" markerHeight="6" orient="auto"><path d="M 0 0 L 10 5 L 0 10 z" class="arrowheadPath" style="stroke-width: 1; stroke-dasharray: 1, 0;"></path></marker></defs></g><g class="edgePath" style="opacity: 1;"><path class="path" d="M825.3125,92.91773484360841L776.875,105.80144500732422L728.4375,105.80144500732422L695.313512735249,99.39869703316417" marker-end="url(#arrowhead647)" style="fill:none"></path><defs><marker id="arrowhead647" viewBox="0 0 10 10" refX="9" refY="5" markerUnits="strokeWidth" markerWidth="8" markerHeight="6" orient="auto"><path d="M 0 0 L 10 5 L 0 10 z" class="arrowheadPath" style="stroke-width: 1; stroke-dasharray: 1, 0;"></path></marker></defs></g><g class="edgePath" style="opacity: 1;"><path class="path" d="M696.8471344903717,67.9699914844054L728.4375,62.15072250366211L776.875,62.15072250366211L825.3125,72.5534070674205" marker-end="url(#arrowhead648)" style="fill:none"></path><defs><marker id="arrowhead648" viewBox="0 0 10 10" refX="9" refY="5" markerUnits="strokeWidth" markerWidth="8" markerHeight="6" orient="auto"><path d="M 0 0 L 10 5 L 0 10 z" class="arrowheadPath" style="stroke-width: 1; stroke-dasharray: 1, 0;"></path></marker></defs></g></g><g class="edgeLabels"><g class="edgeLabel" transform="translate(114.7109375,81.65072250366211)" style="opacity: 1;"><g transform="translate(-13.8984375,-9.5)" class="label"><foreignObject width="27.796875" height="19"><div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;"><span class="edgeLabel">msg</span></div></foreignObject></g></g><g class="edgeLabel" transform="" style="opacity: 1;"><g transform="translate(0,0)" class="label"><foreignObject width="0" height="0"><div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;"><span class="edgeLabel"></span></div></foreignObject></g></g><g class="edgeLabel" transform="" style="opacity: 1;"><g transform="translate(0,0)" class="label"><foreignObject width="0" height="0"><div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;"><span class="edgeLabel"></span></div></foreignObject></g></g><g class="edgeLabel" transform="translate(776.875,105.80144500732422)" style="opacity: 1;"><g transform="translate(-21.4765625,-9.5)" class="label"><foreignObject width="42.953125" height="19"><div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;"><span class="edgeLabel">1) req</span></div></foreignObject></g></g><g class="edgeLabel" transform="translate(776.875,62.15072250366211)" style="opacity: 1;"><g transform="translate(-23.4375,-9.5)" class="label"><foreignObject width="46.875" height="19"><div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;"><span class="edgeLabel">2) msg</span></div></foreignObject></g></g></g><g class="nodes"><g class="node" id="DB" label-offset-y="9.200963741211785" transform="translate(431.7578125,81.65072250366211)" style="opacity: 1;"><path d="M 0,9.200963741211785 a 36.3984375,9.200963741211785 0,0,0 72.796875 0 a 36.3984375,9.200963741211785 0,0,0 -72.796875 0 l 0,48.20096374121179 a 36.3984375,9.200963741211785 0,0,0 72.796875 0 l 0,-48.20096374121179" transform="translate(-36.3984375,-33.30144561181768)" class="label-container"></path><g class="label" transform="translate(0,0)"><g transform="translate(-26.3984375,-9.5)"><foreignObject width="52.796875" height="19"><div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">storage</div></foreignObject></g></g></g><g class="node" id="VS" transform="translate(261.984375,81.65072250366211)" style="opacity: 1;"><polygon points="9.75,0 157,0 166.75,-19.5 157,-39 9.75,-39 0,-19.5" transform="translate(-83.375,19.5)" class="label-container"></polygon><g class="label" transform="translate(0,0)"><g transform="translate(-63.625,-9.5)"><foreignObject width="127.25" height="19"><div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">verify sender (SK)</div></foreignObject></g></g></g><g class="node" id="VR" transform="translate(610.796875,81.65072250366211)" style="opacity: 1;"><polygon points="9.75,0 175.53125,0 185.28125,-19.5 175.53125,-39 9.75,-39 0,-19.5" transform="translate(-92.640625,19.5)" class="label-container"></polygon><g class="label" transform="translate(0,0)"><g transform="translate(-72.890625,-9.5)"><foreignObject width="145.78125" height="19"><div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">verify recipient (RK)</div></foreignObject></g></g></g><g class="node" id="S" transform="translate(41.90625,81.65072250366211)" style="opacity: 1;"><rect rx="5" ry="5" x="-33.90625" y="-19.5" width="67.8125" height="39" class="label-container"></rect><g class="label" transform="translate(0,0)"><g transform="translate(-23.90625,-9.5)"><foreignObject width="47.8125" height="19"><div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">sender</div></foreignObject></g></g></g><g class="node" id="R" transform="translate(867.671875,81.65072250366211)" style="opacity: 1;"><rect rx="5" ry="5" x="-42.359375" y="-19.5" width="84.71875" height="39" class="label-container"></rect><g class="label" transform="translate(0,0)"><g transform="translate(-32.359375,-9.5)"><foreignObject width="64.71875" height="19"><div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">recipient</div></foreignObject></g></g></g></g></g></g></svg>
\ No newline at end of file
diff --git a/simplex-messaging.md b/simplex-messaging.md
index 4ebc3cbac..1e9960c18 100644
--- a/simplex-messaging.md
+++ b/simplex-messaging.md
@@ -41,7 +41,7 @@ The messages sent into the connection are encrypted and decrypted using another
 
 ![Simplex connection](/diagrams/simplex-messaging/simplex.svg)
 
-Connection is defined by ID (`ID`) unique to the server, sender URI `SU` and receiver URI `RU`. Sender key (`SK`) is used by the server to verify sender's requests (made via `SU`) to send messages. Recipient key (`RK`) is used by the server to verify recipient's requests (made via `RU`) to retrieve messages.
+Connection is defined by recipient URI `RU` unique to the server. It also has a different unique sender URI `SU`. Sender key (`SK`) is used by the server to verify sender's requests (made via `SU`) to send messages. Recipient key (`RK`) is used by the server to verify recipient's requests (made via `RU`) to retrieve messages.
 
 The protocol uses different URIs for sender and recipient in order to provide an additional connection privacy by complicating correlation of senders and recipients.
 
@@ -56,14 +56,11 @@ To do it Alice and Bob follow these steps:
    1. she decides which simplex messaging server to use (can be the same or different server that Alice uses for other connections).
    2. she generates a new random public/private key pair (encryption key - `EK`) that she did not use before for Bob to encrypt the messages.
    3. she generates another new random public/private key pair (recepient key - `RK`) that she did not use before for her to sign requests to retrieve the messages from the server.
-   4. she generates a unique connection `ID` - generic simplex messaging protocol only requires that:
-      - it is generated by the client.
-      - it is unique on the server.
-   5. she requests from the server to create a simplex connection. The request to create the connection is un-authenticated and anonymous. This connection definition contains previouisly generated connection `ID` and a uniqie "public" key `RK` that will be used to:
+   4. she requests from the server to create a simplex connection. The request to create the connection is un-authenticated and anonymous. This connection request contains previouisly generated uniqie "public" key `RK` that will be used to:
       - verify the requests to retrieve the messages as signed by the same person who created the connection.
       - update the connection, e.g. by setting the key required to send the messages (initially Alice creates the connection that accepts unsigned requests to send messages, so anybody could send the message via this connection if they knew the connection URI).
-   6. The server responds with connection URIs:
-      - recipient URI `RU` for Alice to retrieve messages from the connection.
+   5. The server responds with connection URIs:
+      - recipient URI `RU` for Alice to manage the connection and to retrieve messages from the connection.
       - sender URI `SU` for Bob to send messages to the connection.
 2. Alice sends an out-of-band message to Bob via the alternative channel that both Alice and Bob trust (see [Simplex messaging protocol abstract](#simplex-messaging-protocol-abstract) above). The message includes:
    - the unique "public" key (`EK`) that Bob should use to encrypt messages.
@@ -78,11 +75,11 @@ To do it Alice and Bob follow these steps:
    4. he sends the encrypted message to the connection URI `SU` to confirm the connection (that Alice provided via the out-of-band message). This request to send the first message does not need to be signed.
 4. Alice retrieves Bob's message from the server via recipient connection URI `RU`:
    1. she decrypts retrieved message with "private" key `EK`.
-   2. even though anybody could have sent the message to the connection `ID` before it is secured (e.g. if communication is compromised), Alice would ignore all messages until the decryption succeeds (i.e. the result contains the expected message structure). Optionally, she also may identify Bob using the information provided, but it is not required by this protocol.
-5. Alice secures the connection `ID` so only Bob can send messages to it:
+   2. even though anybody could have sent the message to the connection with URI `SU` before it is secured (e.g. if communication is compromised), Alice would ignore all messages until the decryption succeeds (i.e. the result contains the expected message structure). Optionally, she also may identify Bob using the information provided, but it is not required by this protocol.
+5. Alice secures the connection `RU` so only Bob can send messages to it:
    1. she sends the request to `RU` signed with "private" key `RK` to update the connection to only accept requests signed by "private" key `SK` provided by Bob.
-   2. From this moment the server will accept only signed requests, and only Bob will be able to send messages to the `SU` corresponding to connection `ID`.
-6. The simplex connection `ID` is now established on the server.
+   2. From this moment the server will accept only signed requests, and only Bob will be able to send messages to the `SU` corresponding to connection `RU`.
+6. The simplex connection `RU` is now established on the server.
 
 **Creating simplex connection from Bob to Alice:**
 
@@ -96,7 +93,7 @@ Bob now can securely send messages to Alice.
    2. he signs the request to the server (via `SU`) using the "private" key `SK` (that only he knows, used only for this connection).
    3. he sends the request to the server, that the server will verify using the "public" key SK (that Alice provided to the server).
 2. Alice retrieves the message(s):
-   1. she signs request to the server with the "private" key `RK` (that only she has, used only for this connection).
+   1. she signs request to the server with the "private" key `RK` (that only she has, used only for this connection) and sends it to `RU`.
    2. the server, having verified Alice's request with the "public" key `RK` that she provided, responds with Bob's message(s).
    3. she decrypts Bob's message(s) with the "private" key `EK` (that only she has).
 
@@ -118,17 +115,6 @@ This protocol also can be used for off-the-record messaging, as Alice and Bob ca
 How simplex connections are used by the participants (graph vertices) is defined by graph-chat protocol and is not in scope of this low level simplex messaging protocol.
 
 
-## Alternative flow to establish a simplex connection
-
-When Alice and Bob already have a secure duplex (bi-directional) communication channel that allows to conveniently send two out-of-band messages, a flow with smaller number of steps to establish the connection can be used.
-
-TODO
-
-**Alternative flow of creating a simplex connection from Bob to Alice:**
-
-![Alternative flow of creating connection](/diagrams/simplex-messaging/simplex-creating-alt.svg)
-
-
 ## Elements of the generic simplex messaging protocol
 
 - defines only message-passing protocol:
@@ -149,7 +135,7 @@ TODO
   - both "public" keys are provided to the server by the connection recepient when the connection is established.
   - the "public" keys known to the server and used to authenticate requests from the participants are unrelated to the keys used to encrypt and decrypt the messages - the latter keys are also unique per each connection but they are only known to participants, not to the servers.
   - messaging graph can be asymmetric: Bob's ability to send messages to Alice does not automatically lead to the Alice's ability to send messages to Bob.
-  - connections are identified by the "connection URI" - server URI and connection ID (`ID`).
+  - connections are identified by sender and recipient server URIs.
 
 
 [1]: https://en.wikipedia.org/wiki/Man-in-the-middle_attack