diff --git a/zcash-zf-dag.html b/zcash-zf-dag.html
index 4a7f86cd..59e5acd2 100644
--- a/zcash-zf-dag.html
+++ b/zcash-zf-dag.html
@@ -23,111 +23,18 @@
 <polygon fill="white" stroke="transparent" points="-4,4 -4,-2497 867,-2497 867,4 -4,4"/>
 <g id="clust1" class="cluster">
 <title>cluster_0</title>
-<polygon fill="none" stroke="blue" points="16.5,-76 16.5,-484 579.5,-484 579.5,-76 16.5,-76"/>
-<text text-anchor="middle" x="298" y="-468.8" font-family="Times,serif" font-size="14.00">Epic: Improvements from Zebra Audit</text>
-</g>
-<g id="clust2" class="cluster">
-<title>cluster_1</title>
 <polygon fill="none" stroke="blue" points="16.5,-654 16.5,-833 579.5,-833 579.5,-654 16.5,-654"/>
 <text text-anchor="middle" x="298" y="-817.8" font-family="Times,serif" font-size="14.00">Epic: Zebra Stable Release</text>
 </g>
-<!-- ZcashFoundation/zebra#1956 -->
-<g id="node1" class="node open">
-<title>ZcashFoundation/zebra#1956</title>
-<g id="a_node1"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/1956" xlink:title="ZcashFoundation/zebra#1956&#10;Zebra should store a&#10;persistent list of recent&#10;successful peers" target="_blank">
-<polygon fill="#c2e0c6" stroke="black" stroke-width="2" points="255.5,-453 24.5,-453 24.5,-385 255.5,-385 255.5,-453"/>
-<text text-anchor="middle" x="140" y="-437.8" font-family="Times,serif" font-size="14.00">ZcashFoundation/zebra#1956</text>
-<text text-anchor="middle" x="140" y="-422.8" font-family="Times,serif" font-size="14.00">Zebra should store a</text>
-<text text-anchor="middle" x="140" y="-407.8" font-family="Times,serif" font-size="14.00">persistent list of recent</text>
-<text text-anchor="middle" x="140" y="-392.8" font-family="Times,serif" font-size="14.00">successful peers</text>
-</a>
-</g>
-</g>
-<!-- ZcashFoundation/zebra#6680 -->
-<g id="node2" class="node open">
-<title>ZcashFoundation/zebra#6680</title>
-<g id="a_node2"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/6680" xlink:title="ZcashFoundation/zebra#6680&#10;Renames to address&#10;confusion in zebra&#39;s&#10;handling of finalized&#10;state" target="_blank">
-<polygon fill="#c2e0c6" stroke="black" stroke-width="2" points="255.5,-366.5 24.5,-366.5 24.5,-283.5 255.5,-283.5 255.5,-366.5"/>
-<text text-anchor="middle" x="140" y="-351.3" font-family="Times,serif" font-size="14.00">ZcashFoundation/zebra#6680</text>
-<text text-anchor="middle" x="140" y="-336.3" font-family="Times,serif" font-size="14.00">Renames to address</text>
-<text text-anchor="middle" x="140" y="-321.3" font-family="Times,serif" font-size="14.00">confusion in zebra&#39;s</text>
-<text text-anchor="middle" x="140" y="-306.3" font-family="Times,serif" font-size="14.00">handling of finalized</text>
-<text text-anchor="middle" x="140" y="-291.3" font-family="Times,serif" font-size="14.00">state</text>
-</a>
-</g>
-</g>
-<!-- ZcashFoundation/zebra#6681 -->
-<g id="node3" class="node open">
-<title>ZcashFoundation/zebra#6681</title>
-<g id="a_node3"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/6681" xlink:title="ZcashFoundation/zebra#6681&#10;Update documentation to&#10;clarify terminology&#10;around block verification" target="_blank">
-<polygon fill="#c2e0c6" stroke="black" points="571.5,-359 340.5,-359 340.5,-291 571.5,-291 571.5,-359"/>
-<text text-anchor="middle" x="456" y="-343.8" font-family="Times,serif" font-size="14.00">ZcashFoundation/zebra#6681</text>
-<text text-anchor="middle" x="456" y="-328.8" font-family="Times,serif" font-size="14.00">Update documentation to</text>
-<text text-anchor="middle" x="456" y="-313.8" font-family="Times,serif" font-size="14.00">clarify terminology</text>
-<text text-anchor="middle" x="456" y="-298.8" font-family="Times,serif" font-size="14.00">around block verification</text>
-</a>
-</g>
-</g>
-<!-- ZcashFoundation/zebra#6680&#45;&gt;ZcashFoundation/zebra#6681 -->
-<g id="edge1" class="edge">
-<title>ZcashFoundation/zebra#6680&#45;&gt;ZcashFoundation/zebra#6681</title>
-<path fill="none" stroke="black" d="M255.69,-325C279.95,-325 305.65,-325 330.25,-325"/>
-<polygon fill="black" stroke="black" points="330.35,-328.5 340.35,-325 330.35,-321.5 330.35,-328.5"/>
-</g>
-<!-- ZcashFoundation/zebra#6388 -->
-<g id="node10" class="node open">
-<title>ZcashFoundation/zebra#6388</title>
-<g id="a_node10"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/6388" xlink:title="ZcashFoundation/zebra#6388&#10;can_fork_chain_at()&#10;should ignore blocks&#10;below the finalized tip" target="_blank">
-<polygon fill="#c2e0c6" stroke="black" points="571.5,-68 340.5,-68 340.5,0 571.5,0 571.5,-68"/>
-<text text-anchor="middle" x="456" y="-52.8" font-family="Times,serif" font-size="14.00">ZcashFoundation/zebra#6388</text>
-<text text-anchor="middle" x="456" y="-37.8" font-family="Times,serif" font-size="14.00">can_fork_chain_at()</text>
-<text text-anchor="middle" x="456" y="-22.8" font-family="Times,serif" font-size="14.00">should ignore blocks</text>
-<text text-anchor="middle" x="456" y="-7.8" font-family="Times,serif" font-size="14.00">below the finalized tip</text>
-</a>
-</g>
-</g>
-<!-- ZcashFoundation/zebra#6680&#45;&gt;ZcashFoundation/zebra#6388 -->
-<g id="edge3" class="edge">
-<title>ZcashFoundation/zebra#6680&#45;&gt;ZcashFoundation/zebra#6388</title>
-<path fill="none" stroke="black" d="M255.78,-295.65C264.85,-289.95 273.14,-283.14 280,-275 339.07,-204.95 254.23,-139.68 316,-72 320.65,-66.91 325.9,-62.48 331.58,-58.61"/>
-<polygon fill="black" stroke="black" points="333.47,-61.56 340.18,-53.36 329.82,-55.59 333.47,-61.56"/>
-</g>
-<!-- ZcashFoundation/zebra#6673 -->
-<g id="node4" class="node open">
-<title>ZcashFoundation/zebra#6673</title>
-<g id="a_node4"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/6673" xlink:title="ZcashFoundation/zebra#6673&#10;Outdated Documentation in&#10;`zebra&#45;state`" target="_blank">
-<polygon fill="#c2e0c6" stroke="black" stroke-width="2" points="255.5,-265.5 24.5,-265.5 24.5,-212.5 255.5,-212.5 255.5,-265.5"/>
-<text text-anchor="middle" x="140" y="-250.3" font-family="Times,serif" font-size="14.00">ZcashFoundation/zebra#6673</text>
-<text text-anchor="middle" x="140" y="-235.3" font-family="Times,serif" font-size="14.00">Outdated Documentation in</text>
-<text text-anchor="middle" x="140" y="-220.3" font-family="Times,serif" font-size="14.00">`zebra&#45;state`</text>
-</a>
-</g>
-</g>
-<!-- ZcashFoundation/zebra#6675 -->
-<g id="node5" class="node open">
-<title>ZcashFoundation/zebra#6675</title>
-<g id="a_node5"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/6675" xlink:title="ZcashFoundation/zebra#6675&#10;Notes on Peer Sourcing" target="_blank">
-<polygon fill="#c2e0c6" stroke="black" stroke-width="2" points="255.5,-194 24.5,-194 24.5,-156 255.5,-156 255.5,-194"/>
-<text text-anchor="middle" x="140" y="-178.8" font-family="Times,serif" font-size="14.00">ZcashFoundation/zebra#6675</text>
-<text text-anchor="middle" x="140" y="-163.8" font-family="Times,serif" font-size="14.00">Notes on Peer Sourcing</text>
-</a>
-</g>
-</g>
-<!-- ZcashFoundation/zebra#6281 -->
-<g id="node6" class="node open">
-<title>ZcashFoundation/zebra#6281</title>
-<g id="a_node6"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/6281" xlink:title="ZcashFoundation/zebra#6281&#10;Tracking: TODOs with&#10;closed tasks" target="_blank">
-<polygon fill="#c2e0c6" stroke="black" stroke-width="2" points="255.5,-137.5 24.5,-137.5 24.5,-84.5 255.5,-84.5 255.5,-137.5"/>
-<text text-anchor="middle" x="140" y="-122.3" font-family="Times,serif" font-size="14.00">ZcashFoundation/zebra#6281</text>
-<text text-anchor="middle" x="140" y="-107.3" font-family="Times,serif" font-size="14.00">Tracking: TODOs with</text>
-<text text-anchor="middle" x="140" y="-92.3" font-family="Times,serif" font-size="14.00">closed tasks</text>
-</a>
-</g>
+<g id="clust2" class="cluster">
+<title>cluster_1</title>
+<polygon fill="none" stroke="blue" points="16.5,-76 16.5,-484 579.5,-484 579.5,-76 16.5,-76"/>
+<text text-anchor="middle" x="298" y="-468.8" font-family="Times,serif" font-size="14.00">Epic: Improvements from Zebra Audit</text>
 </g>
 <!-- ZcashFoundation/zebra#5502 -->
-<g id="node7" class="node open">
+<g id="node1" class="node open">
 <title>ZcashFoundation/zebra#5502</title>
-<g id="a_node7"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/5502" xlink:title="ZcashFoundation/zebra#5502&#10;Migrate to the latest&#10;version of Abscissa (0.7&#10;or later)" target="_blank">
+<g id="a_node1"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/5502" xlink:title="ZcashFoundation/zebra#5502&#10;Migrate to the latest&#10;version of Abscissa (0.7&#10;or later)" target="_blank">
 <polygon fill="#c2e0c6" stroke="black" stroke-width="2" points="255.5,-730 24.5,-730 24.5,-662 255.5,-662 255.5,-730"/>
 <text text-anchor="middle" x="140" y="-714.8" font-family="Times,serif" font-size="14.00">ZcashFoundation/zebra#5502</text>
 <text text-anchor="middle" x="140" y="-699.8" font-family="Times,serif" font-size="14.00">Migrate to the latest</text>
@@ -173,9 +80,9 @@
 <polygon fill="black" stroke="black" points="332.51,-565.18 340.4,-558.11 329.82,-558.72 332.51,-565.18"/>
 </g>
 <!-- ZcashFoundation/zebra#6202 -->
-<g id="node8" class="node open">
+<g id="node2" class="node open">
 <title>ZcashFoundation/zebra#6202</title>
-<g id="a_node8"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/6202" xlink:title="ZcashFoundation/zebra#6202&#10;Rename `tower&#45;batch`&#10;crate" target="_blank">
+<g id="a_node2"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/6202" xlink:title="ZcashFoundation/zebra#6202&#10;Rename `tower&#45;batch`&#10;crate" target="_blank">
 <polygon fill="#c2e0c6" stroke="black" stroke-width="2" points="255.5,-801.5 24.5,-801.5 24.5,-748.5 255.5,-748.5 255.5,-801.5"/>
 <text text-anchor="middle" x="140" y="-786.3" font-family="Times,serif" font-size="14.00">ZcashFoundation/zebra#6202</text>
 <text text-anchor="middle" x="140" y="-771.3" font-family="Times,serif" font-size="14.00">Rename `tower&#45;batch`</text>
