diff --git a/zcash-zf-dag.html b/zcash-zf-dag.html
index 5308a5c6..5b92ca21 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 2185.5)">
 <polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-2185.5 1183,-2185.5 1183,4 -4,4"/>
 <g id="clust1" 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>
-<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 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="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="643,-423.5 411,-423.5 411,-370.5 643,-370.5 643,-423.5"/>
 <text text-anchor="middle" x="527" y="-408.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#3050</text>
 <text text-anchor="middle" x="527" y="-393.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="edge2" class="edge">
-<title>ZcashFoundation/zebra#2654&#45;&gt;ZcashFoundation/zebra#3050</title>
-<path fill="none" stroke="#000000" d="M307.03,-489.65C332.28,-481.48 358.69,-472.39 383,-463 409.95,-452.59 439.04,-439.6 463.97,-427.91"/>
-<polygon fill="#000000" stroke="#000000" points="465.7617,-430.9346 473.31,-423.5 462.7729,-424.6047 465.7617,-430.9346"/>
-</g>
 <!-- ZcashFoundation/zebra#4967 -->
 <g id="node6" class="node open">
 <title>ZcashFoundation/zebra#4967</title>
@@ -137,9 +117,9 @@
 <polygon fill="#000000" stroke="#000000" points="669.3652,-379.286 678.74,-374.35 668.3333,-372.3625 669.3652,-379.286"/>
 </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="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>
@@ -172,9 +152,9 @@
 <polygon fill="#000000" stroke="#000000" points="411.727,-195.5341 415.41,-185.6 406.3359,-191.0691 411.727,-195.5341"/>
 </g>
 <!-- ZcashFoundation/zebra#5125 -->
-<g id="node4" class="node open">
+<g id="node3" class="node open">
 <title>ZcashFoundation/zebra#5125</title>
-<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">
+<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">
 <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>
@@ -184,9 +164,9 @@
 </g>
 </g>
 <!-- ZcashFoundation/zebra#5214 -->
-<g id="node5" class="node open">
+<g id="node4" class="node open">
 <title>ZcashFoundation/zebra#5214</title>
-<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">
+<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">
 <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>
@@ -194,6 +174,26 @@
 </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.03,-489.65C332.28,-481.48 358.69,-472.39 383,-463 409.95,-452.59 439.04,-439.6 463.97,-427.91"/>
+<polygon fill="#000000" stroke="#000000" points="465.7617,-430.9346 473.31,-423.5 462.7729,-424.6047 465.7617,-430.9346"/>
+</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 bf493deb..a2c91100 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 2185.5)">
 <polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-2185.5 1183,-2185.5 1183,4 -4,4"/>
 <g id="clust1" 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>
-<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 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="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="643,-423.5 411,-423.5 411,-370.5 643,-370.5 643,-423.5"/>
 <text text-anchor="middle" x="527" y="-408.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#3050</text>
 <text text-anchor="middle" x="527" y="-393.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="edge2" class="edge">
-<title>ZcashFoundation/zebra#2654&#45;&gt;ZcashFoundation/zebra#3050</title>
-<path fill="none" stroke="#000000" d="M307.03,-489.65C332.28,-481.48 358.69,-472.39 383,-463 409.95,-452.59 439.04,-439.6 463.97,-427.91"/>
-<polygon fill="#000000" stroke="#000000" points="465.7617,-430.9346 473.31,-423.5 462.7729,-424.6047 465.7617,-430.9346"/>
-</g>
 <!-- ZcashFoundation/zebra#4967 -->
 <g id="node6" class="node open">
 <title>ZcashFoundation/zebra#4967</title>
@@ -125,9 +105,9 @@
 <polygon fill="#000000" stroke="#000000" points="669.3652,-379.286 678.74,-374.35 668.3333,-372.3625 669.3652,-379.286"/>
 </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="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>
@@ -160,9 +140,9 @@
 <polygon fill="#000000" stroke="#000000" points="411.727,-195.5341 415.41,-185.6 406.3359,-191.0691 411.727,-195.5341"/>
 </g>
 <!-- ZcashFoundation/zebra#5125 -->
-<g id="node4" class="node open">
+<g id="node3" class="node open">
 <title>ZcashFoundation/zebra#5125</title>
-<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">
+<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">
 <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>
@@ -172,9 +152,9 @@
 </g>
 </g>
 <!-- ZcashFoundation/zebra#5214 -->
-<g id="node5" class="node open">
+<g id="node4" class="node open">
 <title>ZcashFoundation/zebra#5214</title>
-<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">
+<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">
 <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>
@@ -182,6 +162,26 @@
 </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.03,-489.65C332.28,-481.48 358.69,-472.39 383,-463 409.95,-452.59 439.04,-439.6 463.97,-427.91"/>
+<polygon fill="#000000" stroke="#000000" points="465.7617,-430.9346 473.31,-423.5 462.7729,-424.6047 465.7617,-430.9346"/>
+</g>
 <!-- ZcashFoundation/zebra#5257 -->
 <g id="node11" class="node open">
 <title>ZcashFoundation/zebra#5257</title>