diff --git a/zcash-zf-dag.html b/zcash-zf-dag.html
index 25ba6e8c..e5115443 100644
--- a/zcash-zf-dag.html
+++ b/zcash-zf-dag.html
@@ -22,19 +22,33 @@
 <g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 2175.5)">
 <polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-2175.5 1183,-2175.5 1183,4 -4,4"/>
 <g id="clust1" class="cluster">
-<title>cluster_2</title>
-<polygon fill="none" stroke="#0000ff" points="67,-194 67,-459 651,-459 651,-194 67,-194"/>
-<text text-anchor="middle" x="359" y="-443.8" font-family="Times,serif" font-size="14.00" fill="#000000">Epic: Zebra Release Candidate</text>
-</g>
-<g id="clust2" class="cluster">
 <title>cluster_0</title>
 <polygon fill="none" stroke="#0000ff" points="0,-467 0,-604 383,-604 383,-467 0,-467"/>
 <text text-anchor="middle" x="191.5" y="-588.8" font-family="Times,serif" font-size="14.00" fill="#000000">Epic: Commit blocks to state using a separate task</text>
 </g>
-<!-- ZcashFoundation/zebra#3050 -->
+<g id="clust2" class="cluster">
+<title>cluster_2</title>
+<polygon fill="none" stroke="#0000ff" points="67,-194 67,-459 651,-459 651,-194 67,-194"/>
+<text text-anchor="middle" x="359" y="-443.8" font-family="Times,serif" font-size="14.00" fill="#000000">Epic: Zebra Release Candidate</text>
+</g>
+<!-- ZcashFoundation/zebra#2654 -->
 <g id="node1" class="node open">
+<title>ZcashFoundation/zebra#2654</title>
+<g id="a_node1"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/2654" xlink:title="ZcashFoundation/zebra#2654&#10;Test if checkpoint&#10;verifier and state&#10;service are correctly&#10;reset on block commit&#10;errors" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="307,-573 75,-573 75,-475 307,-475 307,-573"/>
+<text text-anchor="middle" x="191" y="-557.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2654</text>
+<text text-anchor="middle" x="191" y="-542.8" font-family="Times,serif" font-size="14.00" fill="#000000">Test if checkpoint</text>
+<text text-anchor="middle" x="191" y="-527.8" font-family="Times,serif" font-size="14.00" fill="#000000">verifier and state</text>
+<text text-anchor="middle" x="191" y="-512.8" font-family="Times,serif" font-size="14.00" fill="#000000">service are correctly</text>
+<text text-anchor="middle" x="191" y="-497.8" font-family="Times,serif" font-size="14.00" fill="#000000">reset on block commit</text>
+<text text-anchor="middle" x="191" y="-482.8" font-family="Times,serif" font-size="14.00" fill="#000000">errors</text>
+</a>
+</g>
+</g>
+<!-- ZcashFoundation/zebra#3050 -->
+<g id="node2" class="node open">
 <title>ZcashFoundation/zebra#3050</title>
-<g id="a_node1"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/3050" xlink:title="ZcashFoundation/zebra#3050&#10;Tag Zebra 1.0.0&#45;rc.0&#10;stable release candidate" target="_blank">
+<g id="a_node2"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/3050" xlink:title="ZcashFoundation/zebra#3050&#10;Tag Zebra 1.0.0&#45;rc.0&#10;stable release candidate" target="_blank">
 <polygon fill="#c2e0c6" stroke="#000000" points="643,-420.5 411,-420.5 411,-367.5 643,-367.5 643,-420.5"/>
 <text text-anchor="middle" x="527" y="-405.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#3050</text>
 <text text-anchor="middle" x="527" y="-390.3" font-family="Times,serif" font-size="14.00" fill="#000000">Tag Zebra 1.0.0&#45;rc.0</text>
@@ -42,6 +56,12 @@
 </a>
 </g>
 </g>
+<!-- ZcashFoundation/zebra#2654&#45;&gt;ZcashFoundation/zebra#3050 -->
+<g id="edge7" class="edge">
+<title>ZcashFoundation/zebra#2654&#45;&gt;ZcashFoundation/zebra#3050</title>
+<path fill="none" stroke="#000000" d="M307.15,-489.96C332.39,-481.78 358.78,-472.6 383,-463 411.12,-451.86 441.42,-437.68 466.95,-425.08"/>
+<polygon fill="#000000" stroke="#000000" points="468.7244,-428.1066 476.12,-420.52 465.6075,-421.8387 468.7244,-428.1066"/>
+</g>
 <!-- ZcashFoundation/zebra#4967 -->
 <g id="node6" class="node open">
 <title>ZcashFoundation/zebra#4967</title>
@@ -56,7 +76,7 @@
 </g>
 </g>
 <!-- ZcashFoundation/zebra#3050&#45;&gt;ZcashFoundation/zebra#4967 -->
-<g id="edge3" class="edge">
+<g id="edge2" class="edge">
 <title>ZcashFoundation/zebra#3050&#45;&gt;ZcashFoundation/zebra#4967</title>
 <path fill="none" stroke="#000000" d="M570.78,-420.56C600.56,-437.88 641.27,-460.14 679,-476 683.8,-478.02 688.75,-479.98 693.78,-481.88"/>
 <polygon fill="#000000" stroke="#000000" points="692.9362,-485.2982 703.53,-485.45 695.3431,-478.725 692.9362,-485.2982"/>
@@ -76,7 +96,7 @@
 </g>
 </g>
 <!-- ZcashFoundation/zebra#3050&#45;&gt;ZcashFoundation/zebra#5357 -->
-<g id="edge4" class="edge">
+<g id="edge3" class="edge">
 <title>ZcashFoundation/zebra#3050&#45;&gt;ZcashFoundation/zebra#5357</title>
 <path fill="none" stroke="#000000" d="M577.79,-367.42C607.06,-352.49 644.73,-333.91 679,-319 683.69,-316.96 688.52,-314.91 693.4,-312.89"/>
 <polygon fill="#000000" stroke="#000000" points="694.9298,-316.0458 702.86,-309.02 692.2793,-309.567 694.9298,-316.0458"/>
@@ -94,7 +114,7 @@
 </g>
 </g>
 <!-- ZcashFoundation/zebra#3050&#45;&gt;ZcashFoundation/zebra#4955 -->
-<g id="edge5" class="edge">
+<g id="edge4" class="edge">
 <title>ZcashFoundation/zebra#3050&#45;&gt;ZcashFoundation/zebra#4955</title>
 <path fill="none" stroke="#000000" d="M643.38,-410.94C651.81,-412.16 660.33,-413.4 668.81,-414.64"/>
 <polygon fill="#000000" stroke="#000000" points="668.3412,-418.1085 678.74,-416.08 669.3458,-411.181 668.3412,-418.1085"/>
@@ -111,15 +131,15 @@
 </g>
 </g>
 <!-- ZcashFoundation/zebra#3050&#45;&gt;ZcashFoundation/zebra#4992 -->
-<g id="edge6" class="edge">
+<g id="edge5" class="edge">
 <title>ZcashFoundation/zebra#3050&#45;&gt;ZcashFoundation/zebra#4992</title>
 <path fill="none" stroke="#000000" d="M643.38,-376.63C651.81,-375.37 660.33,-374.1 668.81,-372.83"/>
 <polygon fill="#000000" stroke="#000000" points="669.3652,-376.286 678.74,-371.35 668.3333,-369.3625 669.3652,-376.286"/>
 </g>
 <!-- ZcashFoundation/zebra#4937 -->
-<g id="node2" class="node open">
+<g id="node3" class="node open">
 <title>ZcashFoundation/zebra#4937</title>