@@ -184,9 +91,9 @@
 </g>
 </g>
 <!-- ZcashFoundation/zebra#6149 -->
-<g id="node9" class="node open">
+<g id="node3" class="node open">
 <title>ZcashFoundation/zebra#6149</title>
-<g id="a_node9"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/6149" xlink:title="ZcashFoundation/zebra#6149&#10;Publish zebra crates to&#10;crates.io" target="_blank">
+<g id="a_node3"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/6149" xlink:title="ZcashFoundation/zebra#6149&#10;Publish zebra crates to&#10;crates.io" target="_blank">
 <polygon fill="#c2e0c6" stroke="black" points="571.5,-801.5 340.5,-801.5 340.5,-748.5 571.5,-748.5 571.5,-801.5"/>
 <text text-anchor="middle" x="456" y="-786.3" font-family="Times,serif" font-size="14.00">ZcashFoundation/zebra#6149</text>
 <text text-anchor="middle" x="456" y="-771.3" font-family="Times,serif" font-size="14.00">Publish zebra crates to</text>
@@ -195,11 +102,104 @@
 </g>
 </g>
 <!-- ZcashFoundation/zebra#6202&#45;&gt;ZcashFoundation/zebra#6149 -->
-<g id="edge2" class="edge">
+<g id="edge1" class="edge">
 <title>ZcashFoundation/zebra#6202&#45;&gt;ZcashFoundation/zebra#6149</title>
 <path fill="none" stroke="black" d="M255.69,-775C279.95,-775 305.65,-775 330.25,-775"/>
 <polygon fill="black" stroke="black" points="330.35,-778.5 340.35,-775 330.35,-771.5 330.35,-778.5"/>
 </g>
+<!-- ZcashFoundation/zebra#1956 -->
+<g id="node4" class="node open">
+<title>ZcashFoundation/zebra#1956</title>
+<g id="a_node4"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/1956" xlink:title="ZcashFoundation/zebra#1956&#10;Zebra should store a&#10;persistent list of recent&#10;successful peers" target="_blank">
+<polygon fill="#c2e0c6" stroke="black" stroke-width="2" points="255.5,-453 24.5,-453 24.5,-385 255.5,-385 255.5,-453"/>
+<text text-anchor="middle" x="140" y="-437.8" font-family="Times,serif" font-size="14.00">ZcashFoundation/zebra#1956</text>
+<text text-anchor="middle" x="140" y="-422.8" font-family="Times,serif" font-size="14.00">Zebra should store a</text>
+<text text-anchor="middle" x="140" y="-407.8" font-family="Times,serif" font-size="14.00">persistent list of recent</text>
+<text text-anchor="middle" x="140" y="-392.8" font-family="Times,serif" font-size="14.00">successful peers</text>
+</a>
+</g>
+</g>
+<!-- ZcashFoundation/zebra#6680 -->
+<g id="node5" class="node open">
+<title>ZcashFoundation/zebra#6680</title>
+<g id="a_node5"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/6680" xlink:title="ZcashFoundation/zebra#6680&#10;Renames to address&#10;confusion in zebra&#39;s&#10;handling of finalized&#10;state" target="_blank">
+<polygon fill="#c2e0c6" stroke="black" stroke-width="2" points="255.5,-366.5 24.5,-366.5 24.5,-283.5 255.5,-283.5 255.5,-366.5"/>
+<text text-anchor="middle" x="140" y="-351.3" font-family="Times,serif" font-size="14.00">ZcashFoundation/zebra#6680</text>
+<text text-anchor="middle" x="140" y="-336.3" font-family="Times,serif" font-size="14.00">Renames to address</text>
+<text text-anchor="middle" x="140" y="-321.3" font-family="Times,serif" font-size="14.00">confusion in zebra&#39;s</text>
+<text text-anchor="middle" x="140" y="-306.3" font-family="Times,serif" font-size="14.00">handling of finalized</text>
+<text text-anchor="middle" x="140" y="-291.3" font-family="Times,serif" font-size="14.00">state</text>
+</a>
+</g>
+</g>
+<!-- ZcashFoundation/zebra#6681 -->
+<g id="node6" class="node open">
+<title>ZcashFoundation/zebra#6681</title>
+<g id="a_node6"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/6681" xlink:title="ZcashFoundation/zebra#6681&#10;Update documentation to&#10;clarify terminology&#10;around block verification" target="_blank">
+<polygon fill="#c2e0c6" stroke="black" points="571.5,-359 340.5,-359 340.5,-291 571.5,-291 571.5,-359"/>
+<text text-anchor="middle" x="456" y="-343.8" font-family="Times,serif" font-size="14.00">ZcashFoundation/zebra#6681</text>
+<text text-anchor="middle" x="456" y="-328.8" font-family="Times,serif" font-size="14.00">Update documentation to</text>
+<text text-anchor="middle" x="456" y="-313.8" font-family="Times,serif" font-size="14.00">clarify terminology</text>
+<text text-anchor="middle" x="456" y="-298.8" font-family="Times,serif" font-size="14.00">around block verification</text>
+</a>
+</g>
+</g>
+<!-- ZcashFoundation/zebra#6680&#45;&gt;ZcashFoundation/zebra#6681 -->
+<g id="edge2" class="edge">
+<title>ZcashFoundation/zebra#6680&#45;&gt;ZcashFoundation/zebra#6681</title>
+<path fill="none" stroke="black" d="M255.69,-325C279.95,-325 305.65,-325 330.25,-325"/>
+<polygon fill="black" stroke="black" points="330.35,-328.5 340.35,-325 330.35,-321.5 330.35,-328.5"/>
+</g>
+<!-- ZcashFoundation/zebra#6388 -->
+<g id="node10" class="node open">
+<title>ZcashFoundation/zebra#6388</title>
+<g id="a_node10"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/6388" xlink:title="ZcashFoundation/zebra#6388&#10;can_fork_chain_at()&#10;should ignore blocks&#10;below the finalized tip" target="_blank">
+<polygon fill="#c2e0c6" stroke="black" points="571.5,-68 340.5,-68 340.5,0 571.5,0 571.5,-68"/>
+<text text-anchor="middle" x="456" y="-52.8" font-family="Times,serif" font-size="14.00">ZcashFoundation/zebra#6388</text>
+<text text-anchor="middle" x="456" y="-37.8" font-family="Times,serif" font-size="14.00">can_fork_chain_at()</text>
+<text text-anchor="middle" x="456" y="-22.8" font-family="Times,serif" font-size="14.00">should ignore blocks</text>
+<text text-anchor="middle" x="456" y="-7.8" font-family="Times,serif" font-size="14.00">below the finalized tip</text>
+</a>
+</g>
+</g>
+<!-- ZcashFoundation/zebra#6680&#45;&gt;ZcashFoundation/zebra#6388 -->
+<g id="edge3" class="edge">
+<title>ZcashFoundation/zebra#6680&#45;&gt;ZcashFoundation/zebra#6388</title>
+<path fill="none" stroke="black" d="M255.78,-295.65C264.85,-289.95 273.14,-283.14 280,-275 339.07,-204.95 254.23,-139.68 316,-72 320.65,-66.91 325.9,-62.48 331.58,-58.61"/>
+<polygon fill="black" stroke="black" points="333.47,-61.56 340.18,-53.36 329.82,-55.59 333.47,-61.56"/>
+</g>
+<!-- ZcashFoundation/zebra#6673 -->
+<g id="node7" class="node open">
+<title>ZcashFoundation/zebra#6673</title>
+<g id="a_node7"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/6673" xlink:title="ZcashFoundation/zebra#6673&#10;Outdated Documentation in&#10;`zebra&#45;state`" target="_blank">
+<polygon fill="#c2e0c6" stroke="black" stroke-width="2" points="255.5,-265.5 24.5,-265.5 24.5,-212.5 255.5,-212.5 255.5,-265.5"/>
+<text text-anchor="middle" x="140" y="-250.3" font-family="Times,serif" font-size="14.00">ZcashFoundation/zebra#6673</text>
+<text text-anchor="middle" x="140" y="-235.3" font-family="Times,serif" font-size="14.00">Outdated Documentation in</text>
+<text text-anchor="middle" x="140" y="-220.3" font-family="Times,serif" font-size="14.00">`zebra&#45;state`</text>
+</a>
+</g>
+</g>
+<!-- ZcashFoundation/zebra#6675 -->
+<g id="node8" class="node open">
+<title>ZcashFoundation/zebra#6675</title>
+<g id="a_node8"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/6675" xlink:title="ZcashFoundation/zebra#6675&#10;Notes on Peer Sourcing" target="_blank">
+<polygon fill="#c2e0c6" stroke="black" stroke-width="2" points="255.5,-194 24.5,-194 24.5,-156 255.5,-156 255.5,-194"/>
+<text text-anchor="middle" x="140" y="-178.8" font-family="Times,serif" font-size="14.00">ZcashFoundation/zebra#6675</text>
+<text text-anchor="middle" x="140" y="-163.8" font-family="Times,serif" font-size="14.00">Notes on Peer Sourcing</text>
+</a>
+</g>
+</g>
+<!-- ZcashFoundation/zebra#6281 -->
+<g id="node9" class="node open">
+<title>ZcashFoundation/zebra#6281</title>
+<g id="a_node9"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/6281" xlink:title="ZcashFoundation/zebra#6281&#10;Tracking: TODOs with&#10;closed tasks" target="_blank">
+<polygon fill="#c2e0c6" stroke="black" stroke-width="2" points="255.5,-137.5 24.5,-137.5 24.5,-84.5 255.5,-84.5 255.5,-137.5"/>
+<text text-anchor="middle" x="140" y="-122.3" font-family="Times,serif" font-size="14.00">ZcashFoundation/zebra#6281</text>
+<text text-anchor="middle" x="140" y="-107.3" font-family="Times,serif" font-size="14.00">Tracking: TODOs with</text>
+<text text-anchor="middle" x="140" y="-92.3" font-family="Times,serif" font-size="14.00">closed tasks</text>
+</a>
+</g>
+</g>
 <!-- ZcashFoundation/zebra#5125 -->
 <g id="node13" class="node open">
 <title>ZcashFoundation/zebra#5125</title>
diff --git a/zcash-zf-dag.svg b/zcash-zf-dag.svg
index b464b955..d1790056 100644
--- a/zcash-zf-dag.svg
+++ b/zcash-zf-dag.svg
@@ -11,111 +11,18 @@
 <polygon fill="white" stroke="transparent" points="-4,4 -4,-2497 867,-2497 867,4 -4,4"/>
 <g id="clust1" class="cluster">
 <title>cluster_0</title>
-<polygon fill="none" stroke="blue" points="16.5,-76 16.5,-484 579.5,-484 579.5,-76 16.5,-76"/>
-<text text-anchor="middle" x="298" y="-468.8" font-family="Times,serif" font-size="14.00">Epic: Improvements from Zebra Audit</text>
-</g>
-<g id="clust2" class="cluster">
-<title>cluster_1</title>
 <polygon fill="none" stroke="blue" points="16.5,-654 16.5,-833 579.5,-833 579.5,-654 16.5,-654"/>
 <text text-anchor="middle" x="298" y="-817.8" font-family="Times,serif" font-size="14.00">Epic: Zebra Stable Release</text>
 </g>
