diff --git a/zcash-zf-dag.html b/zcash-zf-dag.html
index 552a1785..208831f8 100644
--- a/zcash-zf-dag.html
+++ b/zcash-zf-dag.html
@@ -22,33 +22,19 @@
 <g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 2064.5)">
 <polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-2064.5 1175,-2064.5 1175,4 -4,4"/>
 <g id="clust1" class="cluster">
-<title>cluster_1</title>
-<polygon fill="none" stroke="#0000ff" points="260,-516 260,-653 643,-653 643,-516 260,-516"/>
-<text text-anchor="middle" x="451.5" y="-637.8" font-family="Times,serif" font-size="14.00" fill="#000000">Epic: Commit blocks to state using a separate task</text>
-</g>
-<g id="clust2" class="cluster">
 <title>cluster_0</title>
 <polygon fill="none" stroke="#0000ff" points="327,-78 327,-257 911,-257 911,-78 327,-78"/>
 <text text-anchor="middle" x="619" y="-241.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="567,-622 335,-622 335,-524 567,-524 567,-622"/>
-<text text-anchor="middle" x="451" y="-606.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2654</text>
-<text text-anchor="middle" x="451" y="-591.8" font-family="Times,serif" font-size="14.00" fill="#000000">Test if checkpoint</text>
-<text text-anchor="middle" x="451" y="-576.8" font-family="Times,serif" font-size="14.00" fill="#000000">verifier and state</text>
-<text text-anchor="middle" x="451" y="-561.8" font-family="Times,serif" font-size="14.00" fill="#000000">service are correctly</text>
-<text text-anchor="middle" x="451" y="-546.8" font-family="Times,serif" font-size="14.00" fill="#000000">reset on block commit</text>
-<text text-anchor="middle" x="451" y="-531.8" font-family="Times,serif" font-size="14.00" fill="#000000">errors</text>
-</a>
-</g>
+<g id="clust2" class="cluster">
+<title>cluster_1</title>
+<polygon fill="none" stroke="#0000ff" points="260,-516 260,-653 643,-653 643,-516 260,-516"/>
+<text text-anchor="middle" x="451.5" y="-637.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="node2" class="node open">
+<g id="node1" class="node open">
 <title>ZcashFoundation/zebra#3050</title>
-<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">
+<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">
 <polygon fill="#c2e0c6" stroke="#000000" points="903,-225.5 671,-225.5 671,-172.5 903,-172.5 903,-225.5"/>
 <text text-anchor="middle" x="787" y="-210.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#3050</text>
 <text text-anchor="middle" x="787" y="-195.3" font-family="Times,serif" font-size="14.00" fill="#000000">Tag Zebra 1.0.0&#45;rc.0</text>
@@ -56,12 +42,6 @@
 </a>
 </g>
 </g>
-<!-- ZcashFoundation/zebra#2654&#45;&gt;ZcashFoundation/zebra#3050 -->
-<g id="edge6" class="edge">
-<title>ZcashFoundation/zebra#2654&#45;&gt;ZcashFoundation/zebra#3050</title>
-<path fill="none" stroke="#000000" d="M567.09,-557.55C594.92,-548.93 622.48,-535.6 643,-515 673.76,-484.12 654.61,-461.39 671,-421 698.78,-352.53 740.79,-277.15 765.9,-234.2"/>
-<polygon fill="#000000" stroke="#000000" points="768.9402,-235.9347 770.99,-225.54 762.9054,-232.3876 768.9402,-235.9347"/>
-</g>
 <!-- ZcashFoundation/zebra#4967 -->
 <g id="node5" class="node open">
 <title>ZcashFoundation/zebra#4967</title>
@@ -117,9 +97,9 @@
 <polygon fill="#000000" stroke="#000000" points="956.1988,-152.7762 964.8,-146.59 954.2183,-146.0622 956.1988,-152.7762"/>
 </g>
 <!-- ZcashFoundation/zebra#4937 -->
-<g id="node3" class="node open">
+<g id="node2" class="node open">
 <title>ZcashFoundation/zebra#4937</title>
-<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">
+<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">
 <polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="567,-226 335,-226 335,-158 567,-158 567,-226"/>
 <text text-anchor="middle" x="451" y="-210.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#4937</text>
 <text text-anchor="middle" x="451" y="-195.8" font-family="Times,serif" font-size="14.00" fill="#000000">Epic: Commit blocks to</text>
@@ -152,9 +132,9 @@
 <polygon fill="#000000" stroke="#000000" points="677.011,-73.3323 682.93,-64.545 672.8231,-67.7232 677.011,-73.3323"/>
 </g>
 <!-- ZcashFoundation/zebra#5214 -->