-<g id="a_node2"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/4937" xlink:title="ZcashFoundation/zebra#4937&#10;Epic: Commit blocks to&#10;state using a separate&#10;task" target="_blank">
+<g id="a_node3"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/4937" xlink:title="ZcashFoundation/zebra#4937&#10;Epic: Commit blocks to&#10;state using a separate&#10;task" target="_blank">
 <polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="307,-428 75,-428 75,-360 307,-360 307,-428"/>
 <text text-anchor="middle" x="191" y="-412.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#4937</text>
 <text text-anchor="middle" x="191" y="-397.8" font-family="Times,serif" font-size="14.00" fill="#000000">Epic: Commit blocks to</text>
@@ -146,15 +166,15 @@
 </g>
 </g>
 <!-- ZcashFoundation/zebra#4937&#45;&gt;ZcashFoundation/zebra#5189 -->
-<g id="edge7" class="edge">
+<g id="edge6" class="edge">
 <title>ZcashFoundation/zebra#4937&#45;&gt;ZcashFoundation/zebra#5189</title>
 <path fill="none" stroke="#000000" d="M307.12,-391.13C335.62,-384.77 363.51,-372.75 383,-351 458.2,-267.07 343.95,-189.57 411,-99 415.91,-92.37 421.88,-86.608 428.49,-81.603"/>
 <polygon fill="#000000" stroke="#000000" points="430.9015,-84.1941 437.18,-75.66 426.9499,-78.4161 430.9015,-84.1941"/>
 </g>
 <!-- ZcashFoundation/zebra#5125 -->
-<g id="node3" class="node open">
+<g id="node4" class="node open">
 <title>ZcashFoundation/zebra#5125</title>
-<g id="a_node3"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/5125" xlink:title="ZcashFoundation/zebra#5125&#10;Avoid temporary failures&#10;verifying the first non&#45;&#10;finalized block" target="_blank">
+<g id="a_node4"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/5125" xlink:title="ZcashFoundation/zebra#5125&#10;Avoid temporary failures&#10;verifying the first non&#45;&#10;finalized block" target="_blank">
 <polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="307,-342 75,-342 75,-274 307,-274 307,-342"/>
 <text text-anchor="middle" x="191" y="-326.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#5125</text>
 <text text-anchor="middle" x="191" y="-311.8" font-family="Times,serif" font-size="14.00" fill="#000000">Avoid temporary failures</text>
@@ -164,9 +184,9 @@
 </g>
 </g>
 <!-- ZcashFoundation/zebra#5214 -->
-<g id="node4" class="node open">
+<g id="node5" class="node open">
 <title>ZcashFoundation/zebra#5214</title>
-<g id="a_node4"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/5214" xlink:title="ZcashFoundation/zebra#5214&#10;Task: Make a list of&#10;Zebra dependencies" target="_blank">
+<g id="a_node5"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/5214" xlink:title="ZcashFoundation/zebra#5214&#10;Task: Make a list of&#10;Zebra dependencies" target="_blank">
 <polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="307,-255.5 75,-255.5 75,-202.5 307,-202.5 307,-255.5"/>
 <text text-anchor="middle" x="191" y="-240.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#5214</text>
 <text text-anchor="middle" x="191" y="-225.3" font-family="Times,serif" font-size="14.00" fill="#000000">Task: Make a list of</text>
@@ -174,26 +194,6 @@
 </a>
 </g>
 </g>
-<!-- ZcashFoundation/zebra#2654 -->
-<g id="node5" class="node open">
-<title>ZcashFoundation/zebra#2654</title>
-<g id="a_node5"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/2654" xlink:title="ZcashFoundation/zebra#2654&#10;Test if checkpoint&#10;verifier and state&#10;service are correctly&#10;reset on block commit&#10;errors" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="307,-573 75,-573 75,-475 307,-475 307,-573"/>
-<text text-anchor="middle" x="191" y="-557.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2654</text>
-<text text-anchor="middle" x="191" y="-542.8" font-family="Times,serif" font-size="14.00" fill="#000000">Test if checkpoint</text>
-<text text-anchor="middle" x="191" y="-527.8" font-family="Times,serif" font-size="14.00" fill="#000000">verifier and state</text>
-<text text-anchor="middle" x="191" y="-512.8" font-family="Times,serif" font-size="14.00" fill="#000000">service are correctly</text>
-<text text-anchor="middle" x="191" y="-497.8" font-family="Times,serif" font-size="14.00" fill="#000000">reset on block commit</text>
-<text text-anchor="middle" x="191" y="-482.8" font-family="Times,serif" font-size="14.00" fill="#000000">errors</text>
-</a>
-</g>
-</g>
-<!-- ZcashFoundation/zebra#2654&#45;&gt;ZcashFoundation/zebra#3050 -->
-<g id="edge2" class="edge">
-<title>ZcashFoundation/zebra#2654&#45;&gt;ZcashFoundation/zebra#3050</title>
-<path fill="none" stroke="#000000" d="M307.15,-489.96C332.39,-481.78 358.78,-472.6 383,-463 411.12,-451.86 441.42,-437.68 466.95,-425.08"/>
-<polygon fill="#000000" stroke="#000000" points="468.7244,-428.1066 476.12,-420.52 465.6075,-421.8387 468.7244,-428.1066"/>
-</g>
 <!-- ZcashFoundation/zebra#5257 -->
 <g id="node11" class="node open">
 <title>ZcashFoundation/zebra#5257</title>
diff --git a/zcash-zf-dag.svg b/zcash-zf-dag.svg
index c7d5b917..e22d698e 100644
--- a/zcash-zf-dag.svg
+++ b/zcash-zf-dag.svg
@@ -10,19 +10,33 @@
 <g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 2175.5)">
 <polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-2175.5 1183,-2175.5 1183,4 -4,4"/>
 <g id="clust1" class="cluster">
-<title>cluster_2</title>
-<polygon fill="none" stroke="#0000ff" points="67,-194 67,-459 651,-459 651,-194 67,-194"/>
-<text text-anchor="middle" x="359" y="-443.8" font-family="Times,serif" font-size="14.00" fill="#000000">Epic: Zebra Release Candidate</text>
-</g>
-<g id="clust2" class="cluster">
 <title>cluster_0</title>
 <polygon fill="none" stroke="#0000ff" points="0,-467 0,-604 383,-604 383,-467 0,-467"/>
 <text text-anchor="middle" x="191.5" y="-588.8" font-family="Times,serif" font-size="14.00" fill="#000000">Epic: Commit blocks to state using a separate task</text>
 </g>
-<!-- ZcashFoundation/zebra#3050 -->
+<g id="clust2" class="cluster">
+<title>cluster_2</title>
+<polygon fill="none" stroke="#0000ff" points="67,-194 67,-459 651,-459 651,-194 67,-194"/>
+<text text-anchor="middle" x="359" y="-443.8" font-family="Times,serif" font-size="14.00" fill="#000000">Epic: Zebra Release Candidate</text>
+</g>
+<!-- ZcashFoundation/zebra#2654 -->
 <g id="node1" class="node open">
+<title>ZcashFoundation/zebra#2654</title>
+<g id="a_node1"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/2654" xlink:title="ZcashFoundation/zebra#2654&#10;Test if checkpoint&#10;verifier and state&#10;service are correctly&#10;reset on block commit&#10;errors" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="307,-573 75,-573 75,-475 307,-475 307,-573"/>
+<text text-anchor="middle" x="191" y="-557.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2654</text>
+<text text-anchor="middle" x="191" y="-542.8" font-family="Times,serif" font-size="14.00" fill="#000000">Test if checkpoint</text>
+<text text-anchor="middle" x="191" y="-527.8" font-family="Times,serif" font-size="14.00" fill="#000000">verifier and state</text>
+<text text-anchor="middle" x="191" y="-512.8" font-family="Times,serif" font-size="14.00" fill="#000000">service are correctly</text>
+<text text-anchor="middle" x="191" y="-497.8" font-family="Times,serif" font-size="14.00" fill="#000000">reset on block commit</text>
+<text text-anchor="middle" x="191" y="-482.8" font-family="Times,serif" font-size="14.00" fill="#000000">errors</text>
+</a>
+</g>
+</g>
+<!-- ZcashFoundation/zebra#3050 -->
+<g id="node2" class="node open">
 <title>ZcashFoundation/zebra#3050</title>