-<!-- ZcashFoundation/zebra#1956 -->
-<g id="node1" class="node open">
-<title>ZcashFoundation/zebra#1956</title>
-<g id="a_node1"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/1956" xlink:title="ZcashFoundation/zebra#1956&#10;Zebra should store a&#10;persistent list of recent&#10;successful peers" target="_blank">
-<polygon fill="#c2e0c6" stroke="black" stroke-width="2" points="255.5,-453 24.5,-453 24.5,-385 255.5,-385 255.5,-453"/>
-<text text-anchor="middle" x="140" y="-437.8" font-family="Times,serif" font-size="14.00">ZcashFoundation/zebra#1956</text>
-<text text-anchor="middle" x="140" y="-422.8" font-family="Times,serif" font-size="14.00">Zebra should store a</text>
-<text text-anchor="middle" x="140" y="-407.8" font-family="Times,serif" font-size="14.00">persistent list of recent</text>
-<text text-anchor="middle" x="140" y="-392.8" font-family="Times,serif" font-size="14.00">successful peers</text>
-</a>
-</g>
-</g>
-<!-- ZcashFoundation/zebra#6680 -->
-<g id="node2" class="node open">
-<title>ZcashFoundation/zebra#6680</title>
-<g id="a_node2"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/6680" xlink:title="ZcashFoundation/zebra#6680&#10;Renames to address&#10;confusion in zebra&#39;s&#10;handling of finalized&#10;state" target="_blank">
-<polygon fill="#c2e0c6" stroke="black" stroke-width="2" points="255.5,-366.5 24.5,-366.5 24.5,-283.5 255.5,-283.5 255.5,-366.5"/>
-<text text-anchor="middle" x="140" y="-351.3" font-family="Times,serif" font-size="14.00">ZcashFoundation/zebra#6680</text>
-<text text-anchor="middle" x="140" y="-336.3" font-family="Times,serif" font-size="14.00">Renames to address</text>
-<text text-anchor="middle" x="140" y="-321.3" font-family="Times,serif" font-size="14.00">confusion in zebra&#39;s</text>
-<text text-anchor="middle" x="140" y="-306.3" font-family="Times,serif" font-size="14.00">handling of finalized</text>
-<text text-anchor="middle" x="140" y="-291.3" font-family="Times,serif" font-size="14.00">state</text>
-</a>
-</g>
-</g>
-<!-- ZcashFoundation/zebra#6681 -->
-<g id="node3" class="node open">
-<title>ZcashFoundation/zebra#6681</title>
-<g id="a_node3"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/6681" xlink:title="ZcashFoundation/zebra#6681&#10;Update documentation to&#10;clarify terminology&#10;around block verification" target="_blank">
-<polygon fill="#c2e0c6" stroke="black" points="571.5,-359 340.5,-359 340.5,-291 571.5,-291 571.5,-359"/>
-<text text-anchor="middle" x="456" y="-343.8" font-family="Times,serif" font-size="14.00">ZcashFoundation/zebra#6681</text>
-<text text-anchor="middle" x="456" y="-328.8" font-family="Times,serif" font-size="14.00">Update documentation to</text>
-<text text-anchor="middle" x="456" y="-313.8" font-family="Times,serif" font-size="14.00">clarify terminology</text>
-<text text-anchor="middle" x="456" y="-298.8" font-family="Times,serif" font-size="14.00">around block verification</text>
-</a>
-</g>
-</g>
-<!-- ZcashFoundation/zebra#6680&#45;&gt;ZcashFoundation/zebra#6681 -->
-<g id="edge1" class="edge">
-<title>ZcashFoundation/zebra#6680&#45;&gt;ZcashFoundation/zebra#6681</title>
-<path fill="none" stroke="black" d="M255.69,-325C279.95,-325 305.65,-325 330.25,-325"/>
-<polygon fill="black" stroke="black" points="330.35,-328.5 340.35,-325 330.35,-321.5 330.35,-328.5"/>
-</g>
-<!-- ZcashFoundation/zebra#6388 -->
-<g id="node10" class="node open">
-<title>ZcashFoundation/zebra#6388</title>
-<g id="a_node10"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/6388" xlink:title="ZcashFoundation/zebra#6388&#10;can_fork_chain_at()&#10;should ignore blocks&#10;below the finalized tip" target="_blank">
-<polygon fill="#c2e0c6" stroke="black" points="571.5,-68 340.5,-68 340.5,0 571.5,0 571.5,-68"/>
-<text text-anchor="middle" x="456" y="-52.8" font-family="Times,serif" font-size="14.00">ZcashFoundation/zebra#6388</text>
-<text text-anchor="middle" x="456" y="-37.8" font-family="Times,serif" font-size="14.00">can_fork_chain_at()</text>
-<text text-anchor="middle" x="456" y="-22.8" font-family="Times,serif" font-size="14.00">should ignore blocks</text>
-<text text-anchor="middle" x="456" y="-7.8" font-family="Times,serif" font-size="14.00">below the finalized tip</text>
-</a>
-</g>
-</g>
-<!-- ZcashFoundation/zebra#6680&#45;&gt;ZcashFoundation/zebra#6388 -->
-<g id="edge3" class="edge">
-<title>ZcashFoundation/zebra#6680&#45;&gt;ZcashFoundation/zebra#6388</title>
-<path fill="none" stroke="black" d="M255.78,-295.65C264.85,-289.95 273.14,-283.14 280,-275 339.07,-204.95 254.23,-139.68 316,-72 320.65,-66.91 325.9,-62.48 331.58,-58.61"/>
-<polygon fill="black" stroke="black" points="333.47,-61.56 340.18,-53.36 329.82,-55.59 333.47,-61.56"/>
-</g>
-<!-- ZcashFoundation/zebra#6673 -->
-<g id="node4" class="node open">
-<title>ZcashFoundation/zebra#6673</title>
-<g id="a_node4"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/6673" xlink:title="ZcashFoundation/zebra#6673&#10;Outdated Documentation in&#10;`zebra&#45;state`" target="_blank">
-<polygon fill="#c2e0c6" stroke="black" stroke-width="2" points="255.5,-265.5 24.5,-265.5 24.5,-212.5 255.5,-212.5 255.5,-265.5"/>
-<text text-anchor="middle" x="140" y="-250.3" font-family="Times,serif" font-size="14.00">ZcashFoundation/zebra#6673</text>
-<text text-anchor="middle" x="140" y="-235.3" font-family="Times,serif" font-size="14.00">Outdated Documentation in</text>
-<text text-anchor="middle" x="140" y="-220.3" font-family="Times,serif" font-size="14.00">`zebra&#45;state`</text>
-</a>
-</g>
-</g>
-<!-- ZcashFoundation/zebra#6675 -->
-<g id="node5" class="node open">
-<title>ZcashFoundation/zebra#6675</title>
-<g id="a_node5"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/6675" xlink:title="ZcashFoundation/zebra#6675&#10;Notes on Peer Sourcing" target="_blank">
-<polygon fill="#c2e0c6" stroke="black" stroke-width="2" points="255.5,-194 24.5,-194 24.5,-156 255.5,-156 255.5,-194"/>
-<text text-anchor="middle" x="140" y="-178.8" font-family="Times,serif" font-size="14.00">ZcashFoundation/zebra#6675</text>
-<text text-anchor="middle" x="140" y="-163.8" font-family="Times,serif" font-size="14.00">Notes on Peer Sourcing</text>
-</a>
-</g>
-</g>
-<!-- ZcashFoundation/zebra#6281 -->
-<g id="node6" class="node open">
-<title>ZcashFoundation/zebra#6281</title>
-<g id="a_node6"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/6281" xlink:title="ZcashFoundation/zebra#6281&#10;Tracking: TODOs with&#10;closed tasks" target="_blank">
-<polygon fill="#c2e0c6" stroke="black" stroke-width="2" points="255.5,-137.5 24.5,-137.5 24.5,-84.5 255.5,-84.5 255.5,-137.5"/>
-<text text-anchor="middle" x="140" y="-122.3" font-family="Times,serif" font-size="14.00">ZcashFoundation/zebra#6281</text>
-<text text-anchor="middle" x="140" y="-107.3" font-family="Times,serif" font-size="14.00">Tracking: TODOs with</text>
-<text text-anchor="middle" x="140" y="-92.3" font-family="Times,serif" font-size="14.00">closed tasks</text>
-</a>
-</g>
+<g id="clust2" class="cluster">
+<title>cluster_1</title>
+<polygon fill="none" stroke="blue" points="16.5,-76 16.5,-484 579.5,-484 579.5,-76 16.5,-76"/>
+<text text-anchor="middle" x="298" y="-468.8" font-family="Times,serif" font-size="14.00">Epic: Improvements from Zebra Audit</text>
 </g>
 <!-- ZcashFoundation/zebra#5502 -->
-<g id="node7" class="node open">
+<g id="node1" class="node open">
 <title>ZcashFoundation/zebra#5502</title>
-<g id="a_node7"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/5502" xlink:title="ZcashFoundation/zebra#5502&#10;Migrate to the latest&#10;version of Abscissa (0.7&#10;or later)" target="_blank">
+<g id="a_node1"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/5502" xlink:title="ZcashFoundation/zebra#5502&#10;Migrate to the latest&#10;version of Abscissa (0.7&#10;or later)" target="_blank">
 <polygon fill="#c2e0c6" stroke="black" stroke-width="2" points="255.5,-730 24.5,-730 24.5,-662 255.5,-662 255.5,-730"/>
 <text text-anchor="middle" x="140" y="-714.8" font-family="Times,serif" font-size="14.00">ZcashFoundation/zebra#5502</text>
 <text text-anchor="middle" x="140" y="-699.8" font-family="Times,serif" font-size="14.00">Migrate to the latest</text>
@@ -161,9 +68,9 @@
 <polygon fill="black" stroke="black" points="332.51,-565.18 340.4,-558.11 329.82,-558.72 332.51,-565.18"/>
 </g>
 <!-- ZcashFoundation/zebra#6202 -->
-<g id="node8" class="node open">
+<g id="node2" class="node open">
 <title>ZcashFoundation/zebra#6202</title>
-<g id="a_node8"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/6202" xlink:title="ZcashFoundation/zebra#6202&#10;Rename `tower&#45;batch`&#10;crate" target="_blank">
+<g id="a_node2"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/6202" xlink:title="ZcashFoundation/zebra#6202&#10;Rename `tower&#45;batch`&#10;crate" target="_blank">
 <polygon fill="#c2e0c6" stroke="black" stroke-width="2" points="255.5,-801.5 24.5,-801.5 24.5,-748.5 255.5,-748.5 255.5,-801.5"/>
 <text text-anchor="middle" x="140" y="-786.3" font-family="Times,serif" font-size="14.00">ZcashFoundation/zebra#6202</text>
 <text text-anchor="middle" x="140" y="-771.3" font-family="Times,serif" font-size="14.00">Rename `tower&#45;batch`</text>
@@ -172,9 +79,9 @@
 </g>
 </g>
 <!-- ZcashFoundation/zebra#6149 -->
-<g id="node9" class="node open">
+<g id="node3" class="node open">
 <title>ZcashFoundation/zebra#6149</title>
-<g id="a_node9"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/6149" xlink:title="ZcashFoundation/zebra#6149&#10;Publish zebra crates to&#10;crates.io" target="_blank">
+<g id="a_node3"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/6149" xlink:title="ZcashFoundation/zebra#6149&#10;Publish zebra crates to&#10;crates.io" target="_blank">
 <polygon fill="#c2e0c6" stroke="black" points="571.5,-801.5 340.5,-801.5 340.5,-748.5 571.5,-748.5 571.5,-801.5"/>
 <text text-anchor="middle" x="456" y="-786.3" font-family="Times,serif" font-size="14.00">ZcashFoundation/zebra#6149</text>
 <text text-anchor="middle" x="456" y="-771.3" font-family="Times,serif" font-size="14.00">Publish zebra crates to</text>