-<g id="node4" class="node open">
+<g id="node3" 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_node3"><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="567,-139.5 335,-139.5 335,-86.5 567,-86.5 567,-139.5"/>
 <text text-anchor="middle" x="451" y="-124.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#5214</text>
 <text text-anchor="middle" x="451" y="-109.3" font-family="Times,serif" font-size="14.00" fill="#000000">Task: Make a list of</text>
@@ -162,6 +142,26 @@
 </a>
 </g>
 </g>
+<!-- ZcashFoundation/zebra#2654 -->
+<g id="node4" class="node open">
+<title>ZcashFoundation/zebra#2654</title>
+<g id="a_node4"><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="567,-622 335,-622 335,-524 567,-524 567,-622"/>
+<text text-anchor="middle" x="451" y="-606.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2654</text>
+<text text-anchor="middle" x="451" y="-591.8" font-family="Times,serif" font-size="14.00" fill="#000000">Test if checkpoint</text>
+<text text-anchor="middle" x="451" y="-576.8" font-family="Times,serif" font-size="14.00" fill="#000000">verifier and state</text>
+<text text-anchor="middle" x="451" y="-561.8" font-family="Times,serif" font-size="14.00" fill="#000000">service are correctly</text>
+<text text-anchor="middle" x="451" y="-546.8" font-family="Times,serif" font-size="14.00" fill="#000000">reset on block commit</text>
+<text text-anchor="middle" x="451" y="-531.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="edge6" class="edge">
+<title>ZcashFoundation/zebra#2654&#45;&gt;ZcashFoundation/zebra#3050</title>
+<path fill="none" stroke="#000000" d="M567.09,-557.55C594.92,-548.93 622.48,-535.6 643,-515 673.76,-484.12 654.61,-461.39 671,-421 698.78,-352.53 740.79,-277.15 765.9,-234.2"/>
+<polygon fill="#000000" stroke="#000000" points="768.9402,-235.9347 770.99,-225.54 762.9054,-232.3876 768.9402,-235.9347"/>
+</g>
 <!-- ZcashFoundation/zebra#2375 -->
 <g id="node9" class="node open">
 <title>ZcashFoundation/zebra#2375</title>
diff --git a/zcash-zf-dag.svg b/zcash-zf-dag.svg
index 21b0dc8e..90f59860 100644
--- a/zcash-zf-dag.svg
+++ b/zcash-zf-dag.svg
@@ -10,33 +10,19 @@
 <g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 2064.5)">
 <polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-2064.5 1175,-2064.5 1175,4 -4,4"/>
 <g id="clust1" class="cluster">
-<title>cluster_1</title>
-<polygon fill="none" stroke="#0000ff" points="260,-516 260,-653 643,-653 643,-516 260,-516"/>
-<text text-anchor="middle" x="451.5" y="-637.8" font-family="Times,serif" font-size="14.00" fill="#000000">Epic: Commit blocks to state using a separate task</text>
-</g>
-<g id="clust2" class="cluster">
 <title>cluster_0</title>
 <polygon fill="none" stroke="#0000ff" points="327,-78 327,-257 911,-257 911,-78 327,-78"/>
 <text text-anchor="middle" x="619" y="-241.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="567,-622 335,-622 335,-524 567,-524 567,-622"/>
-<text text-anchor="middle" x="451" y="-606.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2654</text>
-<text text-anchor="middle" x="451" y="-591.8" font-family="Times,serif" font-size="14.00" fill="#000000">Test if checkpoint</text>
-<text text-anchor="middle" x="451" y="-576.8" font-family="Times,serif" font-size="14.00" fill="#000000">verifier and state</text>
-<text text-anchor="middle" x="451" y="-561.8" font-family="Times,serif" font-size="14.00" fill="#000000">service are correctly</text>
-<text text-anchor="middle" x="451" y="-546.8" font-family="Times,serif" font-size="14.00" fill="#000000">reset on block commit</text>
-<text text-anchor="middle" x="451" y="-531.8" font-family="Times,serif" font-size="14.00" fill="#000000">errors</text>
-</a>
-</g>
+<g id="clust2" class="cluster">
+<title>cluster_1</title>
+<polygon fill="none" stroke="#0000ff" points="260,-516 260,-653 643,-653 643,-516 260,-516"/>
+<text text-anchor="middle" x="451.5" y="-637.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="node2" class="node open">
+<g id="node1" class="node open">
 <title>ZcashFoundation/zebra#3050</title>