-<g id="a_node1"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/3050" xlink:title="ZcashFoundation/zebra#3050&#10;Tag Zebra 1.0.0&#45;rc.0&#10;stable release candidate" target="_blank">
+<g id="a_node2"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/3050" xlink:title="ZcashFoundation/zebra#3050&#10;Tag Zebra 1.0.0&#45;rc.0&#10;stable release candidate" target="_blank">
 <polygon fill="#c2e0c6" stroke="#000000" points="643,-420.5 411,-420.5 411,-367.5 643,-367.5 643,-420.5"/>
 <text text-anchor="middle" x="527" y="-405.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#3050</text>
 <text text-anchor="middle" x="527" y="-390.3" font-family="Times,serif" font-size="14.00" fill="#000000">Tag Zebra 1.0.0&#45;rc.0</text>
@@ -30,6 +44,12 @@
 </a>
 </g>
 </g>
+<!-- ZcashFoundation/zebra#2654&#45;&gt;ZcashFoundation/zebra#3050 -->
+<g id="edge7" class="edge">
+<title>ZcashFoundation/zebra#2654&#45;&gt;ZcashFoundation/zebra#3050</title>
+<path fill="none" stroke="#000000" d="M307.15,-489.96C332.39,-481.78 358.78,-472.6 383,-463 411.12,-451.86 441.42,-437.68 466.95,-425.08"/>
+<polygon fill="#000000" stroke="#000000" points="468.7244,-428.1066 476.12,-420.52 465.6075,-421.8387 468.7244,-428.1066"/>
+</g>
 <!-- ZcashFoundation/zebra#4967 -->
 <g id="node6" class="node open">
 <title>ZcashFoundation/zebra#4967</title>
@@ -44,7 +64,7 @@
 </g>
 </g>
 <!-- ZcashFoundation/zebra#3050&#45;&gt;ZcashFoundation/zebra#4967 -->
-<g id="edge3" class="edge">
+<g id="edge2" class="edge">
 <title>ZcashFoundation/zebra#3050&#45;&gt;ZcashFoundation/zebra#4967</title>
 <path fill="none" stroke="#000000" d="M570.78,-420.56C600.56,-437.88 641.27,-460.14 679,-476 683.8,-478.02 688.75,-479.98 693.78,-481.88"/>
 <polygon fill="#000000" stroke="#000000" points="692.9362,-485.2982 703.53,-485.45 695.3431,-478.725 692.9362,-485.2982"/>
@@ -64,7 +84,7 @@
 </g>
 </g>
 <!-- ZcashFoundation/zebra#3050&#45;&gt;ZcashFoundation/zebra#5357 -->
-<g id="edge4" class="edge">
+<g id="edge3" class="edge">
 <title>ZcashFoundation/zebra#3050&#45;&gt;ZcashFoundation/zebra#5357</title>
 <path fill="none" stroke="#000000" d="M577.79,-367.42C607.06,-352.49 644.73,-333.91 679,-319 683.69,-316.96 688.52,-314.91 693.4,-312.89"/>
 <polygon fill="#000000" stroke="#000000" points="694.9298,-316.0458 702.86,-309.02 692.2793,-309.567 694.9298,-316.0458"/>
@@ -82,7 +102,7 @@
 </g>
 </g>
 <!-- ZcashFoundation/zebra#3050&#45;&gt;ZcashFoundation/zebra#4955 -->
-<g id="edge5" class="edge">
+<g id="edge4" class="edge">
 <title>ZcashFoundation/zebra#3050&#45;&gt;ZcashFoundation/zebra#4955</title>
 <path fill="none" stroke="#000000" d="M643.38,-410.94C651.81,-412.16 660.33,-413.4 668.81,-414.64"/>
 <polygon fill="#000000" stroke="#000000" points="668.3412,-418.1085 678.74,-416.08 669.3458,-411.181 668.3412,-418.1085"/>
@@ -99,15 +119,15 @@
 </g>
 </g>
 <!-- ZcashFoundation/zebra#3050&#45;&gt;ZcashFoundation/zebra#4992 -->
-<g id="edge6" class="edge">
+<g id="edge5" class="edge">
 <title>ZcashFoundation/zebra#3050&#45;&gt;ZcashFoundation/zebra#4992</title>
 <path fill="none" stroke="#000000" d="M643.38,-376.63C651.81,-375.37 660.33,-374.1 668.81,-372.83"/>
 <polygon fill="#000000" stroke="#000000" points="669.3652,-376.286 678.74,-371.35 668.3333,-369.3625 669.3652,-376.286"/>
 </g>
 <!-- ZcashFoundation/zebra#4937 -->
-<g id="node2" class="node open">
+<g id="node3" class="node open">
 <title>ZcashFoundation/zebra#4937</title>
-<g id="a_node2"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/4937" xlink:title="ZcashFoundation/zebra#4937&#10;Epic: Commit blocks to&#10;state using a separate&#10;task" target="_blank">
+<g id="a_node3"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/4937" xlink:title="ZcashFoundation/zebra#4937&#10;Epic: Commit blocks to&#10;state using a separate&#10;task" target="_blank">
 <polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="307,-428 75,-428 75,-360 307,-360 307,-428"/>
 <text text-anchor="middle" x="191" y="-412.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#4937</text>
 <text text-anchor="middle" x="191" y="-397.8" font-family="Times,serif" font-size="14.00" fill="#000000">Epic: Commit blocks to</text>
@@ -134,15 +154,15 @@
 </g>
 </g>
 <!-- ZcashFoundation/zebra#4937&#45;&gt;ZcashFoundation/zebra#5189 -->
-<g id="edge7" class="edge">
+<g id="edge6" class="edge">
 <title>ZcashFoundation/zebra#4937&#45;&gt;ZcashFoundation/zebra#5189</title>
 <path fill="none" stroke="#000000" d="M307.12,-391.13C335.62,-384.77 363.51,-372.75 383,-351 458.2,-267.07 343.95,-189.57 411,-99 415.91,-92.37 421.88,-86.608 428.49,-81.603"/>
 <polygon fill="#000000" stroke="#000000" points="430.9015,-84.1941 437.18,-75.66 426.9499,-78.4161 430.9015,-84.1941"/>
 </g>
 <!-- ZcashFoundation/zebra#5125 -->
-<g id="node3" class="node open">
+<g id="node4" class="node open">
 <title>ZcashFoundation/zebra#5125</title>
-<g id="a_node3"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/5125" xlink:title="ZcashFoundation/zebra#5125&#10;Avoid temporary failures&#10;verifying the first non&#45;&#10;finalized block" target="_blank">
+<g id="a_node4"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/5125" xlink:title="ZcashFoundation/zebra#5125&#10;Avoid temporary failures&#10;verifying the first non&#45;&#10;finalized block" target="_blank">
 <polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="307,-342 75,-342 75,-274 307,-274 307,-342"/>
 <text text-anchor="middle" x="191" y="-326.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#5125</text>
 <text text-anchor="middle" x="191" y="-311.8" font-family="Times,serif" font-size="14.00" fill="#000000">Avoid temporary failures</text>
@@ -152,9 +172,9 @@
 </g>
 </g>
 <!-- ZcashFoundation/zebra#5214 -->
-<g id="node4" class="node open">
+<g id="node5" class="node open">
 <title>ZcashFoundation/zebra#5214</title>
-<g id="a_node4"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/5214" xlink:title="ZcashFoundation/zebra#5214&#10;Task: Make a list of&#10;Zebra dependencies" target="_blank">
+<g id="a_node5"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/5214" xlink:title="ZcashFoundation/zebra#5214&#10;Task: Make a list of&#10;Zebra dependencies" target="_blank">
 <polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="307,-255.5 75,-255.5 75,-202.5 307,-202.5 307,-255.5"/>
 <text text-anchor="middle" x="191" y="-240.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#5214</text>
 <text text-anchor="middle" x="191" y="-225.3" font-family="Times,serif" font-size="14.00" fill="#000000">Task: Make a list of</text>