@@ -183,11 +90,104 @@
 </g>
 </g>
 <!-- ZcashFoundation/zebra#6202&#45;&gt;ZcashFoundation/zebra#6149 -->
-<g id="edge2" class="edge">
+<g id="edge1" class="edge">
 <title>ZcashFoundation/zebra#6202&#45;&gt;ZcashFoundation/zebra#6149</title>
 <path fill="none" stroke="black" d="M255.69,-775C279.95,-775 305.65,-775 330.25,-775"/>
 <polygon fill="black" stroke="black" points="330.35,-778.5 340.35,-775 330.35,-771.5 330.35,-778.5"/>
 </g>
+<!-- ZcashFoundation/zebra#1956 -->
+<g id="node4" class="node open">
+<title>ZcashFoundation/zebra#1956</title>
+<g id="a_node4"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/1956" xlink:title="ZcashFoundation/zebra#1956&#10;Zebra should store a&#10;persistent list of recent&#10;successful peers" target="_blank">
+<polygon fill="#c2e0c6" stroke="black" stroke-width="2" points="255.5,-453 24.5,-453 24.5,-385 255.5,-385 255.5,-453"/>
+<text text-anchor="middle" x="140" y="-437.8" font-family="Times,serif" font-size="14.00">ZcashFoundation/zebra#1956</text>
+<text text-anchor="middle" x="140" y="-422.8" font-family="Times,serif" font-size="14.00">Zebra should store a</text>
+<text text-anchor="middle" x="140" y="-407.8" font-family="Times,serif" font-size="14.00">persistent list of recent</text>
+<text text-anchor="middle" x="140" y="-392.8" font-family="Times,serif" font-size="14.00">successful peers</text>
+</a>
+</g>
+</g>
+<!-- ZcashFoundation/zebra#6680 -->
+<g id="node5" class="node open">
+<title>ZcashFoundation/zebra#6680</title>
+<g id="a_node5"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/6680" xlink:title="ZcashFoundation/zebra#6680&#10;Renames to address&#10;confusion in zebra&#39;s&#10;handling of finalized&#10;state" target="_blank">
+<polygon fill="#c2e0c6" stroke="black" stroke-width="2" points="255.5,-366.5 24.5,-366.5 24.5,-283.5 255.5,-283.5 255.5,-366.5"/>
+<text text-anchor="middle" x="140" y="-351.3" font-family="Times,serif" font-size="14.00">ZcashFoundation/zebra#6680</text>
+<text text-anchor="middle" x="140" y="-336.3" font-family="Times,serif" font-size="14.00">Renames to address</text>
+<text text-anchor="middle" x="140" y="-321.3" font-family="Times,serif" font-size="14.00">confusion in zebra&#39;s</text>
+<text text-anchor="middle" x="140" y="-306.3" font-family="Times,serif" font-size="14.00">handling of finalized</text>
+<text text-anchor="middle" x="140" y="-291.3" font-family="Times,serif" font-size="14.00">state</text>
+</a>
+</g>
+</g>
+<!-- ZcashFoundation/zebra#6681 -->
+<g id="node6" class="node open">
+<title>ZcashFoundation/zebra#6681</title>
+<g id="a_node6"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/6681" xlink:title="ZcashFoundation/zebra#6681&#10;Update documentation to&#10;clarify terminology&#10;around block verification" target="_blank">
+<polygon fill="#c2e0c6" stroke="black" points="571.5,-359 340.5,-359 340.5,-291 571.5,-291 571.5,-359"/>
+<text text-anchor="middle" x="456" y="-343.8" font-family="Times,serif" font-size="14.00">ZcashFoundation/zebra#6681</text>
+<text text-anchor="middle" x="456" y="-328.8" font-family="Times,serif" font-size="14.00">Update documentation to</text>
+<text text-anchor="middle" x="456" y="-313.8" font-family="Times,serif" font-size="14.00">clarify terminology</text>
+<text text-anchor="middle" x="456" y="-298.8" font-family="Times,serif" font-size="14.00">around block verification</text>
+</a>
+</g>
+</g>
+<!-- ZcashFoundation/zebra#6680&#45;&gt;ZcashFoundation/zebra#6681 -->
+<g id="edge2" class="edge">
+<title>ZcashFoundation/zebra#6680&#45;&gt;ZcashFoundation/zebra#6681</title>
+<path fill="none" stroke="black" d="M255.69,-325C279.95,-325 305.65,-325 330.25,-325"/>
+<polygon fill="black" stroke="black" points="330.35,-328.5 340.35,-325 330.35,-321.5 330.35,-328.5"/>
+</g>
+<!-- ZcashFoundation/zebra#6388 -->
+<g id="node10" class="node open">
+<title>ZcashFoundation/zebra#6388</title>
+<g id="a_node10"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/6388" xlink:title="ZcashFoundation/zebra#6388&#10;can_fork_chain_at()&#10;should ignore blocks&#10;below the finalized tip" target="_blank">
+<polygon fill="#c2e0c6" stroke="black" points="571.5,-68 340.5,-68 340.5,0 571.5,0 571.5,-68"/>
+<text text-anchor="middle" x="456" y="-52.8" font-family="Times,serif" font-size="14.00">ZcashFoundation/zebra#6388</text>
+<text text-anchor="middle" x="456" y="-37.8" font-family="Times,serif" font-size="14.00">can_fork_chain_at()</text>
+<text text-anchor="middle" x="456" y="-22.8" font-family="Times,serif" font-size="14.00">should ignore blocks</text>
+<text text-anchor="middle" x="456" y="-7.8" font-family="Times,serif" font-size="14.00">below the finalized tip</text>
+</a>
+</g>
+</g>
+<!-- ZcashFoundation/zebra#6680&#45;&gt;ZcashFoundation/zebra#6388 -->
+<g id="edge3" class="edge">
+<title>ZcashFoundation/zebra#6680&#45;&gt;ZcashFoundation/zebra#6388</title>
+<path fill="none" stroke="black" d="M255.78,-295.65C264.85,-289.95 273.14,-283.14 280,-275 339.07,-204.95 254.23,-139.68 316,-72 320.65,-66.91 325.9,-62.48 331.58,-58.61"/>
+<polygon fill="black" stroke="black" points="333.47,-61.56 340.18,-53.36 329.82,-55.59 333.47,-61.56"/>
+</g>
+<!-- ZcashFoundation/zebra#6673 -->
+<g id="node7" class="node open">
+<title>ZcashFoundation/zebra#6673</title>
+<g id="a_node7"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/6673" xlink:title="ZcashFoundation/zebra#6673&#10;Outdated Documentation in&#10;`zebra&#45;state`" target="_blank">
+<polygon fill="#c2e0c6" stroke="black" stroke-width="2" points="255.5,-265.5 24.5,-265.5 24.5,-212.5 255.5,-212.5 255.5,-265.5"/>
+<text text-anchor="middle" x="140" y="-250.3" font-family="Times,serif" font-size="14.00">ZcashFoundation/zebra#6673</text>
+<text text-anchor="middle" x="140" y="-235.3" font-family="Times,serif" font-size="14.00">Outdated Documentation in</text>
+<text text-anchor="middle" x="140" y="-220.3" font-family="Times,serif" font-size="14.00">`zebra&#45;state`</text>
+</a>
+</g>
+</g>
+<!-- ZcashFoundation/zebra#6675 -->
+<g id="node8" class="node open">
+<title>ZcashFoundation/zebra#6675</title>
+<g id="a_node8"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/6675" xlink:title="ZcashFoundation/zebra#6675&#10;Notes on Peer Sourcing" target="_blank">
+<polygon fill="#c2e0c6" stroke="black" stroke-width="2" points="255.5,-194 24.5,-194 24.5,-156 255.5,-156 255.5,-194"/>
+<text text-anchor="middle" x="140" y="-178.8" font-family="Times,serif" font-size="14.00">ZcashFoundation/zebra#6675</text>
+<text text-anchor="middle" x="140" y="-163.8" font-family="Times,serif" font-size="14.00">Notes on Peer Sourcing</text>
+</a>
+</g>
+</g>
+<!-- ZcashFoundation/zebra#6281 -->
+<g id="node9" class="node open">
+<title>ZcashFoundation/zebra#6281</title>
+<g id="a_node9"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/6281" xlink:title="ZcashFoundation/zebra#6281&#10;Tracking: TODOs with&#10;closed tasks" target="_blank">
+<polygon fill="#c2e0c6" stroke="black" stroke-width="2" points="255.5,-137.5 24.5,-137.5 24.5,-84.5 255.5,-84.5 255.5,-137.5"/>
+<text text-anchor="middle" x="140" y="-122.3" font-family="Times,serif" font-size="14.00">ZcashFoundation/zebra#6281</text>
+<text text-anchor="middle" x="140" y="-107.3" font-family="Times,serif" font-size="14.00">Tracking: TODOs with</text>
+<text text-anchor="middle" x="140" y="-92.3" font-family="Times,serif" font-size="14.00">closed tasks</text>
+</a>
+</g>
+</g>
 <!-- ZcashFoundation/zebra#5125 -->
 <g id="node13" class="node open">
 <title>ZcashFoundation/zebra#5125</title>
diff --git a/zcash-zf-frost-dag.html b/zcash-zf-frost-dag.html
index d79421ee..fded5a2f 100644
--- a/zcash-zf-frost-dag.html
+++ b/zcash-zf-frost-dag.html
@@ -17,121 +17,110 @@
     </style>
   </head>
   <body>
-    <div id="dag"><svg width="902pt" height="756pt"
- viewBox="0.00 0.00 902.00 755.50" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 751.5)">
-<polygon fill="white" stroke="transparent" points="-4,4 -4,-751.5 898,-751.5 898,4 -4,4"/>
+    <div id="dag"><svg width="902pt" height="749pt"
+ viewBox="0.00 0.00 902.00 748.50" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 744.5)">
+<polygon fill="white" stroke="transparent" points="-4,4 -4,-744.5 898,-744.5 898,4 -4,4"/>
 <g id="clust1" class="cluster">
-<title>cluster_0</title>
-<polygon fill="none" stroke="blue" points="79,-201 79,-294 311,-294 311,-201 79,-201"/>
-<text text-anchor="middle" x="195" y="-278.8" font-family="Times,serif" font-size="14.00">Epic: Re&#45;randomizable FROST</text>
+<title>cluster_1</title>
+<polygon fill="none" stroke="blue" points="79,-201 79,-522 894,-522 894,-201 79,-201"/>
+<text text-anchor="middle" x="486.5" y="-506.8" font-family="Times,serif" font-size="14.00">Epic: FROST Proof of Concept/Prototype and Documentation</text>
 </g>
 <g id="clust2" class="cluster">
-<title>cluster_1</title>
-<polygon fill="none" stroke="blue" points="79,-302 79,-623 894,-623 894,-302 79,-302"/>
-<text text-anchor="middle" x="486.5" y="-607.8" font-family="Times,serif" font-size="14.00">Epic: FROST Proof of Concept/Prototype and Documentation</text>
-</g>
-<g id="clust3" class="cluster">
 <title>cluster_2</title>
 <polygon fill="none" stroke="blue" points="0,0 0,-193 390,-193 390,0 0,0"/>
 <text text-anchor="middle" x="195" y="-177.8" font-family="Times,serif" font-size="14.00">Epic: Demo for Trusted Dealer key share generation</text>
 </g>