-<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">
+<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">
 <polygon fill="#c2e0c6" stroke="#000000" points="903,-225.5 671,-225.5 671,-172.5 903,-172.5 903,-225.5"/>
 <text text-anchor="middle" x="787" y="-210.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#3050</text>
 <text text-anchor="middle" x="787" y="-195.3" font-family="Times,serif" font-size="14.00" fill="#000000">Tag Zebra 1.0.0&#45;rc.0</text>
@@ -44,12 +30,6 @@
 </a>
 </g>
 </g>
-<!-- ZcashFoundation/zebra#2654&#45;&gt;ZcashFoundation/zebra#3050 -->
-<g id="edge6" class="edge">
-<title>ZcashFoundation/zebra#2654&#45;&gt;ZcashFoundation/zebra#3050</title>
-<path fill="none" stroke="#000000" d="M567.09,-557.55C594.92,-548.93 622.48,-535.6 643,-515 673.76,-484.12 654.61,-461.39 671,-421 698.78,-352.53 740.79,-277.15 765.9,-234.2"/>
-<polygon fill="#000000" stroke="#000000" points="768.9402,-235.9347 770.99,-225.54 762.9054,-232.3876 768.9402,-235.9347"/>
-</g>
 <!-- ZcashFoundation/zebra#4967 -->
 <g id="node5" class="node open">
 <title>ZcashFoundation/zebra#4967</title>
@@ -105,9 +85,9 @@
 <polygon fill="#000000" stroke="#000000" points="956.1988,-152.7762 964.8,-146.59 954.2183,-146.0622 956.1988,-152.7762"/>
 </g>
 <!-- ZcashFoundation/zebra#4937 -->
-<g id="node3" class="node open">
+<g id="node2" class="node open">
 <title>ZcashFoundation/zebra#4937</title>
-<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">
+<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">
 <polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="567,-226 335,-226 335,-158 567,-158 567,-226"/>
 <text text-anchor="middle" x="451" y="-210.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#4937</text>
 <text text-anchor="middle" x="451" y="-195.8" font-family="Times,serif" font-size="14.00" fill="#000000">Epic: Commit blocks to</text>
@@ -140,9 +120,9 @@
 <polygon fill="#000000" stroke="#000000" points="677.011,-73.3323 682.93,-64.545 672.8231,-67.7232 677.011,-73.3323"/>
 </g>
 <!-- ZcashFoundation/zebra#5214 -->
-<g id="node4" class="node open">
+<g id="node3" 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_node3"><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="567,-139.5 335,-139.5 335,-86.5 567,-86.5 567,-139.5"/>
 <text text-anchor="middle" x="451" y="-124.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#5214</text>
 <text text-anchor="middle" x="451" y="-109.3" font-family="Times,serif" font-size="14.00" fill="#000000">Task: Make a list of</text>
@@ -150,6 +130,26 @@
 </a>
 </g>
 </g>
+<!-- ZcashFoundation/zebra#2654 -->
+<g id="node4" class="node open">
+<title>ZcashFoundation/zebra#2654</title>
+<g id="a_node4"><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="567,-622 335,-622 335,-524 567,-524 567,-622"/>
+<text text-anchor="middle" x="451" y="-606.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2654</text>
+<text text-anchor="middle" x="451" y="-591.8" font-family="Times,serif" font-size="14.00" fill="#000000">Test if checkpoint</text>
+<text text-anchor="middle" x="451" y="-576.8" font-family="Times,serif" font-size="14.00" fill="#000000">verifier and state</text>
+<text text-anchor="middle" x="451" y="-561.8" font-family="Times,serif" font-size="14.00" fill="#000000">service are correctly</text>
+<text text-anchor="middle" x="451" y="-546.8" font-family="Times,serif" font-size="14.00" fill="#000000">reset on block commit</text>
+<text text-anchor="middle" x="451" y="-531.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="edge6" class="edge">
+<title>ZcashFoundation/zebra#2654&#45;&gt;ZcashFoundation/zebra#3050</title>
+<path fill="none" stroke="#000000" d="M567.09,-557.55C594.92,-548.93 622.48,-535.6 643,-515 673.76,-484.12 654.61,-461.39 671,-421 698.78,-352.53 740.79,-277.15 765.9,-234.2"/>
+<polygon fill="#000000" stroke="#000000" points="768.9402,-235.9347 770.99,-225.54 762.9054,-232.3876 768.9402,-235.9347"/>
+</g>
 <!-- ZcashFoundation/zebra#2375 -->
 <g id="node9" class="node open">
 <title>ZcashFoundation/zebra#2375</title>