@@ -162,26 +182,6 @@
 </a>
 </g>
 </g>
-<!-- ZcashFoundation/zebra#2654 -->
-<g id="node5" class="node open">
-<title>ZcashFoundation/zebra#2654</title>
-<g id="a_node5"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/2654" xlink:title="ZcashFoundation/zebra#2654&#10;Test if checkpoint&#10;verifier and state&#10;service are correctly&#10;reset on block commit&#10;errors" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="307,-573 75,-573 75,-475 307,-475 307,-573"/>
-<text text-anchor="middle" x="191" y="-557.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2654</text>
-<text text-anchor="middle" x="191" y="-542.8" font-family="Times,serif" font-size="14.00" fill="#000000">Test if checkpoint</text>
-<text text-anchor="middle" x="191" y="-527.8" font-family="Times,serif" font-size="14.00" fill="#000000">verifier and state</text>
-<text text-anchor="middle" x="191" y="-512.8" font-family="Times,serif" font-size="14.00" fill="#000000">service are correctly</text>
-<text text-anchor="middle" x="191" y="-497.8" font-family="Times,serif" font-size="14.00" fill="#000000">reset on block commit</text>
-<text text-anchor="middle" x="191" y="-482.8" font-family="Times,serif" font-size="14.00" fill="#000000">errors</text>
-</a>
-</g>
-</g>
-<!-- ZcashFoundation/zebra#2654&#45;&gt;ZcashFoundation/zebra#3050 -->
-<g id="edge2" class="edge">
-<title>ZcashFoundation/zebra#2654&#45;&gt;ZcashFoundation/zebra#3050</title>
-<path fill="none" stroke="#000000" d="M307.15,-489.96C332.39,-481.78 358.78,-472.6 383,-463 411.12,-451.86 441.42,-437.68 466.95,-425.08"/>
-<polygon fill="#000000" stroke="#000000" points="468.7244,-428.1066 476.12,-420.52 465.6075,-421.8387 468.7244,-428.1066"/>
-</g>
 <!-- ZcashFoundation/zebra#5257 -->
 <g id="node11" class="node open">
 <title>ZcashFoundation/zebra#5257</title>
diff --git a/zcash-zf-frost-dag.html b/zcash-zf-frost-dag.html
index f1d17f90..03dbdf40 100644
--- a/zcash-zf-frost-dag.html
+++ b/zcash-zf-frost-dag.html
@@ -22,9 +22,9 @@
 <g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 1015)">
 <polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-1015 743,-1015 743,4 -4,4"/>
 <g id="clust1" class="cluster">
-<title>cluster_0</title>
-<polygon fill="none" stroke="#0000ff" points="4.5,0 4.5,-219 228.5,-219 228.5,0 4.5,0"/>
-<text text-anchor="middle" x="116.5" y="-203.8" font-family="Times,serif" font-size="14.00" fill="#000000">Epic: Remaining Curves</text>
+<title>cluster_2</title>
+<polygon fill="none" stroke="#0000ff" points="0,-342 0,-535 739,-535 739,-342 0,-342"/>
+<text text-anchor="middle" x="369.5" y="-519.8" font-family="Times,serif" font-size="14.00" fill="#000000">Epic: Re&#45;randomizable FROST</text>
 </g>
 <g id="clust2" class="cluster">
 <title>cluster_1</title>
@@ -32,80 +32,19 @@
 <text text-anchor="middle" x="243" y="-318.8" font-family="Times,serif" font-size="14.00" fill="#000000">Epic: DKG</text>
 </g>
 <g id="clust3" class="cluster">
-<title>cluster_2</title>
-<polygon fill="none" stroke="#0000ff" points="0,-342 0,-535 739,-535 739,-342 0,-342"/>
-<text text-anchor="middle" x="369.5" y="-519.8" font-family="Times,serif" font-size="14.00" fill="#000000">Epic: Re&#45;randomizable FROST</text>
+<title>cluster_0</title>
+<polygon fill="none" stroke="#0000ff" points="4.5,0 4.5,-219 228.5,-219 228.5,0 4.5,0"/>
+<text text-anchor="middle" x="116.5" y="-203.8" font-family="Times,serif" font-size="14.00" fill="#000000">Epic: Remaining Curves</text>
 </g>
 <g id="clust4" class="cluster">
 <title>cluster_3</title>
 <polygon fill="none" stroke="#0000ff" points="0,-543 0,-778 233,-778 233,-543 0,-543"/>
 <text text-anchor="middle" x="116.5" y="-762.8" font-family="Times,serif" font-size="14.00" fill="#000000">Epic: v9/v10</text>
 </g>
-<!-- ZcashFoundation/frost#70 -->
-<g id="node1" class="node open">
-<title>ZcashFoundation/frost#70</title>
-<g id="a_node1"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/70" xlink:title="ZcashFoundation/frost#70&#10;Add Ed25519 support" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="220.5,-188 12.5,-188 12.5,-150 220.5,-150 220.5,-188"/>
-<text text-anchor="middle" x="116.5" y="-172.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/frost#70</text>
-<text text-anchor="middle" x="116.5" y="-157.8" font-family="Times,serif" font-size="14.00" fill="#000000">Add Ed25519 support</text>
-</a>
-</g>
-</g>
-<!-- ZcashFoundation/frost#19 -->
-<g id="node2" class="node open">
-<title>ZcashFoundation/frost#19</title>
-<g id="a_node2"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/19" xlink:title="ZcashFoundation/frost#19&#10;`frost&#45;secp256k1`:&#10;implement FROST on&#10;Secp256k1 curve" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="220.5,-132 12.5,-132 12.5,-64 220.5,-64 220.5,-132"/>
-<text text-anchor="middle" x="116.5" y="-116.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/frost#19</text>
-<text text-anchor="middle" x="116.5" y="-101.8" font-family="Times,serif" font-size="14.00" fill="#000000">`frost&#45;secp256k1`:</text>
-<text text-anchor="middle" x="116.5" y="-86.8" font-family="Times,serif" font-size="14.00" fill="#000000">implement FROST on</text>
-<text text-anchor="middle" x="116.5" y="-71.8" font-family="Times,serif" font-size="14.00" fill="#000000">Secp256k1 curve</text>
-</a>
-</g>
-</g>
-<!-- ZcashFoundation/frost#71 -->
-<g id="node3" class="node open">
-<title>ZcashFoundation/frost#71</title>
-<g id="a_node3"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/71" xlink:title="ZcashFoundation/frost#71&#10;Add Ed448 support" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="220.5,-46 12.5,-46 12.5,-8 220.5,-8 220.5,-46"/>
-<text text-anchor="middle" x="116.5" y="-30.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/frost#71</text>
-<text text-anchor="middle" x="116.5" y="-15.8" font-family="Times,serif" font-size="14.00" fill="#000000">Add Ed448 support</text>
-</a>
-</g>
-</g>
-<!-- ZcashFoundation/frost#35 -->
-<g id="node4" class="node open">
-<title>ZcashFoundation/frost#35</title>
-<g id="a_node4"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/35" xlink:title="ZcashFoundation/frost#35&#10;frost&#45;core: Implement the&#10;generic DKG" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="220.5,-295.5 12.5,-295.5 12.5,-242.5 220.5,-242.5 220.5,-295.5"/>
-<text text-anchor="middle" x="116.5" y="-280.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/frost#35</text>
-<text text-anchor="middle" x="116.5" y="-265.3" font-family="Times,serif" font-size="14.00" fill="#000000">frost&#45;core: Implement the</text>
-<text text-anchor="middle" x="116.5" y="-250.3" font-family="Times,serif" font-size="14.00" fill="#000000">generic DKG</text>
-</a>
-</g>
-</g>
-<!-- ZcashFoundation/frost#63 -->
-<g id="node5" class="node open">
-<title>ZcashFoundation/frost#63</title>
-<g id="a_node5"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/63" xlink:title="ZcashFoundation/frost#63&#10;frost&#45;ristretto255:&#10;implement `frost&#45;core`&#39;s&#10;DKG concretely" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" points="473.5,-303 265.5,-303 265.5,-235 473.5,-235 473.5,-303"/>
-<text text-anchor="middle" x="369.5" y="-287.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/frost#63</text>
-<text text-anchor="middle" x="369.5" y="-272.8" font-family="Times,serif" font-size="14.00" fill="#000000">frost&#45;ristretto255:</text>
-<text text-anchor="middle" x="369.5" y="-257.8" font-family="Times,serif" font-size="14.00" fill="#000000">implement `frost&#45;core`&#39;s</text>
-<text text-anchor="middle" x="369.5" y="-242.8" font-family="Times,serif" font-size="14.00" fill="#000000">DKG concretely</text>
-</a>
-</g>
-</g>
-<!-- ZcashFoundation/frost#35&#45;&gt;ZcashFoundation/frost#63 -->
-<g id="edge1" class="edge">
-<title>ZcashFoundation/frost#35&#45;&gt;ZcashFoundation/frost#63</title>
-<path fill="none" stroke="#000000" d="M220.5,-269C231.99,-269 243.74,-269 255.34,-269"/>
-<polygon fill="#000000" stroke="#000000" points="255.49,-272.5001 265.49,-269 255.49,-265.5001 255.49,-272.5001"/>
-</g>
 <!-- ZcashFoundation/frost#119 -->