-<!-- ZcashFoundation/frost#216 -->
-<g id="node1" class="node open">
-<title>ZcashFoundation/frost#216</title>
-<g id="a_node1"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/216" xlink:title="ZcashFoundation/frost#216&#10;Write security proof for&#10;Rerandomized FROST" target="_blank">
-<polygon fill="#c2e0c6" stroke="black" stroke-width="2" points="303,-262.5 87,-262.5 87,-209.5 303,-209.5 303,-262.5"/>
-<text text-anchor="middle" x="195" y="-247.3" font-family="Times,serif" font-size="14.00">ZcashFoundation/frost#216</text>
-<text text-anchor="middle" x="195" y="-232.3" font-family="Times,serif" font-size="14.00">Write security proof for</text>
-<text text-anchor="middle" x="195" y="-217.3" font-family="Times,serif" font-size="14.00">Rerandomized FROST</text>
-</a>
-</g>
+<g id="clust3" class="cluster">
+<title>cluster_0</title>
+<polygon fill="none" stroke="blue" points="79,-530 79,-623 311,-623 311,-530 79,-530"/>
+<text text-anchor="middle" x="195" y="-607.8" font-family="Times,serif" font-size="14.00">Epic: Re&#45;randomizable FROST</text>
 </g>
 <!-- ZcashFoundation/frost#238 -->
-<g id="node2" class="node open">
+<g id="node1" class="node open">
 <title>ZcashFoundation/frost#238</title>
-<g id="a_node2"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/238" xlink:title="ZcashFoundation/frost#238&#10;Epic: Demo for Trusted&#10;Dealer key share&#10;generation" target="_blank">
-<polygon fill="#c2e0c6" stroke="black" stroke-width="2" points="303,-592 87,-592 87,-524 303,-524 303,-592"/>
-<text text-anchor="middle" x="195" y="-576.8" font-family="Times,serif" font-size="14.00">ZcashFoundation/frost#238</text>
-<text text-anchor="middle" x="195" y="-561.8" font-family="Times,serif" font-size="14.00">Epic: Demo for Trusted</text>
-<text text-anchor="middle" x="195" y="-546.8" font-family="Times,serif" font-size="14.00">Dealer key share</text>
-<text text-anchor="middle" x="195" y="-531.8" font-family="Times,serif" font-size="14.00">generation</text>
+<g id="a_node1"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/238" xlink:title="ZcashFoundation/frost#238&#10;Epic: Demo for Trusted&#10;Dealer key share&#10;generation" target="_blank">
+<polygon fill="#c2e0c6" stroke="black" stroke-width="2" points="303,-491 87,-491 87,-423 303,-423 303,-491"/>
+<text text-anchor="middle" x="195" y="-475.8" font-family="Times,serif" font-size="14.00">ZcashFoundation/frost#238</text>
+<text text-anchor="middle" x="195" y="-460.8" font-family="Times,serif" font-size="14.00">Epic: Demo for Trusted</text>
+<text text-anchor="middle" x="195" y="-445.8" font-family="Times,serif" font-size="14.00">Dealer key share</text>
+<text text-anchor="middle" x="195" y="-430.8" font-family="Times,serif" font-size="14.00">generation</text>
 </a>
 </g>
 </g>
 <!-- ZcashFoundation/frost#239 -->
-<g id="node3" class="node open">
+<g id="node2" class="node open">
 <title>ZcashFoundation/frost#239</title>
-<g id="a_node3"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/239" xlink:title="ZcashFoundation/frost#239&#10;Demo for Signature&#10;generation: Participant&#10;CLI" target="_blank">
-<polygon fill="#c2e0c6" stroke="black" points="634,-592 418,-592 418,-524 634,-524 634,-592"/>
-<text text-anchor="middle" x="526" y="-576.8" font-family="Times,serif" font-size="14.00">ZcashFoundation/frost#239</text>
-<text text-anchor="middle" x="526" y="-561.8" font-family="Times,serif" font-size="14.00">Demo for Signature</text>
-<text text-anchor="middle" x="526" y="-546.8" font-family="Times,serif" font-size="14.00">generation: Participant</text>
-<text text-anchor="middle" x="526" y="-531.8" font-family="Times,serif" font-size="14.00">CLI</text>
+<g id="a_node2"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/239" xlink:title="ZcashFoundation/frost#239&#10;Demo for Signature&#10;generation: Participant&#10;CLI" target="_blank">
+<polygon fill="#c2e0c6" stroke="black" points="634,-491 418,-491 418,-423 634,-423 634,-491"/>
+<text text-anchor="middle" x="526" y="-475.8" font-family="Times,serif" font-size="14.00">ZcashFoundation/frost#239</text>
+<text text-anchor="middle" x="526" y="-460.8" font-family="Times,serif" font-size="14.00">Demo for Signature</text>
+<text text-anchor="middle" x="526" y="-445.8" font-family="Times,serif" font-size="14.00">generation: Participant</text>
+<text text-anchor="middle" x="526" y="-430.8" font-family="Times,serif" font-size="14.00">CLI</text>
 </a>
 </g>
 </g>
 <!-- ZcashFoundation/frost#238&#45;&gt;ZcashFoundation/frost#239 -->
 <g id="edge1" class="edge">
 <title>ZcashFoundation/frost#238&#45;&gt;ZcashFoundation/frost#239</title>
-<path fill="none" stroke="black" d="M303.27,-558C336.72,-558 373.78,-558 407.87,-558"/>
-<polygon fill="black" stroke="black" points="407.87,-561.5 417.87,-558 407.87,-554.5 407.87,-561.5"/>
+<path fill="none" stroke="black" d="M303.27,-457C336.72,-457 373.78,-457 407.87,-457"/>
+<polygon fill="black" stroke="black" points="407.87,-460.5 417.87,-457 407.87,-453.5 407.87,-460.5"/>
 </g>
 <!-- ZcashFoundation/frost#249 -->
-<g id="node4" class="node open">
+<g id="node3" class="node open">
 <title>ZcashFoundation/frost#249</title>
-<g id="a_node4"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/249" xlink:title="ZcashFoundation/frost#249&#10;Demo for Signature&#10;generation: Coordinator&#10;CLI" target="_blank">
-<polygon fill="#c2e0c6" stroke="black" points="886,-592 670,-592 670,-524 886,-524 886,-592"/>
-<text text-anchor="middle" x="778" y="-576.8" font-family="Times,serif" font-size="14.00">ZcashFoundation/frost#249</text>
-<text text-anchor="middle" x="778" y="-561.8" font-family="Times,serif" font-size="14.00">Demo for Signature</text>
-<text text-anchor="middle" x="778" y="-546.8" font-family="Times,serif" font-size="14.00">generation: Coordinator</text>
-<text text-anchor="middle" x="778" y="-531.8" font-family="Times,serif" font-size="14.00">CLI</text>
+<g id="a_node3"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/249" xlink:title="ZcashFoundation/frost#249&#10;Demo for Signature&#10;generation: Coordinator&#10;CLI" target="_blank">
+<polygon fill="#c2e0c6" stroke="black" points="886,-491 670,-491 670,-423 886,-423 886,-491"/>
+<text text-anchor="middle" x="778" y="-475.8" font-family="Times,serif" font-size="14.00">ZcashFoundation/frost#249</text>
+<text text-anchor="middle" x="778" y="-460.8" font-family="Times,serif" font-size="14.00">Demo for Signature</text>
+<text text-anchor="middle" x="778" y="-445.8" font-family="Times,serif" font-size="14.00">generation: Coordinator</text>
+<text text-anchor="middle" x="778" y="-430.8" font-family="Times,serif" font-size="14.00">CLI</text>
 </a>
 </g>
 </g>
 <!-- ZcashFoundation/frost#239&#45;&gt;ZcashFoundation/frost#249 -->
 <g id="edge2" class="edge">
 <title>ZcashFoundation/frost#239&#45;&gt;ZcashFoundation/frost#249</title>
-<path fill="none" stroke="black" d="M634.11,-558C642.5,-558 650.99,-558 659.44,-558"/>
-<polygon fill="black" stroke="black" points="659.71,-561.5 669.71,-558 659.71,-554.5 659.71,-561.5"/>
+<path fill="none" stroke="black" d="M634.11,-457C642.5,-457 650.99,-457 659.44,-457"/>
+<polygon fill="black" stroke="black" points="659.71,-460.5 669.71,-457 659.71,-453.5 659.71,-460.5"/>
 </g>
 <!-- ZcashFoundation/frost#240 -->
-<g id="node5" class="node open">
+<g id="node4" class="node open">
 <title>ZcashFoundation/frost#240</title>
-<g id="a_node5"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/240" xlink:title="ZcashFoundation/frost#240&#10;Demo for Signature&#10;verification" target="_blank">
-<polygon fill="#c2e0c6" stroke="black" stroke-width="2" points="303,-505.5 87,-505.5 87,-452.5 303,-452.5 303,-505.5"/>
-<text text-anchor="middle" x="195" y="-490.3" font-family="Times,serif" font-size="14.00">ZcashFoundation/frost#240</text>
-<text text-anchor="middle" x="195" y="-475.3" font-family="Times,serif" font-size="14.00">Demo for Signature</text>
-<text text-anchor="middle" x="195" y="-460.3" font-family="Times,serif" font-size="14.00">verification</text>
+<g id="a_node4"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/240" xlink:title="ZcashFoundation/frost#240&#10;Demo for Signature&#10;verification" target="_blank">
+<polygon fill="#c2e0c6" stroke="black" stroke-width="2" points="303,-404.5 87,-404.5 87,-351.5 303,-351.5 303,-404.5"/>
+<text text-anchor="middle" x="195" y="-389.3" font-family="Times,serif" font-size="14.00">ZcashFoundation/frost#240</text>
+<text text-anchor="middle" x="195" y="-374.3" font-family="Times,serif" font-size="14.00">Demo for Signature</text>
+<text text-anchor="middle" x="195" y="-359.3" font-family="Times,serif" font-size="14.00">verification</text>
 </a>
 </g>
 </g>
 <!-- ZcashFoundation/frost#252 -->
-<g id="node6" class="node open">
+<g id="node5" class="node open">
 <title>ZcashFoundation/frost#252</title>
-<g id="a_node6"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/252" xlink:title="ZcashFoundation/frost#252&#10;Demo for Distributed Key&#10;Generation (DKG)" target="_blank">
-<polygon fill="#c2e0c6" stroke="black" stroke-width="2" points="303,-434.5 87,-434.5 87,-381.5 303,-381.5 303,-434.5"/>
-<text text-anchor="middle" x="195" y="-419.3" font-family="Times,serif" font-size="14.00">ZcashFoundation/frost#252</text>
-<text text-anchor="middle" x="195" y="-404.3" font-family="Times,serif" font-size="14.00">Demo for Distributed Key</text>
-<text text-anchor="middle" x="195" y="-389.3" font-family="Times,serif" font-size="14.00">Generation (DKG)</text>
+<g id="a_node5"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/252" xlink:title="ZcashFoundation/frost#252&#10;Demo for Distributed Key&#10;Generation (DKG)" target="_blank">
+<polygon fill="#c2e0c6" stroke="black" stroke-width="2" points="303,-333.5 87,-333.5 87,-280.5 303,-280.5 303,-333.5"/>
+<text text-anchor="middle" x="195" y="-318.3" font-family="Times,serif" font-size="14.00">ZcashFoundation/frost#252</text>
+<text text-anchor="middle" x="195" y="-303.3" font-family="Times,serif" font-size="14.00">Demo for Distributed Key</text>
+<text text-anchor="middle" x="195" y="-288.3" font-family="Times,serif" font-size="14.00">Generation (DKG)</text>
 </a>
 </g>
 </g>
 <!-- ZcashFoundation/frost#242 -->
-<g id="node7" class="node open">
+<g id="node6" class="node open">
 <title>ZcashFoundation/frost#242</title>