-<g id="node6" class="node open">
+<g id="node1" class="node open">
 <title>ZcashFoundation/frost#119</title>
-<g id="a_node6"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/119" xlink:title="ZcashFoundation/frost#119&#10;Review and officially&#10;submit the Re&#45;&#10;randomizable FROST ZIP" target="_blank">
+<g id="a_node1"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/119" xlink:title="ZcashFoundation/frost#119&#10;Review and officially&#10;submit the Re&#45;&#10;randomizable FROST ZIP" target="_blank">
 <polygon fill="#c2e0c6" stroke="#000000" points="478,-418 261,-418 261,-350 478,-350 478,-418"/>
 <text text-anchor="middle" x="369.5" y="-402.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/frost#119</text>
 <text text-anchor="middle" x="369.5" y="-387.8" font-family="Times,serif" font-size="14.00" fill="#000000">Review and officially</text>
@@ -115,9 +54,9 @@
 </g>
 </g>
 <!-- ZcashFoundation/frost#120 -->
-<g id="node7" class="node open">
+<g id="node2" class="node open">
 <title>ZcashFoundation/frost#120</title>
-<g id="a_node7"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/120" xlink:title="ZcashFoundation/frost#120&#10;Update Re&#45;randomizable&#10;FROST implementation to&#10;V10" target="_blank">
+<g id="a_node2"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/120" xlink:title="ZcashFoundation/frost#120&#10;Update Re&#45;randomizable&#10;FROST implementation to&#10;V10" target="_blank">
 <polygon fill="#c2e0c6" stroke="#000000" points="478,-504 261,-504 261,-436 478,-436 478,-504"/>
 <text text-anchor="middle" x="369.5" y="-488.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/frost#120</text>
 <text text-anchor="middle" x="369.5" y="-473.8" font-family="Times,serif" font-size="14.00" fill="#000000">Update Re&#45;randomizable</text>
@@ -127,9 +66,9 @@
 </g>
 </g>
 <!-- ZcashFoundation/frost#121 -->
-<g id="node8" class="node open">
+<g id="node3" class="node open">
 <title>ZcashFoundation/frost#121</title>
-<g id="a_node8"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/121" xlink:title="ZcashFoundation/frost#121&#10;Organize the Re&#45;&#10;randomizable FROST&#10;implementation" target="_blank">
+<g id="a_node3"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/121" xlink:title="ZcashFoundation/frost#121&#10;Organize the Re&#45;&#10;randomizable FROST&#10;implementation" target="_blank">
 <polygon fill="#c2e0c6" stroke="#000000" points="731,-504 514,-504 514,-436 731,-436 731,-504"/>
 <text text-anchor="middle" x="622.5" y="-488.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/frost#121</text>
 <text text-anchor="middle" x="622.5" y="-473.8" font-family="Times,serif" font-size="14.00" fill="#000000">Organize the Re&#45;</text>
@@ -139,15 +78,15 @@
 </g>
 </g>
 <!-- ZcashFoundation/frost#120&#45;&gt;ZcashFoundation/frost#121 -->
-<g id="edge2" class="edge">
+<g id="edge1" class="edge">
 <title>ZcashFoundation/frost#120&#45;&gt;ZcashFoundation/frost#121</title>
 <path fill="none" stroke="#000000" d="M478.26,-470C486.64,-470 495.13,-470 503.57,-470"/>
 <polygon fill="#000000" stroke="#000000" points="503.83,-473.5001 513.83,-470 503.83,-466.5001 503.83,-473.5001"/>
 </g>
 <!-- ZcashFoundation/frost#140 -->
-<g id="node9" class="node open">
+<g id="node4" class="node open">
 <title>ZcashFoundation/frost#140</title>
-<g id="a_node9"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/140" xlink:title="ZcashFoundation/frost#140&#10;Update Re&#45;randomizable&#10;FROST ZIP to V10" target="_blank">
+<g id="a_node4"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/140" xlink:title="ZcashFoundation/frost#140&#10;Update Re&#45;randomizable&#10;FROST ZIP to V10" target="_blank">
 <polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="225,-486.5 8,-486.5 8,-433.5 225,-433.5 225,-486.5"/>
 <text text-anchor="middle" x="116.5" y="-471.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/frost#140</text>
 <text text-anchor="middle" x="116.5" y="-456.3" font-family="Times,serif" font-size="14.00" fill="#000000">Update Re&#45;randomizable</text>
@@ -156,27 +95,88 @@
 </g>
 </g>
 <!-- ZcashFoundation/frost#140&#45;&gt;ZcashFoundation/frost#119 -->
-<g id="edge3" class="edge">
+<g id="edge2" class="edge">
 <title>ZcashFoundation/frost#140&#45;&gt;ZcashFoundation/frost#119</title>
 <path fill="none" stroke="#000000" d="M204.99,-433.42C219.86,-428.95 235.5,-424.25 250.98,-419.6"/>
 <polygon fill="#000000" stroke="#000000" points="252.0157,-422.9435 260.59,-416.72 250.0061,-416.2381 252.0157,-422.9435"/>
 </g>
 <!-- ZcashFoundation/frost#140&#45;&gt;ZcashFoundation/frost#120 -->
-<g id="edge4" class="edge">
+<g id="edge3" class="edge">
 <title>ZcashFoundation/frost#140&#45;&gt;ZcashFoundation/frost#120</title>
 <path fill="none" stroke="#000000" d="M225.26,-464.3C233.64,-464.63 242.13,-464.97 250.57,-465.3"/>
 <polygon fill="#000000" stroke="#000000" points="250.7012,-468.8077 260.83,-465.7 250.974,-461.813 250.7012,-468.8077"/>
 </g>
 <!-- ZcashFoundation/frost#81 -->
-<g id="node10" class="node open">
+<g id="node5" class="node open">
 <title>ZcashFoundation/frost#81</title>
-<g id="a_node10"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/81" xlink:title="ZcashFoundation/frost#81&#10;Start rerandomized repo" target="_blank">
+<g id="a_node5"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/81" xlink:title="ZcashFoundation/frost#81&#10;Start rerandomized repo" target="_blank">
 <polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="220.5,-406 12.5,-406 12.5,-368 220.5,-368 220.5,-406"/>
 <text text-anchor="middle" x="116.5" y="-390.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/frost#81</text>
 <text text-anchor="middle" x="116.5" y="-375.8" font-family="Times,serif" font-size="14.00" fill="#000000">Start rerandomized repo</text>
 </a>
 </g>
 </g>
+<!-- ZcashFoundation/frost#35 -->
+<g id="node6" class="node open">
+<title>ZcashFoundation/frost#35</title>
+<g id="a_node6"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/35" xlink:title="ZcashFoundation/frost#35&#10;frost&#45;core: Implement the&#10;generic DKG" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="220.5,-295.5 12.5,-295.5 12.5,-242.5 220.5,-242.5 220.5,-295.5"/>
+<text text-anchor="middle" x="116.5" y="-280.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/frost#35</text>
+<text text-anchor="middle" x="116.5" y="-265.3" font-family="Times,serif" font-size="14.00" fill="#000000">frost&#45;core: Implement the</text>
+<text text-anchor="middle" x="116.5" y="-250.3" font-family="Times,serif" font-size="14.00" fill="#000000">generic DKG</text>
+</a>
+</g>
+</g>
+<!-- ZcashFoundation/frost#63 -->
+<g id="node7" class="node open">
+<title>ZcashFoundation/frost#63</title>
+<g id="a_node7"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/63" xlink:title="ZcashFoundation/frost#63&#10;frost&#45;ristretto255:&#10;implement `frost&#45;core`&#39;s&#10;DKG concretely" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" points="473.5,-303 265.5,-303 265.5,-235 473.5,-235 473.5,-303"/>
+<text text-anchor="middle" x="369.5" y="-287.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/frost#63</text>
+<text text-anchor="middle" x="369.5" y="-272.8" font-family="Times,serif" font-size="14.00" fill="#000000">frost&#45;ristretto255:</text>
+<text text-anchor="middle" x="369.5" y="-257.8" font-family="Times,serif" font-size="14.00" fill="#000000">implement `frost&#45;core`&#39;s</text>
+<text text-anchor="middle" x="369.5" y="-242.8" font-family="Times,serif" font-size="14.00" fill="#000000">DKG concretely</text>
+</a>
+</g>
+</g>
+<!-- ZcashFoundation/frost#35&#45;&gt;ZcashFoundation/frost#63 -->
+<g id="edge4" class="edge">
+<title>ZcashFoundation/frost#35&#45;&gt;ZcashFoundation/frost#63</title>
+<path fill="none" stroke="#000000" d="M220.5,-269C231.99,-269 243.74,-269 255.34,-269"/>
+<polygon fill="#000000" stroke="#000000" points="255.49,-272.5001 265.49,-269 255.49,-265.5001 255.49,-272.5001"/>
+</g>
+<!-- ZcashFoundation/frost#70 -->
+<g id="node8" class="node open">
+<title>ZcashFoundation/frost#70</title>
+<g id="a_node8"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/70" xlink:title="ZcashFoundation/frost#70&#10;Add Ed25519 support" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="220.5,-188 12.5,-188 12.5,-150 220.5,-150 220.5,-188"/>
+<text text-anchor="middle" x="116.5" y="-172.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/frost#70</text>
+<text text-anchor="middle" x="116.5" y="-157.8" font-family="Times,serif" font-size="14.00" fill="#000000">Add Ed25519 support</text>
+</a>
+</g>
+</g>
+<!-- ZcashFoundation/frost#19 -->
+<g id="node9" class="node open">
+<title>ZcashFoundation/frost#19</title>
+<g id="a_node9"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/19" xlink:title="ZcashFoundation/frost#19&#10;`frost&#45;secp256k1`:&#10;implement FROST on&#10;Secp256k1 curve" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="220.5,-132 12.5,-132 12.5,-64 220.5,-64 220.5,-132"/>
+<text text-anchor="middle" x="116.5" y="-116.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/frost#19</text>
+<text text-anchor="middle" x="116.5" y="-101.8" font-family="Times,serif" font-size="14.00" fill="#000000">`frost&#45;secp256k1`:</text>
+<text text-anchor="middle" x="116.5" y="-86.8" font-family="Times,serif" font-size="14.00" fill="#000000">implement FROST on</text>
+<text text-anchor="middle" x="116.5" y="-71.8" font-family="Times,serif" font-size="14.00" fill="#000000">Secp256k1 curve</text>
+</a>
+</g>
+</g>
+<!-- ZcashFoundation/frost#71 -->
+<g id="node10" class="node open">
+<title>ZcashFoundation/frost#71</title>
+<g id="a_node10"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/71" xlink:title="ZcashFoundation/frost#71&#10;Add Ed448 support" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="220.5,-46 12.5,-46 12.5,-8 220.5,-8 220.5,-46"/>
+<text text-anchor="middle" x="116.5" y="-30.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/frost#71</text>
+<text text-anchor="middle" x="116.5" y="-15.8" font-family="Times,serif" font-size="14.00" fill="#000000">Add Ed448 support</text>
+</a>
+</g>
+</g>
 <!-- ZcashFoundation/frost#79 -->
 <g id="node11" class="node open">
 <title>ZcashFoundation/frost#79</title>
diff --git a/zcash-zf-frost-dag.svg b/zcash-zf-frost-dag.svg
index d8de4edd..246a812d 100644
--- a/zcash-zf-frost-dag.svg
+++ b/zcash-zf-frost-dag.svg
@@ -10,9 +10,9 @@
 <g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 1015)">
 <polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-1015 743,-1015 743,4 -4,4"/>
 <g id="clust1" class="cluster">
-<title>cluster_0</title>
-<polygon fill="none" stroke="#0000ff" points="4.5,0 4.5,-219 228.5,-219 228.5,0 4.5,0"/>
-<text text-anchor="middle" x="116.5" y="-203.8" font-family="Times,serif" font-size="14.00" fill="#000000">Epic: Remaining Curves</text>
+<title>cluster_2</title>
+<polygon fill="none" stroke="#0000ff" points="0,-342 0,-535 739,-535 739,-342 0,-342"/>
+<text text-anchor="middle" x="369.5" y="-519.8" font-family="Times,serif" font-size="14.00" fill="#000000">Epic: Re&#45;randomizable FROST</text>
 </g>
 <g id="clust2" class="cluster">
 <title>cluster_1</title>
@@ -20,80 +20,19 @@
 <text text-anchor="middle" x="243" y="-318.8" font-family="Times,serif" font-size="14.00" fill="#000000">Epic: DKG</text>
 </g>
 <g id="clust3" class="cluster">
-<title>cluster_2</title>
-<polygon fill="none" stroke="#0000ff" points="0,-342 0,-535 739,-535 739,-342 0,-342"/>
-<text text-anchor="middle" x="369.5" y="-519.8" font-family="Times,serif" font-size="14.00" fill="#000000">Epic: Re&#45;randomizable FROST</text>
+<title>cluster_0</title>
+<polygon fill="none" stroke="#0000ff" points="4.5,0 4.5,-219 228.5,-219 228.5,0 4.5,0"/>
+<text text-anchor="middle" x="116.5" y="-203.8" font-family="Times,serif" font-size="14.00" fill="#000000">Epic: Remaining Curves</text>
 </g>
 <g id="clust4" class="cluster">
 <title>cluster_3</title>
 <polygon fill="none" stroke="#0000ff" points="0,-543 0,-778 233,-778 233,-543 0,-543"/>
 <text text-anchor="middle" x="116.5" y="-762.8" font-family="Times,serif" font-size="14.00" fill="#000000">Epic: v9/v10</text>
 </g>