-<g id="a_node7"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/242" xlink:title="ZcashFoundation/frost#242&#10;Implement broadcast&#10;channel for FROST PoC" target="_blank">
-<polygon fill="#c2e0c6" stroke="black" stroke-width="2" points="303,-363.5 87,-363.5 87,-310.5 303,-310.5 303,-363.5"/>
-<text text-anchor="middle" x="195" y="-348.3" font-family="Times,serif" font-size="14.00">ZcashFoundation/frost#242</text>
-<text text-anchor="middle" x="195" y="-333.3" font-family="Times,serif" font-size="14.00">Implement broadcast</text>
-<text text-anchor="middle" x="195" y="-318.3" font-family="Times,serif" font-size="14.00">channel for FROST PoC</text>
+<g id="a_node6"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/242" xlink:title="ZcashFoundation/frost#242&#10;Implement broadcast&#10;channel for FROST PoC" target="_blank">
+<polygon fill="#c2e0c6" stroke="black" stroke-width="2" points="303,-262.5 87,-262.5 87,-209.5 303,-209.5 303,-262.5"/>
+<text text-anchor="middle" x="195" y="-247.3" font-family="Times,serif" font-size="14.00">ZcashFoundation/frost#242</text>
+<text text-anchor="middle" x="195" y="-232.3" font-family="Times,serif" font-size="14.00">Implement broadcast</text>
+<text text-anchor="middle" x="195" y="-217.3" font-family="Times,serif" font-size="14.00">channel for FROST PoC</text>
 </a>
 </g>
 </g>
 <!-- ZcashFoundation/frost#324 -->
-<g id="node8" class="node open">
+<g id="node7" class="node open">
 <title>ZcashFoundation/frost#324</title>
-<g id="a_node8"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/324" xlink:title="ZcashFoundation/frost#324&#10;Return VerifiableSecretSh&#10;aringCommitment in frost&#45;&#10;zcash&#45;demo" target="_blank">
+<g id="a_node7"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/324" xlink:title="ZcashFoundation/frost#324&#10;Return VerifiableSecretSh&#10;aringCommitment in frost&#45;&#10;zcash&#45;demo" target="_blank">
 <polygon fill="#c2e0c6" stroke="black" stroke-width="2" points="303,-162 87,-162 87,-94 303,-94 303,-162"/>
 <text text-anchor="middle" x="195" y="-146.8" font-family="Times,serif" font-size="14.00">ZcashFoundation/frost#324</text>
 <text text-anchor="middle" x="195" y="-131.8" font-family="Times,serif" font-size="14.00">Return VerifiableSecretSh</text>
@@ -141,9 +130,9 @@
 </g>
 </g>
 <!-- ZcashFoundation/frost#362 -->
-<g id="node9" class="node open">
+<g id="node8" class="node open">
 <title>ZcashFoundation/frost#362</title>
-<g id="a_node9"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/362" xlink:title="ZcashFoundation/frost#362&#10;Implement split() in demo&#10;so a trusted dealer can&#10;accept a secret" target="_blank">
+<g id="a_node8"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/362" xlink:title="ZcashFoundation/frost#362&#10;Implement split() in demo&#10;so a trusted dealer can&#10;accept a secret" target="_blank">
 <polygon fill="#c2e0c6" stroke="black" stroke-width="2" points="303,-76 87,-76 87,-8 303,-8 303,-76"/>
 <text text-anchor="middle" x="195" y="-60.8" font-family="Times,serif" font-size="14.00">ZcashFoundation/frost#362</text>
 <text text-anchor="middle" x="195" y="-45.8" font-family="Times,serif" font-size="14.00">Implement split() in demo</text>
@@ -152,15 +141,26 @@
 </a>
 </g>
 </g>
+<!-- ZcashFoundation/frost#216 -->
+<g id="node9" class="node open">
+<title>ZcashFoundation/frost#216</title>
+<g id="a_node9"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/216" xlink:title="ZcashFoundation/frost#216&#10;Write security proof for&#10;Rerandomized FROST" target="_blank">
+<polygon fill="#c2e0c6" stroke="black" stroke-width="2" points="303,-591.5 87,-591.5 87,-538.5 303,-538.5 303,-591.5"/>
+<text text-anchor="middle" x="195" y="-576.3" font-family="Times,serif" font-size="14.00">ZcashFoundation/frost#216</text>
+<text text-anchor="middle" x="195" y="-561.3" font-family="Times,serif" font-size="14.00">Write security proof for</text>
+<text text-anchor="middle" x="195" y="-546.3" font-family="Times,serif" font-size="14.00">Rerandomized FROST</text>
+</a>
+</g>
+</g>
 <!-- ZcashFoundation/frost#235 -->
 <g id="node10" class="node closed">
 <title>ZcashFoundation/frost#235</title>
 <g id="a_node10"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/235" xlink:title="ZcashFoundation/frost#235&#10;Tag a `frost` release&#10;based on the final&#10;version of the spec" target="_blank">
-<polygon fill="#fad8c7" stroke="black" points="634,-727 418,-727 418,-659 634,-659 634,-727"/>
-<text text-anchor="middle" x="526" y="-711.8" font-family="Times,serif" font-size="14.00">ZcashFoundation/frost#235</text>
-<text text-anchor="middle" x="526" y="-696.8" font-family="Times,serif" font-size="14.00">Tag a `frost` release</text>
-<text text-anchor="middle" x="526" y="-681.8" font-family="Times,serif" font-size="14.00">based on the final</text>
-<text text-anchor="middle" x="526" y="-666.8" font-family="Times,serif" font-size="14.00">version of the spec</text>
+<polygon fill="#fad8c7" stroke="black" points="634,-716 418,-716 418,-648 634,-648 634,-716"/>
+<text text-anchor="middle" x="526" y="-700.8" font-family="Times,serif" font-size="14.00">ZcashFoundation/frost#235</text>
+<text text-anchor="middle" x="526" y="-685.8" font-family="Times,serif" font-size="14.00">Tag a `frost` release</text>
+<text text-anchor="middle" x="526" y="-670.8" font-family="Times,serif" font-size="14.00">based on the final</text>
+<text text-anchor="middle" x="526" y="-655.8" font-family="Times,serif" font-size="14.00">version of the spec</text>
 </a>
 </g>
 </g>
@@ -168,34 +168,34 @@
 <g id="node11" class="node open">
 <title>ZcashFoundation/frost#189</title>
 <g id="a_node11"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/189" xlink:title="ZcashFoundation/frost#189&#10;Updated release drafter&#10;config to match zebrad&#39;s" target="_blank">
-<polygon fill="#c2e0c6" stroke="black" stroke-width="2" points="303,-747.5 87,-747.5 87,-694.5 303,-694.5 303,-747.5"/>
-<text text-anchor="middle" x="195" y="-732.3" font-family="Times,serif" font-size="14.00">ZcashFoundation/frost#189</text>
-<text text-anchor="middle" x="195" y="-717.3" font-family="Times,serif" font-size="14.00">Updated release drafter</text>
-<text text-anchor="middle" x="195" y="-702.3" font-family="Times,serif" font-size="14.00">config to match zebrad&#39;s</text>
+<polygon fill="#c2e0c6" stroke="black" stroke-width="2" points="303,-740.5 87,-740.5 87,-687.5 303,-687.5 303,-740.5"/>
+<text text-anchor="middle" x="195" y="-725.3" font-family="Times,serif" font-size="14.00">ZcashFoundation/frost#189</text>
+<text text-anchor="middle" x="195" y="-710.3" font-family="Times,serif" font-size="14.00">Updated release drafter</text>
+<text text-anchor="middle" x="195" y="-695.3" font-family="Times,serif" font-size="14.00">config to match zebrad&#39;s</text>
 </a>
 </g>
 </g>
 <!-- ZcashFoundation/frost#189&#45;&gt;ZcashFoundation/frost#235 -->
 <g id="edge3" class="edge">
 <title>ZcashFoundation/frost#189&#45;&gt;ZcashFoundation/frost#235</title>
-<path fill="none" stroke="black" d="M303.27,-711.87C336.72,-709.02 373.78,-705.87 407.87,-702.97"/>
-<polygon fill="black" stroke="black" points="408.2,-706.45 417.87,-702.12 407.61,-699.48 408.2,-706.45"/>
+<path fill="none" stroke="black" d="M303.27,-703.57C336.72,-700.31 373.78,-696.71 407.87,-693.39"/>
+<polygon fill="black" stroke="black" points="408.25,-696.87 417.87,-692.42 407.58,-689.9 408.25,-696.87"/>
 </g>
 <!-- ZcashFoundation/frost#190 -->
 <g id="node12" class="node open">
 <title>ZcashFoundation/frost#190</title>
 <g id="a_node12"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/190" xlink:title="ZcashFoundation/frost#190&#10;Write a release checklist" target="_blank">
-<polygon fill="#c2e0c6" stroke="black" stroke-width="2" points="303,-676 87,-676 87,-638 303,-638 303,-676"/>
-<text text-anchor="middle" x="195" y="-660.8" font-family="Times,serif" font-size="14.00">ZcashFoundation/frost#190</text>
-<text text-anchor="middle" x="195" y="-645.8" font-family="Times,serif" font-size="14.00">Write a release checklist</text>
+<polygon fill="#c2e0c6" stroke="black" stroke-width="2" points="303,-669 87,-669 87,-631 303,-631 303,-669"/>
+<text text-anchor="middle" x="195" y="-653.8" font-family="Times,serif" font-size="14.00">ZcashFoundation/frost#190</text>
+<text text-anchor="middle" x="195" y="-638.8" font-family="Times,serif" font-size="14.00">Write a release checklist</text>
 </a>
 </g>
 </g>
 <!-- ZcashFoundation/frost#190&#45;&gt;ZcashFoundation/frost#235 -->
 <g id="edge4" class="edge">
 <title>ZcashFoundation/frost#190&#45;&gt;ZcashFoundation/frost#235</title>
-<path fill="none" stroke="black" d="M303.27,-668.74C336.72,-672.4 373.78,-676.45 407.87,-680.18"/>
-<polygon fill="black" stroke="black" points="407.55,-683.67 417.87,-681.28 408.31,-676.71 407.55,-683.67"/>
+<path fill="none" stroke="black" d="M303.27,-660.43C336.72,-663.69 373.78,-667.29 407.87,-670.61"/>
+<polygon fill="black" stroke="black" points="407.58,-674.1 417.87,-671.58 408.25,-667.13 407.58,-674.1"/>
 </g>
 </g>
 </svg>
diff --git a/zcash-zf-frost-dag.svg b/zcash-zf-frost-dag.svg
index 119ae00c..f9d01eac 100644
--- a/zcash-zf-frost-dag.svg
+++ b/zcash-zf-frost-dag.svg
@@ -5,121 +5,110 @@
 <!-- Generated by graphviz version 2.43.0 (0)
  -->
 <!-- Pages: 1 -->
-<svg width="902pt" height="756pt"
- viewBox="0.00 0.00 902.00 755.50" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 751.5)">
-<polygon fill="white" stroke="transparent" points="-4,4 -4,-751.5 898,-751.5 898,4 -4,4"/>
+<svg width="902pt" height="749pt"
+ viewBox="0.00 0.00 902.00 748.50" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 744.5)">
+<polygon fill="white" stroke="transparent" points="-4,4 -4,-744.5 898,-744.5 898,4 -4,4"/>
 <g id="clust1" class="cluster">