-<!-- ZcashFoundation/frost#70 -->
-<g id="node1" class="node open">
-<title>ZcashFoundation/frost#70</title>
-<g id="a_node1"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/70" xlink:title="ZcashFoundation/frost#70&#10;Add Ed25519 support" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="220.5,-188 12.5,-188 12.5,-150 220.5,-150 220.5,-188"/>
-<text text-anchor="middle" x="116.5" y="-172.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/frost#70</text>
-<text text-anchor="middle" x="116.5" y="-157.8" font-family="Times,serif" font-size="14.00" fill="#000000">Add Ed25519 support</text>
-</a>
-</g>
-</g>
-<!-- ZcashFoundation/frost#19 -->
-<g id="node2" class="node open">
-<title>ZcashFoundation/frost#19</title>
-<g id="a_node2"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/19" xlink:title="ZcashFoundation/frost#19&#10;`frost&#45;secp256k1`:&#10;implement FROST on&#10;Secp256k1 curve" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="220.5,-132 12.5,-132 12.5,-64 220.5,-64 220.5,-132"/>
-<text text-anchor="middle" x="116.5" y="-116.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/frost#19</text>
-<text text-anchor="middle" x="116.5" y="-101.8" font-family="Times,serif" font-size="14.00" fill="#000000">`frost&#45;secp256k1`:</text>
-<text text-anchor="middle" x="116.5" y="-86.8" font-family="Times,serif" font-size="14.00" fill="#000000">implement FROST on</text>
-<text text-anchor="middle" x="116.5" y="-71.8" font-family="Times,serif" font-size="14.00" fill="#000000">Secp256k1 curve</text>
-</a>
-</g>
-</g>
-<!-- ZcashFoundation/frost#71 -->
-<g id="node3" class="node open">
-<title>ZcashFoundation/frost#71</title>
-<g id="a_node3"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/71" xlink:title="ZcashFoundation/frost#71&#10;Add Ed448 support" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="220.5,-46 12.5,-46 12.5,-8 220.5,-8 220.5,-46"/>
-<text text-anchor="middle" x="116.5" y="-30.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/frost#71</text>
-<text text-anchor="middle" x="116.5" y="-15.8" font-family="Times,serif" font-size="14.00" fill="#000000">Add Ed448 support</text>
-</a>
-</g>
-</g>
-<!-- ZcashFoundation/frost#35 -->
-<g id="node4" class="node open">
-<title>ZcashFoundation/frost#35</title>
-<g id="a_node4"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/35" xlink:title="ZcashFoundation/frost#35&#10;frost&#45;core: Implement the&#10;generic DKG" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="220.5,-295.5 12.5,-295.5 12.5,-242.5 220.5,-242.5 220.5,-295.5"/>
-<text text-anchor="middle" x="116.5" y="-280.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/frost#35</text>
-<text text-anchor="middle" x="116.5" y="-265.3" font-family="Times,serif" font-size="14.00" fill="#000000">frost&#45;core: Implement the</text>
-<text text-anchor="middle" x="116.5" y="-250.3" font-family="Times,serif" font-size="14.00" fill="#000000">generic DKG</text>
-</a>
-</g>
-</g>
-<!-- ZcashFoundation/frost#63 -->
-<g id="node5" class="node open">
-<title>ZcashFoundation/frost#63</title>
-<g id="a_node5"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/63" xlink:title="ZcashFoundation/frost#63&#10;frost&#45;ristretto255:&#10;implement `frost&#45;core`&#39;s&#10;DKG concretely" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" points="473.5,-303 265.5,-303 265.5,-235 473.5,-235 473.5,-303"/>
-<text text-anchor="middle" x="369.5" y="-287.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/frost#63</text>
-<text text-anchor="middle" x="369.5" y="-272.8" font-family="Times,serif" font-size="14.00" fill="#000000">frost&#45;ristretto255:</text>
-<text text-anchor="middle" x="369.5" y="-257.8" font-family="Times,serif" font-size="14.00" fill="#000000">implement `frost&#45;core`&#39;s</text>
-<text text-anchor="middle" x="369.5" y="-242.8" font-family="Times,serif" font-size="14.00" fill="#000000">DKG concretely</text>
-</a>
-</g>
-</g>
-<!-- ZcashFoundation/frost#35&#45;&gt;ZcashFoundation/frost#63 -->
-<g id="edge1" class="edge">
-<title>ZcashFoundation/frost#35&#45;&gt;ZcashFoundation/frost#63</title>
-<path fill="none" stroke="#000000" d="M220.5,-269C231.99,-269 243.74,-269 255.34,-269"/>
-<polygon fill="#000000" stroke="#000000" points="255.49,-272.5001 265.49,-269 255.49,-265.5001 255.49,-272.5001"/>
-</g>
 <!-- ZcashFoundation/frost#119 -->
-<g id="node6" class="node open">
+<g id="node1" class="node open">
 <title>ZcashFoundation/frost#119</title>
-<g id="a_node6"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/119" xlink:title="ZcashFoundation/frost#119&#10;Review and officially&#10;submit the Re&#45;&#10;randomizable FROST ZIP" target="_blank">
+<g id="a_node1"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/119" xlink:title="ZcashFoundation/frost#119&#10;Review and officially&#10;submit the Re&#45;&#10;randomizable FROST ZIP" target="_blank">
 <polygon fill="#c2e0c6" stroke="#000000" points="478,-418 261,-418 261,-350 478,-350 478,-418"/>
 <text text-anchor="middle" x="369.5" y="-402.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/frost#119</text>
 <text text-anchor="middle" x="369.5" y="-387.8" font-family="Times,serif" font-size="14.00" fill="#000000">Review and officially</text>
@@ -103,9 +42,9 @@
 </g>
 </g>
 <!-- ZcashFoundation/frost#120 -->
-<g id="node7" class="node open">
+<g id="node2" class="node open">
 <title>ZcashFoundation/frost#120</title>
-<g id="a_node7"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/120" xlink:title="ZcashFoundation/frost#120&#10;Update Re&#45;randomizable&#10;FROST implementation to&#10;V10" target="_blank">
+<g id="a_node2"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/120" xlink:title="ZcashFoundation/frost#120&#10;Update Re&#45;randomizable&#10;FROST implementation to&#10;V10" target="_blank">
 <polygon fill="#c2e0c6" stroke="#000000" points="478,-504 261,-504 261,-436 478,-436 478,-504"/>
 <text text-anchor="middle" x="369.5" y="-488.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/frost#120</text>
 <text text-anchor="middle" x="369.5" y="-473.8" font-family="Times,serif" font-size="14.00" fill="#000000">Update Re&#45;randomizable</text>
@@ -115,9 +54,9 @@
 </g>
 </g>
 <!-- ZcashFoundation/frost#121 -->
-<g id="node8" class="node open">
+<g id="node3" class="node open">
 <title>ZcashFoundation/frost#121</title>
-<g id="a_node8"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/121" xlink:title="ZcashFoundation/frost#121&#10;Organize the Re&#45;&#10;randomizable FROST&#10;implementation" target="_blank">
+<g id="a_node3"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/121" xlink:title="ZcashFoundation/frost#121&#10;Organize the Re&#45;&#10;randomizable FROST&#10;implementation" target="_blank">
 <polygon fill="#c2e0c6" stroke="#000000" points="731,-504 514,-504 514,-436 731,-436 731,-504"/>
 <text text-anchor="middle" x="622.5" y="-488.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/frost#121</text>
 <text text-anchor="middle" x="622.5" y="-473.8" font-family="Times,serif" font-size="14.00" fill="#000000">Organize the Re&#45;</text>
@@ -127,15 +66,15 @@
 </g>
 </g>
 <!-- ZcashFoundation/frost#120&#45;&gt;ZcashFoundation/frost#121 -->
-<g id="edge2" class="edge">
+<g id="edge1" class="edge">
 <title>ZcashFoundation/frost#120&#45;&gt;ZcashFoundation/frost#121</title>
 <path fill="none" stroke="#000000" d="M478.26,-470C486.64,-470 495.13,-470 503.57,-470"/>
 <polygon fill="#000000" stroke="#000000" points="503.83,-473.5001 513.83,-470 503.83,-466.5001 503.83,-473.5001"/>
 </g>
 <!-- ZcashFoundation/frost#140 -->