-<title>cluster_0</title>
-<polygon fill="none" stroke="blue" points="79,-201 79,-294 311,-294 311,-201 79,-201"/>
-<text text-anchor="middle" x="195" y="-278.8" font-family="Times,serif" font-size="14.00">Epic: Re&#45;randomizable FROST</text>
+<title>cluster_1</title>
+<polygon fill="none" stroke="blue" points="79,-201 79,-522 894,-522 894,-201 79,-201"/>
+<text text-anchor="middle" x="486.5" y="-506.8" font-family="Times,serif" font-size="14.00">Epic: FROST Proof of Concept/Prototype and Documentation</text>
 </g>
 <g id="clust2" class="cluster">
-<title>cluster_1</title>
-<polygon fill="none" stroke="blue" points="79,-302 79,-623 894,-623 894,-302 79,-302"/>
-<text text-anchor="middle" x="486.5" y="-607.8" font-family="Times,serif" font-size="14.00">Epic: FROST Proof of Concept/Prototype and Documentation</text>
-</g>
-<g id="clust3" class="cluster">
 <title>cluster_2</title>
 <polygon fill="none" stroke="blue" points="0,0 0,-193 390,-193 390,0 0,0"/>
 <text text-anchor="middle" x="195" y="-177.8" font-family="Times,serif" font-size="14.00">Epic: Demo for Trusted Dealer key share generation</text>
 </g>
-<!-- ZcashFoundation/frost#216 -->
-<g id="node1" class="node open">
-<title>ZcashFoundation/frost#216</title>
-<g id="a_node1"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/216" xlink:title="ZcashFoundation/frost#216&#10;Write security proof for&#10;Rerandomized FROST" target="_blank">
-<polygon fill="#c2e0c6" stroke="black" stroke-width="2" points="303,-262.5 87,-262.5 87,-209.5 303,-209.5 303,-262.5"/>
-<text text-anchor="middle" x="195" y="-247.3" font-family="Times,serif" font-size="14.00">ZcashFoundation/frost#216</text>
-<text text-anchor="middle" x="195" y="-232.3" font-family="Times,serif" font-size="14.00">Write security proof for</text>
-<text text-anchor="middle" x="195" y="-217.3" font-family="Times,serif" font-size="14.00">Rerandomized FROST</text>
-</a>
-</g>
+<g id="clust3" class="cluster">
+<title>cluster_0</title>
+<polygon fill="none" stroke="blue" points="79,-530 79,-623 311,-623 311,-530 79,-530"/>
+<text text-anchor="middle" x="195" y="-607.8" font-family="Times,serif" font-size="14.00">Epic: Re&#45;randomizable FROST</text>
 </g>
 <!-- ZcashFoundation/frost#238 -->
-<g id="node2" class="node open">
+<g id="node1" class="node open">
 <title>ZcashFoundation/frost#238</title>
-<g id="a_node2"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/238" xlink:title="ZcashFoundation/frost#238&#10;Epic: Demo for Trusted&#10;Dealer key share&#10;generation" target="_blank">
-<polygon fill="#c2e0c6" stroke="black" stroke-width="2" points="303,-592 87,-592 87,-524 303,-524 303,-592"/>
-<text text-anchor="middle" x="195" y="-576.8" font-family="Times,serif" font-size="14.00">ZcashFoundation/frost#238</text>
-<text text-anchor="middle" x="195" y="-561.8" font-family="Times,serif" font-size="14.00">Epic: Demo for Trusted</text>
-<text text-anchor="middle" x="195" y="-546.8" font-family="Times,serif" font-size="14.00">Dealer key share</text>
-<text text-anchor="middle" x="195" y="-531.8" font-family="Times,serif" font-size="14.00">generation</text>
+<g id="a_node1"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/238" xlink:title="ZcashFoundation/frost#238&#10;Epic: Demo for Trusted&#10;Dealer key share&#10;generation" target="_blank">
+<polygon fill="#c2e0c6" stroke="black" stroke-width="2" points="303,-491 87,-491 87,-423 303,-423 303,-491"/>
+<text text-anchor="middle" x="195" y="-475.8" font-family="Times,serif" font-size="14.00">ZcashFoundation/frost#238</text>
+<text text-anchor="middle" x="195" y="-460.8" font-family="Times,serif" font-size="14.00">Epic: Demo for Trusted</text>
+<text text-anchor="middle" x="195" y="-445.8" font-family="Times,serif" font-size="14.00">Dealer key share</text>
+<text text-anchor="middle" x="195" y="-430.8" font-family="Times,serif" font-size="14.00">generation</text>
 </a>
 </g>
 </g>
 <!-- ZcashFoundation/frost#239 -->
-<g id="node3" class="node open">
+<g id="node2" class="node open">
 <title>ZcashFoundation/frost#239</title>
-<g id="a_node3"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/239" xlink:title="ZcashFoundation/frost#239&#10;Demo for Signature&#10;generation: Participant&#10;CLI" target="_blank">
-<polygon fill="#c2e0c6" stroke="black" points="634,-592 418,-592 418,-524 634,-524 634,-592"/>
-<text text-anchor="middle" x="526" y="-576.8" font-family="Times,serif" font-size="14.00">ZcashFoundation/frost#239</text>
-<text text-anchor="middle" x="526" y="-561.8" font-family="Times,serif" font-size="14.00">Demo for Signature</text>
-<text text-anchor="middle" x="526" y="-546.8" font-family="Times,serif" font-size="14.00">generation: Participant</text>
-<text text-anchor="middle" x="526" y="-531.8" font-family="Times,serif" font-size="14.00">CLI</text>
+<g id="a_node2"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/239" xlink:title="ZcashFoundation/frost#239&#10;Demo for Signature&#10;generation: Participant&#10;CLI" target="_blank">
+<polygon fill="#c2e0c6" stroke="black" points="634,-491 418,-491 418,-423 634,-423 634,-491"/>
+<text text-anchor="middle" x="526" y="-475.8" font-family="Times,serif" font-size="14.00">ZcashFoundation/frost#239</text>
+<text text-anchor="middle" x="526" y="-460.8" font-family="Times,serif" font-size="14.00">Demo for Signature</text>
+<text text-anchor="middle" x="526" y="-445.8" font-family="Times,serif" font-size="14.00">generation: Participant</text>
+<text text-anchor="middle" x="526" y="-430.8" font-family="Times,serif" font-size="14.00">CLI</text>
 </a>
 </g>
 </g>
 <!-- ZcashFoundation/frost#238&#45;&gt;ZcashFoundation/frost#239 -->
 <g id="edge1" class="edge">
 <title>ZcashFoundation/frost#238&#45;&gt;ZcashFoundation/frost#239</title>
-<path fill="none" stroke="black" d="M303.27,-558C336.72,-558 373.78,-558 407.87,-558"/>
-<polygon fill="black" stroke="black" points="407.87,-561.5 417.87,-558 407.87,-554.5 407.87,-561.5"/>
+<path fill="none" stroke="black" d="M303.27,-457C336.72,-457 373.78,-457 407.87,-457"/>
+<polygon fill="black" stroke="black" points="407.87,-460.5 417.87,-457 407.87,-453.5 407.87,-460.5"/>
 </g>
 <!-- ZcashFoundation/frost#249 -->
-<g id="node4" class="node open">
+<g id="node3" class="node open">
 <title>ZcashFoundation/frost#249</title>
-<g id="a_node4"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/249" xlink:title="ZcashFoundation/frost#249&#10;Demo for Signature&#10;generation: Coordinator&#10;CLI" target="_blank">
-<polygon fill="#c2e0c6" stroke="black" points="886,-592 670,-592 670,-524 886,-524 886,-592"/>
-<text text-anchor="middle" x="778" y="-576.8" font-family="Times,serif" font-size="14.00">ZcashFoundation/frost#249</text>
-<text text-anchor="middle" x="778" y="-561.8" font-family="Times,serif" font-size="14.00">Demo for Signature</text>
-<text text-anchor="middle" x="778" y="-546.8" font-family="Times,serif" font-size="14.00">generation: Coordinator</text>
-<text text-anchor="middle" x="778" y="-531.8" font-family="Times,serif" font-size="14.00">CLI</text>
+<g id="a_node3"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/249" xlink:title="ZcashFoundation/frost#249&#10;Demo for Signature&#10;generation: Coordinator&#10;CLI" target="_blank">
+<polygon fill="#c2e0c6" stroke="black" points="886,-491 670,-491 670,-423 886,-423 886,-491"/>
+<text text-anchor="middle" x="778" y="-475.8" font-family="Times,serif" font-size="14.00">ZcashFoundation/frost#249</text>
+<text text-anchor="middle" x="778" y="-460.8" font-family="Times,serif" font-size="14.00">Demo for Signature</text>
+<text text-anchor="middle" x="778" y="-445.8" font-family="Times,serif" font-size="14.00">generation: Coordinator</text>
+<text text-anchor="middle" x="778" y="-430.8" font-family="Times,serif" font-size="14.00">CLI</text>
 </a>
 </g>
 </g>
 <!-- ZcashFoundation/frost#239&#45;&gt;ZcashFoundation/frost#249 -->
 <g id="edge2" class="edge">
 <title>ZcashFoundation/frost#239&#45;&gt;ZcashFoundation/frost#249</title>
-<path fill="none" stroke="black" d="M634.11,-558C642.5,-558 650.99,-558 659.44,-558"/>
-<polygon fill="black" stroke="black" points="659.71,-561.5 669.71,-558 659.71,-554.5 659.71,-561.5"/>
+<path fill="none" stroke="black" d="M634.11,-457C642.5,-457 650.99,-457 659.44,-457"/>
+<polygon fill="black" stroke="black" points="659.71,-460.5 669.71,-457 659.71,-453.5 659.71,-460.5"/>
 </g>
 <!-- ZcashFoundation/frost#240 -->
-<g id="node5" class="node open">
+<g id="node4" class="node open">
 <title>ZcashFoundation/frost#240</title>
-<g id="a_node5"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/240" xlink:title="ZcashFoundation/frost#240&#10;Demo for Signature&#10;verification" target="_blank">
-<polygon fill="#c2e0c6" stroke="black" stroke-width="2" points="303,-505.5 87,-505.5 87,-452.5 303,-452.5 303,-505.5"/>
-<text text-anchor="middle" x="195" y="-490.3" font-family="Times,serif" font-size="14.00">ZcashFoundation/frost#240</text>
-<text text-anchor="middle" x="195" y="-475.3" font-family="Times,serif" font-size="14.00">Demo for Signature</text>
-<text text-anchor="middle" x="195" y="-460.3" font-family="Times,serif" font-size="14.00">verification</text>
+<g id="a_node4"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/240" xlink:title="ZcashFoundation/frost#240&#10;Demo for Signature&#10;verification" target="_blank">
+<polygon fill="#c2e0c6" stroke="black" stroke-width="2" points="303,-404.5 87,-404.5 87,-351.5 303,-351.5 303,-404.5"/>
+<text text-anchor="middle" x="195" y="-389.3" font-family="Times,serif" font-size="14.00">ZcashFoundation/frost#240</text>
+<text text-anchor="middle" x="195" y="-374.3" font-family="Times,serif" font-size="14.00">Demo for Signature</text>
+<text text-anchor="middle" x="195" y="-359.3" font-family="Times,serif" font-size="14.00">verification</text>
 </a>
 </g>
 </g>
 <!-- ZcashFoundation/frost#252 -->
-<g id="node6" class="node open">
+<g id="node5" class="node open">
 <title>ZcashFoundation/frost#252</title>