-<g id="node9" class="node open">
+<g id="node4" class="node open">
 <title>ZcashFoundation/frost#140</title>
-<g id="a_node9"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/140" xlink:title="ZcashFoundation/frost#140&#10;Update Re&#45;randomizable&#10;FROST ZIP to V10" target="_blank">
+<g id="a_node4"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/140" xlink:title="ZcashFoundation/frost#140&#10;Update Re&#45;randomizable&#10;FROST ZIP to V10" target="_blank">
 <polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="225,-486.5 8,-486.5 8,-433.5 225,-433.5 225,-486.5"/>
 <text text-anchor="middle" x="116.5" y="-471.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/frost#140</text>
 <text text-anchor="middle" x="116.5" y="-456.3" font-family="Times,serif" font-size="14.00" fill="#000000">Update Re&#45;randomizable</text>
@@ -144,27 +83,88 @@
 </g>
 </g>
 <!-- ZcashFoundation/frost#140&#45;&gt;ZcashFoundation/frost#119 -->
-<g id="edge3" class="edge">
+<g id="edge2" class="edge">
 <title>ZcashFoundation/frost#140&#45;&gt;ZcashFoundation/frost#119</title>
 <path fill="none" stroke="#000000" d="M204.99,-433.42C219.86,-428.95 235.5,-424.25 250.98,-419.6"/>
 <polygon fill="#000000" stroke="#000000" points="252.0157,-422.9435 260.59,-416.72 250.0061,-416.2381 252.0157,-422.9435"/>
 </g>
 <!-- ZcashFoundation/frost#140&#45;&gt;ZcashFoundation/frost#120 -->
-<g id="edge4" class="edge">
+<g id="edge3" class="edge">
 <title>ZcashFoundation/frost#140&#45;&gt;ZcashFoundation/frost#120</title>
 <path fill="none" stroke="#000000" d="M225.26,-464.3C233.64,-464.63 242.13,-464.97 250.57,-465.3"/>
 <polygon fill="#000000" stroke="#000000" points="250.7012,-468.8077 260.83,-465.7 250.974,-461.813 250.7012,-468.8077"/>
 </g>
 <!-- ZcashFoundation/frost#81 -->
-<g id="node10" class="node open">
+<g id="node5" class="node open">
 <title>ZcashFoundation/frost#81</title>
-<g id="a_node10"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/81" xlink:title="ZcashFoundation/frost#81&#10;Start rerandomized repo" target="_blank">
+<g id="a_node5"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/81" xlink:title="ZcashFoundation/frost#81&#10;Start rerandomized repo" target="_blank">
 <polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="220.5,-406 12.5,-406 12.5,-368 220.5,-368 220.5,-406"/>
 <text text-anchor="middle" x="116.5" y="-390.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/frost#81</text>
 <text text-anchor="middle" x="116.5" y="-375.8" font-family="Times,serif" font-size="14.00" fill="#000000">Start rerandomized repo</text>
 </a>
 </g>
 </g>
+<!-- ZcashFoundation/frost#35 -->
+<g id="node6" class="node open">
+<title>ZcashFoundation/frost#35</title>
+<g id="a_node6"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/35" xlink:title="ZcashFoundation/frost#35&#10;frost&#45;core: Implement the&#10;generic DKG" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="220.5,-295.5 12.5,-295.5 12.5,-242.5 220.5,-242.5 220.5,-295.5"/>
+<text text-anchor="middle" x="116.5" y="-280.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/frost#35</text>
+<text text-anchor="middle" x="116.5" y="-265.3" font-family="Times,serif" font-size="14.00" fill="#000000">frost&#45;core: Implement the</text>
+<text text-anchor="middle" x="116.5" y="-250.3" font-family="Times,serif" font-size="14.00" fill="#000000">generic DKG</text>
+</a>
+</g>
+</g>
+<!-- ZcashFoundation/frost#63 -->
+<g id="node7" class="node open">
+<title>ZcashFoundation/frost#63</title>
+<g id="a_node7"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/63" xlink:title="ZcashFoundation/frost#63&#10;frost&#45;ristretto255:&#10;implement `frost&#45;core`&#39;s&#10;DKG concretely" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" points="473.5,-303 265.5,-303 265.5,-235 473.5,-235 473.5,-303"/>
+<text text-anchor="middle" x="369.5" y="-287.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/frost#63</text>
+<text text-anchor="middle" x="369.5" y="-272.8" font-family="Times,serif" font-size="14.00" fill="#000000">frost&#45;ristretto255:</text>
+<text text-anchor="middle" x="369.5" y="-257.8" font-family="Times,serif" font-size="14.00" fill="#000000">implement `frost&#45;core`&#39;s</text>
+<text text-anchor="middle" x="369.5" y="-242.8" font-family="Times,serif" font-size="14.00" fill="#000000">DKG concretely</text>
+</a>
+</g>
+</g>
+<!-- ZcashFoundation/frost#35&#45;&gt;ZcashFoundation/frost#63 -->
+<g id="edge4" class="edge">
+<title>ZcashFoundation/frost#35&#45;&gt;ZcashFoundation/frost#63</title>
+<path fill="none" stroke="#000000" d="M220.5,-269C231.99,-269 243.74,-269 255.34,-269"/>
+<polygon fill="#000000" stroke="#000000" points="255.49,-272.5001 265.49,-269 255.49,-265.5001 255.49,-272.5001"/>
+</g>
+<!-- ZcashFoundation/frost#70 -->
+<g id="node8" class="node open">
+<title>ZcashFoundation/frost#70</title>
+<g id="a_node8"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/70" xlink:title="ZcashFoundation/frost#70&#10;Add Ed25519 support" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="220.5,-188 12.5,-188 12.5,-150 220.5,-150 220.5,-188"/>
+<text text-anchor="middle" x="116.5" y="-172.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/frost#70</text>
+<text text-anchor="middle" x="116.5" y="-157.8" font-family="Times,serif" font-size="14.00" fill="#000000">Add Ed25519 support</text>
+</a>
+</g>
+</g>
+<!-- ZcashFoundation/frost#19 -->
+<g id="node9" class="node open">
+<title>ZcashFoundation/frost#19</title>
+<g id="a_node9"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/19" xlink:title="ZcashFoundation/frost#19&#10;`frost&#45;secp256k1`:&#10;implement FROST on&#10;Secp256k1 curve" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="220.5,-132 12.5,-132 12.5,-64 220.5,-64 220.5,-132"/>
+<text text-anchor="middle" x="116.5" y="-116.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/frost#19</text>
+<text text-anchor="middle" x="116.5" y="-101.8" font-family="Times,serif" font-size="14.00" fill="#000000">`frost&#45;secp256k1`:</text>
+<text text-anchor="middle" x="116.5" y="-86.8" font-family="Times,serif" font-size="14.00" fill="#000000">implement FROST on</text>
+<text text-anchor="middle" x="116.5" y="-71.8" font-family="Times,serif" font-size="14.00" fill="#000000">Secp256k1 curve</text>
+</a>
+</g>
+</g>
+<!-- ZcashFoundation/frost#71 -->
+<g id="node10" class="node open">
+<title>ZcashFoundation/frost#71</title>
+<g id="a_node10"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/71" xlink:title="ZcashFoundation/frost#71&#10;Add Ed448 support" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="220.5,-46 12.5,-46 12.5,-8 220.5,-8 220.5,-46"/>
+<text text-anchor="middle" x="116.5" y="-30.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/frost#71</text>
+<text text-anchor="middle" x="116.5" y="-15.8" font-family="Times,serif" font-size="14.00" fill="#000000">Add Ed448 support</text>
+</a>
+</g>
+</g>
 <!-- ZcashFoundation/frost#79 -->
 <g id="node11" class="node open">
 <title>ZcashFoundation/frost#79</title>