-<g id="a_node6"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/252" xlink:title="ZcashFoundation/frost#252&#10;Demo for Distributed Key&#10;Generation (DKG)" target="_blank">
-<polygon fill="#c2e0c6" stroke="black" stroke-width="2" points="303,-434.5 87,-434.5 87,-381.5 303,-381.5 303,-434.5"/>
-<text text-anchor="middle" x="195" y="-419.3" font-family="Times,serif" font-size="14.00">ZcashFoundation/frost#252</text>
-<text text-anchor="middle" x="195" y="-404.3" font-family="Times,serif" font-size="14.00">Demo for Distributed Key</text>
-<text text-anchor="middle" x="195" y="-389.3" font-family="Times,serif" font-size="14.00">Generation (DKG)</text>
+<g id="a_node5"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/252" xlink:title="ZcashFoundation/frost#252&#10;Demo for Distributed Key&#10;Generation (DKG)" target="_blank">
+<polygon fill="#c2e0c6" stroke="black" stroke-width="2" points="303,-333.5 87,-333.5 87,-280.5 303,-280.5 303,-333.5"/>
+<text text-anchor="middle" x="195" y="-318.3" font-family="Times,serif" font-size="14.00">ZcashFoundation/frost#252</text>
+<text text-anchor="middle" x="195" y="-303.3" font-family="Times,serif" font-size="14.00">Demo for Distributed Key</text>
+<text text-anchor="middle" x="195" y="-288.3" font-family="Times,serif" font-size="14.00">Generation (DKG)</text>
 </a>
 </g>
 </g>
 <!-- ZcashFoundation/frost#242 -->
-<g id="node7" class="node open">
+<g id="node6" class="node open">
 <title>ZcashFoundation/frost#242</title>
-<g id="a_node7"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/242" xlink:title="ZcashFoundation/frost#242&#10;Implement broadcast&#10;channel for FROST PoC" target="_blank">
-<polygon fill="#c2e0c6" stroke="black" stroke-width="2" points="303,-363.5 87,-363.5 87,-310.5 303,-310.5 303,-363.5"/>
-<text text-anchor="middle" x="195" y="-348.3" font-family="Times,serif" font-size="14.00">ZcashFoundation/frost#242</text>
-<text text-anchor="middle" x="195" y="-333.3" font-family="Times,serif" font-size="14.00">Implement broadcast</text>
-<text text-anchor="middle" x="195" y="-318.3" font-family="Times,serif" font-size="14.00">channel for FROST PoC</text>
+<g id="a_node6"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/242" xlink:title="ZcashFoundation/frost#242&#10;Implement broadcast&#10;channel for FROST PoC" target="_blank">
+<polygon fill="#c2e0c6" stroke="black" stroke-width="2" points="303,-262.5 87,-262.5 87,-209.5 303,-209.5 303,-262.5"/>
+<text text-anchor="middle" x="195" y="-247.3" font-family="Times,serif" font-size="14.00">ZcashFoundation/frost#242</text>
+<text text-anchor="middle" x="195" y="-232.3" font-family="Times,serif" font-size="14.00">Implement broadcast</text>
+<text text-anchor="middle" x="195" y="-217.3" font-family="Times,serif" font-size="14.00">channel for FROST PoC</text>
 </a>
 </g>
 </g>
 <!-- ZcashFoundation/frost#324 -->
-<g id="node8" class="node open">
+<g id="node7" class="node open">
 <title>ZcashFoundation/frost#324</title>
-<g id="a_node8"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/324" xlink:title="ZcashFoundation/frost#324&#10;Return VerifiableSecretSh&#10;aringCommitment in frost&#45;&#10;zcash&#45;demo" target="_blank">
+<g id="a_node7"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/324" xlink:title="ZcashFoundation/frost#324&#10;Return VerifiableSecretSh&#10;aringCommitment in frost&#45;&#10;zcash&#45;demo" target="_blank">
 <polygon fill="#c2e0c6" stroke="black" stroke-width="2" points="303,-162 87,-162 87,-94 303,-94 303,-162"/>
 <text text-anchor="middle" x="195" y="-146.8" font-family="Times,serif" font-size="14.00">ZcashFoundation/frost#324</text>
 <text text-anchor="middle" x="195" y="-131.8" font-family="Times,serif" font-size="14.00">Return VerifiableSecretSh</text>
@@ -129,9 +118,9 @@
 </g>
 </g>
 <!-- ZcashFoundation/frost#362 -->
-<g id="node9" class="node open">
+<g id="node8" class="node open">
 <title>ZcashFoundation/frost#362</title>
-<g id="a_node9"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/362" xlink:title="ZcashFoundation/frost#362&#10;Implement split() in demo&#10;so a trusted dealer can&#10;accept a secret" target="_blank">
+<g id="a_node8"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/362" xlink:title="ZcashFoundation/frost#362&#10;Implement split() in demo&#10;so a trusted dealer can&#10;accept a secret" target="_blank">
 <polygon fill="#c2e0c6" stroke="black" stroke-width="2" points="303,-76 87,-76 87,-8 303,-8 303,-76"/>
 <text text-anchor="middle" x="195" y="-60.8" font-family="Times,serif" font-size="14.00">ZcashFoundation/frost#362</text>
 <text text-anchor="middle" x="195" y="-45.8" font-family="Times,serif" font-size="14.00">Implement split() in demo</text>
@@ -140,15 +129,26 @@
 </a>
 </g>
 </g>
+<!-- ZcashFoundation/frost#216 -->
+<g id="node9" class="node open">
+<title>ZcashFoundation/frost#216</title>
+<g id="a_node9"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/216" xlink:title="ZcashFoundation/frost#216&#10;Write security proof for&#10;Rerandomized FROST" target="_blank">
+<polygon fill="#c2e0c6" stroke="black" stroke-width="2" points="303,-591.5 87,-591.5 87,-538.5 303,-538.5 303,-591.5"/>
+<text text-anchor="middle" x="195" y="-576.3" font-family="Times,serif" font-size="14.00">ZcashFoundation/frost#216</text>
+<text text-anchor="middle" x="195" y="-561.3" font-family="Times,serif" font-size="14.00">Write security proof for</text>
+<text text-anchor="middle" x="195" y="-546.3" font-family="Times,serif" font-size="14.00">Rerandomized FROST</text>
+</a>
+</g>
+</g>
 <!-- ZcashFoundation/frost#235 -->
 <g id="node10" class="node closed">
 <title>ZcashFoundation/frost#235</title>
 <g id="a_node10"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/235" xlink:title="ZcashFoundation/frost#235&#10;Tag a `frost` release&#10;based on the final&#10;version of the spec" target="_blank">
-<polygon fill="#fad8c7" stroke="black" points="634,-727 418,-727 418,-659 634,-659 634,-727"/>
-<text text-anchor="middle" x="526" y="-711.8" font-family="Times,serif" font-size="14.00">ZcashFoundation/frost#235</text>
-<text text-anchor="middle" x="526" y="-696.8" font-family="Times,serif" font-size="14.00">Tag a `frost` release</text>
-<text text-anchor="middle" x="526" y="-681.8" font-family="Times,serif" font-size="14.00">based on the final</text>
-<text text-anchor="middle" x="526" y="-666.8" font-family="Times,serif" font-size="14.00">version of the spec</text>
+<polygon fill="#fad8c7" stroke="black" points="634,-716 418,-716 418,-648 634,-648 634,-716"/>
+<text text-anchor="middle" x="526" y="-700.8" font-family="Times,serif" font-size="14.00">ZcashFoundation/frost#235</text>
+<text text-anchor="middle" x="526" y="-685.8" font-family="Times,serif" font-size="14.00">Tag a `frost` release</text>
+<text text-anchor="middle" x="526" y="-670.8" font-family="Times,serif" font-size="14.00">based on the final</text>
+<text text-anchor="middle" x="526" y="-655.8" font-family="Times,serif" font-size="14.00">version of the spec</text>
 </a>
 </g>
 </g>
@@ -156,34 +156,34 @@
 <g id="node11" class="node open">
 <title>ZcashFoundation/frost#189</title>
 <g id="a_node11"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/189" xlink:title="ZcashFoundation/frost#189&#10;Updated release drafter&#10;config to match zebrad&#39;s" target="_blank">
-<polygon fill="#c2e0c6" stroke="black" stroke-width="2" points="303,-747.5 87,-747.5 87,-694.5 303,-694.5 303,-747.5"/>
-<text text-anchor="middle" x="195" y="-732.3" font-family="Times,serif" font-size="14.00">ZcashFoundation/frost#189</text>
-<text text-anchor="middle" x="195" y="-717.3" font-family="Times,serif" font-size="14.00">Updated release drafter</text>
-<text text-anchor="middle" x="195" y="-702.3" font-family="Times,serif" font-size="14.00">config to match zebrad&#39;s</text>
+<polygon fill="#c2e0c6" stroke="black" stroke-width="2" points="303,-740.5 87,-740.5 87,-687.5 303,-687.5 303,-740.5"/>
+<text text-anchor="middle" x="195" y="-725.3" font-family="Times,serif" font-size="14.00">ZcashFoundation/frost#189</text>
+<text text-anchor="middle" x="195" y="-710.3" font-family="Times,serif" font-size="14.00">Updated release drafter</text>
+<text text-anchor="middle" x="195" y="-695.3" font-family="Times,serif" font-size="14.00">config to match zebrad&#39;s</text>
 </a>
 </g>
 </g>
 <!-- ZcashFoundation/frost#189&#45;&gt;ZcashFoundation/frost#235 -->
 <g id="edge3" class="edge">
 <title>ZcashFoundation/frost#189&#45;&gt;ZcashFoundation/frost#235</title>
-<path fill="none" stroke="black" d="M303.27,-711.87C336.72,-709.02 373.78,-705.87 407.87,-702.97"/>
-<polygon fill="black" stroke="black" points="408.2,-706.45 417.87,-702.12 407.61,-699.48 408.2,-706.45"/>
+<path fill="none" stroke="black" d="M303.27,-703.57C336.72,-700.31 373.78,-696.71 407.87,-693.39"/>
+<polygon fill="black" stroke="black" points="408.25,-696.87 417.87,-692.42 407.58,-689.9 408.25,-696.87"/>
 </g>
 <!-- ZcashFoundation/frost#190 -->
 <g id="node12" class="node open">
 <title>ZcashFoundation/frost#190</title>
 <g id="a_node12"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/190" xlink:title="ZcashFoundation/frost#190&#10;Write a release checklist" target="_blank">
-<polygon fill="#c2e0c6" stroke="black" stroke-width="2" points="303,-676 87,-676 87,-638 303,-638 303,-676"/>
-<text text-anchor="middle" x="195" y="-660.8" font-family="Times,serif" font-size="14.00">ZcashFoundation/frost#190</text>
-<text text-anchor="middle" x="195" y="-645.8" font-family="Times,serif" font-size="14.00">Write a release checklist</text>
+<polygon fill="#c2e0c6" stroke="black" stroke-width="2" points="303,-669 87,-669 87,-631 303,-631 303,-669"/>
+<text text-anchor="middle" x="195" y="-653.8" font-family="Times,serif" font-size="14.00">ZcashFoundation/frost#190</text>
+<text text-anchor="middle" x="195" y="-638.8" font-family="Times,serif" font-size="14.00">Write a release checklist</text>
 </a>
 </g>
 </g>
 <!-- ZcashFoundation/frost#190&#45;&gt;ZcashFoundation/frost#235 -->
 <g id="edge4" class="edge">
 <title>ZcashFoundation/frost#190&#45;&gt;ZcashFoundation/frost#235</title>
-<path fill="none" stroke="black" d="M303.27,-668.74C336.72,-672.4 373.78,-676.45 407.87,-680.18"/>
-<polygon fill="black" stroke="black" points="407.55,-683.67 417.87,-681.28 408.31,-676.71 407.55,-683.67"/>
+<path fill="none" stroke="black" d="M303.27,-660.43C336.72,-663.69 373.78,-667.29 407.87,-670.61"/>
+<polygon fill="black" stroke="black" points="407.58,-674.1 417.87,-671.58 408.25,-667.13 407.58,-674.1"/>
 </g>
 </g>
 </svg>