diff --git a/zcash-zf-dag.html b/zcash-zf-dag.html
index 345e079a..65ad63c3 100644
--- a/zcash-zf-dag.html
+++ b/zcash-zf-dag.html
@@ -22,19 +22,120 @@
 <g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 2467)">
 <polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-2467 1048,-2467 1048,4 -4,4"/>
 <g id="clust1" class="cluster">
-<title>cluster_0</title>
-<polygon fill="none" stroke="#0000ff" points="0,-132.5 0,-397.5 516,-397.5 516,-132.5 0,-132.5"/>
-<text text-anchor="middle" x="258" y="-382.3" font-family="Times,serif" font-size="14.00" fill="#000000">Epic: Zebra Release Candidate</text>
-</g>
-<g id="clust2" class="cluster">
 <title>cluster_1</title>
 <polygon fill="none" stroke="#0000ff" points="0,-468.5 0,-835.5 784,-835.5 784,-468.5 0,-468.5"/>
 <text text-anchor="middle" x="392" y="-820.3" font-family="Times,serif" font-size="14.00" fill="#000000">Epic: Support for RPC calls used by mining pools</text>
 </g>
-<!-- ZcashFoundation/zebra#5214 -->
+<g id="clust2" class="cluster">
+<title>cluster_0</title>
+<polygon fill="none" stroke="#0000ff" points="0,-132.5 0,-397.5 516,-397.5 516,-132.5 0,-132.5"/>
+<text text-anchor="middle" x="258" y="-382.3" font-family="Times,serif" font-size="14.00" fill="#000000">Epic: Zebra Release Candidate</text>
+</g>
+<!-- ZcashFoundation/zebra#5335 -->
 <g id="node1" class="node open">
+<title>ZcashFoundation/zebra#5335</title>
+<g id="a_node1"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/5335" xlink:title="ZcashFoundation/zebra#5335&#10;Evict transactions from&#10;the mempool based on the&#10;ZIP&#45;317 fee rules" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="508,-804.5 276,-804.5 276,-736.5 508,-736.5 508,-804.5"/>
+<text text-anchor="middle" x="392" y="-789.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#5335</text>
+<text text-anchor="middle" x="392" y="-774.3" font-family="Times,serif" font-size="14.00" fill="#000000">Evict transactions from</text>
+<text text-anchor="middle" x="392" y="-759.3" font-family="Times,serif" font-size="14.00" fill="#000000">the mempool based on the</text>
+<text text-anchor="middle" x="392" y="-744.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZIP&#45;317 fee rules</text>
+</a>
+</g>
+</g>
+<!-- ZcashFoundation/zebra#5336 -->
+<g id="node2" class="node open">
+<title>ZcashFoundation/zebra#5336</title>
+<g id="a_node2"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/5336" xlink:title="ZcashFoundation/zebra#5336&#10;Relay mempool&#10;transactions based on the&#10;ZIP&#45;317 fee rules" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" points="776,-764.5 544,-764.5 544,-696.5 776,-696.5 776,-764.5"/>
+<text text-anchor="middle" x="660" y="-749.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#5336</text>
+<text text-anchor="middle" x="660" y="-734.3" font-family="Times,serif" font-size="14.00" fill="#000000">Relay mempool</text>
+<text text-anchor="middle" x="660" y="-719.3" font-family="Times,serif" font-size="14.00" fill="#000000">transactions based on the</text>
+<text text-anchor="middle" x="660" y="-704.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZIP&#45;317 fee rules</text>
+</a>
+</g>
+</g>
+<!-- ZcashFoundation/zebra#5335&#45;&gt;ZcashFoundation/zebra#5336 -->
+<g id="edge1" class="edge">
+<title>ZcashFoundation/zebra#5335&#45;&gt;ZcashFoundation/zebra#5336</title>
+<path fill="none" stroke="#000000" d="M508.38,-753.13C516.81,-751.87 525.33,-750.6 533.81,-749.33"/>
+<polygon fill="#000000" stroke="#000000" points="534.3652,-752.786 543.74,-747.85 533.3333,-745.8625 534.3652,-752.786"/>
+</g>
+<!-- ZcashFoundation/zebra#5235 -->
+<g id="node3" class="node open">
+<title>ZcashFoundation/zebra#5235</title>
+<g id="a_node3"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/5235" xlink:title="ZcashFoundation/zebra#5235&#10;Tracking: Implement&#10;getblocktemplate RPC" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" points="508,-718 276,-718 276,-665 508,-665 508,-718"/>
+<text text-anchor="middle" x="392" y="-702.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#5235</text>
+<text text-anchor="middle" x="392" y="-687.8" font-family="Times,serif" font-size="14.00" fill="#000000">Tracking: Implement</text>
+<text text-anchor="middle" x="392" y="-672.8" font-family="Times,serif" font-size="14.00" fill="#000000">getblocktemplate RPC</text>
+</a>
+</g>
+</g>
+<!-- ZcashFoundation/zebra#5235&#45;&gt;ZcashFoundation/zebra#5336 -->
+<g id="edge2" class="edge">
+<title>ZcashFoundation/zebra#5235&#45;&gt;ZcashFoundation/zebra#5336</title>
+<path fill="none" stroke="#000000" d="M508.38,-708.44C516.81,-709.66 525.33,-710.9 533.81,-712.14"/>
+<polygon fill="#000000" stroke="#000000" points="533.3412,-715.6085 543.74,-713.58 534.3458,-708.681 533.3412,-715.6085"/>
+</g>
+<!-- ZcashFoundation/zebra#5376 -->
+<g id="node4" class="node open">
+<title>ZcashFoundation/zebra#5376</title>
+<g id="a_node4"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/5376" xlink:title="ZcashFoundation/zebra#5376&#10;Do contextual validation&#10;on mempool transactions&#10;using the state best tip" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="240,-804.5 8,-804.5 8,-736.5 240,-736.5 240,-804.5"/>
+<text text-anchor="middle" x="124" y="-789.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#5376</text>
+<text text-anchor="middle" x="124" y="-774.3" font-family="Times,serif" font-size="14.00" fill="#000000">Do contextual validation</text>
+<text text-anchor="middle" x="124" y="-759.3" font-family="Times,serif" font-size="14.00" fill="#000000">on mempool transactions</text>
+<text text-anchor="middle" x="124" y="-744.3" font-family="Times,serif" font-size="14.00" fill="#000000">using the state best tip</text>
+</a>
+</g>
+</g>
+<!-- ZcashFoundation/zebra#5376&#45;&gt;ZcashFoundation/zebra#5235 -->
+<g id="edge3" class="edge">
+<title>ZcashFoundation/zebra#5376&#45;&gt;ZcashFoundation/zebra#5235</title>
+<path fill="none" stroke="#000000" d="M239.6,-736.42C257.01,-731.29 274.84,-726.04 291.89,-721.01"/>
+<polygon fill="#000000" stroke="#000000" points="293.2277,-724.2647 301.83,-718.08 291.2484,-717.5503 293.2277,-724.2647"/>
+</g>
+<!-- ZcashFoundation/zebra#5236 -->
+<g id="node5" class="node open">
+<title>ZcashFoundation/zebra#5236</title>
+<g id="a_node5"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/5236" xlink:title="ZcashFoundation/zebra#5236&#10;Add support for&#10;`submitblock` RPC call" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="240,-718 8,-718 8,-665 240,-665 240,-718"/>
+<text text-anchor="middle" x="124" y="-702.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#5236</text>
+<text text-anchor="middle" x="124" y="-687.8" font-family="Times,serif" font-size="14.00" fill="#000000">Add support for</text>
+<text text-anchor="middle" x="124" y="-672.8" font-family="Times,serif" font-size="14.00" fill="#000000">`submitblock` RPC call</text>
+</a>
+</g>
+</g>
+<!-- ZcashFoundation/zebra#5302 -->
+<g id="node6" class="node open">
+<title>ZcashFoundation/zebra#5302</title>
+<g id="a_node6"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/5302" xlink:title="ZcashFoundation/zebra#5302&#10;Add support for&#10;`getblocksubsidy` RPC&#10;call" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="240,-646.5 8,-646.5 8,-578.5 240,-578.5 240,-646.5"/>
+<text text-anchor="middle" x="124" y="-631.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#5302</text>
+<text text-anchor="middle" x="124" y="-616.3" font-family="Times,serif" font-size="14.00" fill="#000000">Add support for</text>
+<text text-anchor="middle" x="124" y="-601.3" font-family="Times,serif" font-size="14.00" fill="#000000">`getblocksubsidy` RPC</text>
+<text text-anchor="middle" x="124" y="-586.3" font-family="Times,serif" font-size="14.00" fill="#000000">call</text>
+</a>
+</g>
+</g>
+<!-- ZcashFoundation/zebra#5386 -->
+<g id="node7" class="node open">
+<title>ZcashFoundation/zebra#5386</title>
+<g id="a_node7"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/5386" xlink:title="ZcashFoundation/zebra#5386&#10;Use BestChainUtxo rather&#10;than AwaitUtxo in the&#10;mempool transaction&#10;validator" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="240,-560 8,-560 8,-477 240,-477 240,-560"/>
+<text text-anchor="middle" x="124" y="-544.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#5386</text>
+<text text-anchor="middle" x="124" y="-529.8" font-family="Times,serif" font-size="14.00" fill="#000000">Use BestChainUtxo rather</text>
+<text text-anchor="middle" x="124" y="-514.8" font-family="Times,serif" font-size="14.00" fill="#000000">than AwaitUtxo in the</text>
+<text text-anchor="middle" x="124" y="-499.8" font-family="Times,serif" font-size="14.00" fill="#000000">mempool transaction</text>
+<text text-anchor="middle" x="124" y="-484.8" font-family="Times,serif" font-size="14.00" fill="#000000">validator</text>
+</a>
+</g>
+</g>
+<!-- ZcashFoundation/zebra#5214 -->
+<g id="node8" class="node open">
 <title>ZcashFoundation/zebra#5214</title>
-<g id="a_node1"><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_node8"><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="240,-366 8,-366 8,-313 240,-313 240,-366"/>
 <text text-anchor="middle" x="124" y="-350.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#5214</text>
 <text text-anchor="middle" x="124" y="-335.8" font-family="Times,serif" font-size="14.00" fill="#000000">Task: Make a list of</text>
@@ -43,9 +144,9 @@
 </g>
 </g>
 <!-- ZcashFoundation/zebra#5423 -->
-<g id="node2" class="node open">
+<g id="node9" class="node open">
 <title>ZcashFoundation/zebra#5423</title>
-<g id="a_node2"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/5423" xlink:title="ZcashFoundation/zebra#5423&#10;Tag Zebra 1.0.0&#45;rc.1" target="_blank">
+<g id="a_node9"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/5423" xlink:title="ZcashFoundation/zebra#5423&#10;Tag Zebra 1.0.0&#45;rc.1" target="_blank">
 <polygon fill="#c2e0c6" stroke="#000000" points="508,-272.5 276,-272.5 276,-234.5 508,-234.5 508,-272.5"/>
 <text text-anchor="middle" x="392" y="-257.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#5423</text>
 <text text-anchor="middle" x="392" y="-242.3" font-family="Times,serif" font-size="14.00" fill="#000000">Tag Zebra 1.0.0&#45;rc.1</text>
@@ -53,15 +154,15 @@
 </g>
 </g>
 <!-- ZcashFoundation/zebra#5214&#45;&gt;ZcashFoundation/zebra#5423 -->
-<g id="edge1" class="edge">
+<g id="edge4" class="edge">
 <title>ZcashFoundation/zebra#5214&#45;&gt;ZcashFoundation/zebra#5423</title>
 <path fill="none" stroke="#000000" d="M213.07,-312.93C222.18,-310.12 231.28,-307.28 240,-304.5 268.58,-295.4 300.03,-284.92 326.88,-275.84"/>
 <polygon fill="#000000" stroke="#000000" points="328.1963,-279.0894 336.54,-272.56 325.9456,-272.4611 328.1963,-279.0894"/>
 </g>
 <!-- ZcashFoundation/zebra#5445 -->
-<g id="node3" class="node open">
+<g id="node10" class="node open">
 <title>ZcashFoundation/zebra#5445</title>
-<g id="a_node3"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/5445" xlink:title="ZcashFoundation/zebra#5445&#10;Bump `zcash_proofs` to&#10;0.8.0" target="_blank">
+<g id="a_node10"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/5445" xlink:title="ZcashFoundation/zebra#5445&#10;Bump `zcash_proofs` to&#10;0.8.0" target="_blank">
 <polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="240,-194 8,-194 8,-141 240,-141 240,-194"/>
 <text text-anchor="middle" x="124" y="-178.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#5445</text>
 <text text-anchor="middle" x="124" y="-163.8" font-family="Times,serif" font-size="14.00" fill="#000000">Bump `zcash_proofs` to</text>
@@ -70,7 +171,7 @@
 </g>
 </g>
 <!-- ZcashFoundation/zebra#5445&#45;&gt;ZcashFoundation/zebra#5423 -->
-<g id="edge2" class="edge">
+<g id="edge5" class="edge">
 <title>ZcashFoundation/zebra#5445&#45;&gt;ZcashFoundation/zebra#5423</title>
 <path fill="none" stroke="#000000" d="M210.2,-194.07C220.26,-197.23 230.36,-200.42 240,-203.5 267.93,-212.43 298.66,-222.49 325.14,-231.24"/>
 <polygon fill="#000000" stroke="#000000" points="324.0967,-234.5814 334.69,-234.4 326.2957,-227.9357 324.0967,-234.5814"/>
@@ -110,9 +211,9 @@
 <polygon fill="#000000" stroke="#000000" points="287.5923,-60.0579 295.51,-53.018 284.9303,-53.5838 287.5923,-60.0579"/>
 </g>
 <!-- ZcashFoundation/zebra#5446 -->
-<g id="node4" class="node open">
+<g id="node11" class="node open">
 <title>ZcashFoundation/zebra#5446</title>
-<g id="a_node4"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/5446" xlink:title="ZcashFoundation/zebra#5446&#10;Audit: remove zebra&#45;chain&#10;cryptographic&#10;implementations that are&#10;unused" target="_blank">
+<g id="a_node11"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/5446" xlink:title="ZcashFoundation/zebra#5446&#10;Audit: remove zebra&#45;chain&#10;cryptographic&#10;implementations that are&#10;unused" target="_blank">
 <polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="240,-295 8,-295 8,-212 240,-212 240,-295"/>
 <text text-anchor="middle" x="124" y="-279.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#5446</text>
 <text text-anchor="middle" x="124" y="-264.8" font-family="Times,serif" font-size="14.00" fill="#000000">Audit: remove zebra&#45;chain</text>
@@ -123,112 +224,11 @@
 </g>
 </g>
 <!-- ZcashFoundation/zebra#5446&#45;&gt;ZcashFoundation/zebra#5423 -->
-<g id="edge3" class="edge">
+<g id="edge6" class="edge">
 <title>ZcashFoundation/zebra#5446&#45;&gt;ZcashFoundation/zebra#5423</title>
 <path fill="none" stroke="#000000" d="M240.38,-253.5C248.71,-253.5 257.14,-253.5 265.53,-253.5"/>
 <polygon fill="#000000" stroke="#000000" points="265.74,-257.0001 275.74,-253.5 265.74,-250.0001 265.74,-257.0001"/>
 </g>
-<!-- ZcashFoundation/zebra#5335 -->
-<g id="node5" class="node open">
-<title>ZcashFoundation/zebra#5335</title>
-<g id="a_node5"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/5335" xlink:title="ZcashFoundation/zebra#5335&#10;Evict transactions from&#10;the mempool based on the&#10;ZIP&#45;317 fee rules" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="508,-804.5 276,-804.5 276,-736.5 508,-736.5 508,-804.5"/>
-<text text-anchor="middle" x="392" y="-789.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#5335</text>
-<text text-anchor="middle" x="392" y="-774.3" font-family="Times,serif" font-size="14.00" fill="#000000">Evict transactions from</text>
-<text text-anchor="middle" x="392" y="-759.3" font-family="Times,serif" font-size="14.00" fill="#000000">the mempool based on the</text>
-<text text-anchor="middle" x="392" y="-744.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZIP&#45;317 fee rules</text>
-</a>
-</g>
-</g>
-<!-- ZcashFoundation/zebra#5336 -->
-<g id="node6" class="node open">
-<title>ZcashFoundation/zebra#5336</title>
-<g id="a_node6"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/5336" xlink:title="ZcashFoundation/zebra#5336&#10;Relay mempool&#10;transactions based on the&#10;ZIP&#45;317 fee rules" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" points="776,-764.5 544,-764.5 544,-696.5 776,-696.5 776,-764.5"/>
-<text text-anchor="middle" x="660" y="-749.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#5336</text>
-<text text-anchor="middle" x="660" y="-734.3" font-family="Times,serif" font-size="14.00" fill="#000000">Relay mempool</text>
-<text text-anchor="middle" x="660" y="-719.3" font-family="Times,serif" font-size="14.00" fill="#000000">transactions based on the</text>
-<text text-anchor="middle" x="660" y="-704.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZIP&#45;317 fee rules</text>
-</a>
-</g>
-</g>
-<!-- ZcashFoundation/zebra#5335&#45;&gt;ZcashFoundation/zebra#5336 -->
-<g id="edge4" class="edge">
-<title>ZcashFoundation/zebra#5335&#45;&gt;ZcashFoundation/zebra#5336</title>
-<path fill="none" stroke="#000000" d="M508.38,-753.13C516.81,-751.87 525.33,-750.6 533.81,-749.33"/>
-<polygon fill="#000000" stroke="#000000" points="534.3652,-752.786 543.74,-747.85 533.3333,-745.8625 534.3652,-752.786"/>
-</g>
-<!-- ZcashFoundation/zebra#5235 -->
-<g id="node7" class="node open">
-<title>ZcashFoundation/zebra#5235</title>
-<g id="a_node7"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/5235" xlink:title="ZcashFoundation/zebra#5235&#10;Tracking: Implement&#10;getblocktemplate RPC" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" points="508,-718 276,-718 276,-665 508,-665 508,-718"/>
-<text text-anchor="middle" x="392" y="-702.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#5235</text>
-<text text-anchor="middle" x="392" y="-687.8" font-family="Times,serif" font-size="14.00" fill="#000000">Tracking: Implement</text>
-<text text-anchor="middle" x="392" y="-672.8" font-family="Times,serif" font-size="14.00" fill="#000000">getblocktemplate RPC</text>
-</a>
-</g>
-</g>
-<!-- ZcashFoundation/zebra#5235&#45;&gt;ZcashFoundation/zebra#5336 -->
-<g id="edge5" class="edge">
-<title>ZcashFoundation/zebra#5235&#45;&gt;ZcashFoundation/zebra#5336</title>
-<path fill="none" stroke="#000000" d="M508.38,-708.44C516.81,-709.66 525.33,-710.9 533.81,-712.14"/>
-<polygon fill="#000000" stroke="#000000" points="533.3412,-715.6085 543.74,-713.58 534.3458,-708.681 533.3412,-715.6085"/>
-</g>
-<!-- ZcashFoundation/zebra#5376 -->
-<g id="node8" class="node open">
-<title>ZcashFoundation/zebra#5376</title>
-<g id="a_node8"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/5376" xlink:title="ZcashFoundation/zebra#5376&#10;Do contextual validation&#10;on mempool transactions&#10;using the state best tip" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="240,-804.5 8,-804.5 8,-736.5 240,-736.5 240,-804.5"/>
-<text text-anchor="middle" x="124" y="-789.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#5376</text>
-<text text-anchor="middle" x="124" y="-774.3" font-family="Times,serif" font-size="14.00" fill="#000000">Do contextual validation</text>
-<text text-anchor="middle" x="124" y="-759.3" font-family="Times,serif" font-size="14.00" fill="#000000">on mempool transactions</text>
-<text text-anchor="middle" x="124" y="-744.3" font-family="Times,serif" font-size="14.00" fill="#000000">using the state best tip</text>
-</a>
-</g>
-</g>
-<!-- ZcashFoundation/zebra#5376&#45;&gt;ZcashFoundation/zebra#5235 -->
-<g id="edge6" class="edge">
-<title>ZcashFoundation/zebra#5376&#45;&gt;ZcashFoundation/zebra#5235</title>
-<path fill="none" stroke="#000000" d="M239.6,-736.42C257.01,-731.29 274.84,-726.04 291.89,-721.01"/>
-<polygon fill="#000000" stroke="#000000" points="293.2277,-724.2647 301.83,-718.08 291.2484,-717.5503 293.2277,-724.2647"/>
-</g>
-<!-- ZcashFoundation/zebra#5236 -->
-<g id="node9" class="node open">
-<title>ZcashFoundation/zebra#5236</title>
-<g id="a_node9"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/5236" xlink:title="ZcashFoundation/zebra#5236&#10;Add support for&#10;`submitblock` RPC call" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="240,-718 8,-718 8,-665 240,-665 240,-718"/>
-<text text-anchor="middle" x="124" y="-702.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#5236</text>
-<text text-anchor="middle" x="124" y="-687.8" font-family="Times,serif" font-size="14.00" fill="#000000">Add support for</text>
-<text text-anchor="middle" x="124" y="-672.8" font-family="Times,serif" font-size="14.00" fill="#000000">`submitblock` RPC call</text>
-</a>
-</g>
-</g>
-<!-- ZcashFoundation/zebra#5302 -->
-<g id="node10" class="node open">
-<title>ZcashFoundation/zebra#5302</title>
-<g id="a_node10"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/5302" xlink:title="ZcashFoundation/zebra#5302&#10;Add support for&#10;`getblocksubsidy` RPC&#10;call" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="240,-646.5 8,-646.5 8,-578.5 240,-578.5 240,-646.5"/>
-<text text-anchor="middle" x="124" y="-631.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#5302</text>
-<text text-anchor="middle" x="124" y="-616.3" font-family="Times,serif" font-size="14.00" fill="#000000">Add support for</text>
-<text text-anchor="middle" x="124" y="-601.3" font-family="Times,serif" font-size="14.00" fill="#000000">`getblocksubsidy` RPC</text>
-<text text-anchor="middle" x="124" y="-586.3" font-family="Times,serif" font-size="14.00" fill="#000000">call</text>
-</a>
-</g>
-</g>
-<!-- ZcashFoundation/zebra#5386 -->
-<g id="node11" class="node open">
-<title>ZcashFoundation/zebra#5386</title>
-<g id="a_node11"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/5386" xlink:title="ZcashFoundation/zebra#5386&#10;Use BestChainUtxo rather&#10;than AwaitUtxo in the&#10;mempool transaction&#10;validator" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="240,-560 8,-560 8,-477 240,-477 240,-560"/>
-<text text-anchor="middle" x="124" y="-544.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#5386</text>
-<text text-anchor="middle" x="124" y="-529.8" font-family="Times,serif" font-size="14.00" fill="#000000">Use BestChainUtxo rather</text>
-<text text-anchor="middle" x="124" y="-514.8" font-family="Times,serif" font-size="14.00" fill="#000000">than AwaitUtxo in the</text>
-<text text-anchor="middle" x="124" y="-499.8" font-family="Times,serif" font-size="14.00" fill="#000000">mempool transaction</text>
-<text text-anchor="middle" x="124" y="-484.8" font-family="Times,serif" font-size="14.00" fill="#000000">validator</text>
-</a>
-</g>
-</g>
 <!-- ZcashFoundation/zebra#3831&#45;&gt;ZcashFoundation/zebra#5423 -->
 <g id="edge9" class="edge">
 <title>ZcashFoundation/zebra#3831&#45;&gt;ZcashFoundation/zebra#5423</title>
diff --git a/zcash-zf-dag.svg b/zcash-zf-dag.svg
index 6123a9c6..9c03f28e 100644
--- a/zcash-zf-dag.svg
+++ b/zcash-zf-dag.svg
@@ -10,19 +10,120 @@
 <g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 2467)">
 <polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-2467 1048,-2467 1048,4 -4,4"/>
 <g id="clust1" class="cluster">
-<title>cluster_0</title>
-<polygon fill="none" stroke="#0000ff" points="0,-132.5 0,-397.5 516,-397.5 516,-132.5 0,-132.5"/>
-<text text-anchor="middle" x="258" y="-382.3" font-family="Times,serif" font-size="14.00" fill="#000000">Epic: Zebra Release Candidate</text>
-</g>
-<g id="clust2" class="cluster">
 <title>cluster_1</title>
 <polygon fill="none" stroke="#0000ff" points="0,-468.5 0,-835.5 784,-835.5 784,-468.5 0,-468.5"/>
 <text text-anchor="middle" x="392" y="-820.3" font-family="Times,serif" font-size="14.00" fill="#000000">Epic: Support for RPC calls used by mining pools</text>
 </g>
-<!-- ZcashFoundation/zebra#5214 -->
+<g id="clust2" class="cluster">
+<title>cluster_0</title>
+<polygon fill="none" stroke="#0000ff" points="0,-132.5 0,-397.5 516,-397.5 516,-132.5 0,-132.5"/>
+<text text-anchor="middle" x="258" y="-382.3" font-family="Times,serif" font-size="14.00" fill="#000000">Epic: Zebra Release Candidate</text>
+</g>
+<!-- ZcashFoundation/zebra#5335 -->
 <g id="node1" class="node open">
+<title>ZcashFoundation/zebra#5335</title>
+<g id="a_node1"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/5335" xlink:title="ZcashFoundation/zebra#5335&#10;Evict transactions from&#10;the mempool based on the&#10;ZIP&#45;317 fee rules" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="508,-804.5 276,-804.5 276,-736.5 508,-736.5 508,-804.5"/>
+<text text-anchor="middle" x="392" y="-789.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#5335</text>
+<text text-anchor="middle" x="392" y="-774.3" font-family="Times,serif" font-size="14.00" fill="#000000">Evict transactions from</text>
+<text text-anchor="middle" x="392" y="-759.3" font-family="Times,serif" font-size="14.00" fill="#000000">the mempool based on the</text>
+<text text-anchor="middle" x="392" y="-744.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZIP&#45;317 fee rules</text>
+</a>
+</g>
+</g>
+<!-- ZcashFoundation/zebra#5336 -->
+<g id="node2" class="node open">
+<title>ZcashFoundation/zebra#5336</title>
+<g id="a_node2"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/5336" xlink:title="ZcashFoundation/zebra#5336&#10;Relay mempool&#10;transactions based on the&#10;ZIP&#45;317 fee rules" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" points="776,-764.5 544,-764.5 544,-696.5 776,-696.5 776,-764.5"/>
+<text text-anchor="middle" x="660" y="-749.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#5336</text>
+<text text-anchor="middle" x="660" y="-734.3" font-family="Times,serif" font-size="14.00" fill="#000000">Relay mempool</text>
+<text text-anchor="middle" x="660" y="-719.3" font-family="Times,serif" font-size="14.00" fill="#000000">transactions based on the</text>
+<text text-anchor="middle" x="660" y="-704.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZIP&#45;317 fee rules</text>
+</a>
+</g>
+</g>
+<!-- ZcashFoundation/zebra#5335&#45;&gt;ZcashFoundation/zebra#5336 -->
+<g id="edge1" class="edge">
+<title>ZcashFoundation/zebra#5335&#45;&gt;ZcashFoundation/zebra#5336</title>
+<path fill="none" stroke="#000000" d="M508.38,-753.13C516.81,-751.87 525.33,-750.6 533.81,-749.33"/>
+<polygon fill="#000000" stroke="#000000" points="534.3652,-752.786 543.74,-747.85 533.3333,-745.8625 534.3652,-752.786"/>
+</g>
+<!-- ZcashFoundation/zebra#5235 -->
+<g id="node3" class="node open">
+<title>ZcashFoundation/zebra#5235</title>
+<g id="a_node3"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/5235" xlink:title="ZcashFoundation/zebra#5235&#10;Tracking: Implement&#10;getblocktemplate RPC" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" points="508,-718 276,-718 276,-665 508,-665 508,-718"/>
+<text text-anchor="middle" x="392" y="-702.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#5235</text>
+<text text-anchor="middle" x="392" y="-687.8" font-family="Times,serif" font-size="14.00" fill="#000000">Tracking: Implement</text>
+<text text-anchor="middle" x="392" y="-672.8" font-family="Times,serif" font-size="14.00" fill="#000000">getblocktemplate RPC</text>
+</a>
+</g>
+</g>
+<!-- ZcashFoundation/zebra#5235&#45;&gt;ZcashFoundation/zebra#5336 -->
+<g id="edge2" class="edge">
+<title>ZcashFoundation/zebra#5235&#45;&gt;ZcashFoundation/zebra#5336</title>
+<path fill="none" stroke="#000000" d="M508.38,-708.44C516.81,-709.66 525.33,-710.9 533.81,-712.14"/>
+<polygon fill="#000000" stroke="#000000" points="533.3412,-715.6085 543.74,-713.58 534.3458,-708.681 533.3412,-715.6085"/>
+</g>
+<!-- ZcashFoundation/zebra#5376 -->
+<g id="node4" class="node open">
+<title>ZcashFoundation/zebra#5376</title>
+<g id="a_node4"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/5376" xlink:title="ZcashFoundation/zebra#5376&#10;Do contextual validation&#10;on mempool transactions&#10;using the state best tip" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="240,-804.5 8,-804.5 8,-736.5 240,-736.5 240,-804.5"/>
+<text text-anchor="middle" x="124" y="-789.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#5376</text>
+<text text-anchor="middle" x="124" y="-774.3" font-family="Times,serif" font-size="14.00" fill="#000000">Do contextual validation</text>
+<text text-anchor="middle" x="124" y="-759.3" font-family="Times,serif" font-size="14.00" fill="#000000">on mempool transactions</text>
+<text text-anchor="middle" x="124" y="-744.3" font-family="Times,serif" font-size="14.00" fill="#000000">using the state best tip</text>
+</a>
+</g>
+</g>
+<!-- ZcashFoundation/zebra#5376&#45;&gt;ZcashFoundation/zebra#5235 -->
+<g id="edge3" class="edge">
+<title>ZcashFoundation/zebra#5376&#45;&gt;ZcashFoundation/zebra#5235</title>
+<path fill="none" stroke="#000000" d="M239.6,-736.42C257.01,-731.29 274.84,-726.04 291.89,-721.01"/>
+<polygon fill="#000000" stroke="#000000" points="293.2277,-724.2647 301.83,-718.08 291.2484,-717.5503 293.2277,-724.2647"/>
+</g>
+<!-- ZcashFoundation/zebra#5236 -->
+<g id="node5" class="node open">
+<title>ZcashFoundation/zebra#5236</title>
+<g id="a_node5"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/5236" xlink:title="ZcashFoundation/zebra#5236&#10;Add support for&#10;`submitblock` RPC call" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="240,-718 8,-718 8,-665 240,-665 240,-718"/>
+<text text-anchor="middle" x="124" y="-702.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#5236</text>
+<text text-anchor="middle" x="124" y="-687.8" font-family="Times,serif" font-size="14.00" fill="#000000">Add support for</text>
+<text text-anchor="middle" x="124" y="-672.8" font-family="Times,serif" font-size="14.00" fill="#000000">`submitblock` RPC call</text>
+</a>
+</g>
+</g>
+<!-- ZcashFoundation/zebra#5302 -->
+<g id="node6" class="node open">
+<title>ZcashFoundation/zebra#5302</title>
+<g id="a_node6"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/5302" xlink:title="ZcashFoundation/zebra#5302&#10;Add support for&#10;`getblocksubsidy` RPC&#10;call" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="240,-646.5 8,-646.5 8,-578.5 240,-578.5 240,-646.5"/>
+<text text-anchor="middle" x="124" y="-631.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#5302</text>
+<text text-anchor="middle" x="124" y="-616.3" font-family="Times,serif" font-size="14.00" fill="#000000">Add support for</text>
+<text text-anchor="middle" x="124" y="-601.3" font-family="Times,serif" font-size="14.00" fill="#000000">`getblocksubsidy` RPC</text>
+<text text-anchor="middle" x="124" y="-586.3" font-family="Times,serif" font-size="14.00" fill="#000000">call</text>
+</a>
+</g>
+</g>
+<!-- ZcashFoundation/zebra#5386 -->
+<g id="node7" class="node open">
+<title>ZcashFoundation/zebra#5386</title>
+<g id="a_node7"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/5386" xlink:title="ZcashFoundation/zebra#5386&#10;Use BestChainUtxo rather&#10;than AwaitUtxo in the&#10;mempool transaction&#10;validator" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="240,-560 8,-560 8,-477 240,-477 240,-560"/>
+<text text-anchor="middle" x="124" y="-544.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#5386</text>
+<text text-anchor="middle" x="124" y="-529.8" font-family="Times,serif" font-size="14.00" fill="#000000">Use BestChainUtxo rather</text>
+<text text-anchor="middle" x="124" y="-514.8" font-family="Times,serif" font-size="14.00" fill="#000000">than AwaitUtxo in the</text>
+<text text-anchor="middle" x="124" y="-499.8" font-family="Times,serif" font-size="14.00" fill="#000000">mempool transaction</text>
+<text text-anchor="middle" x="124" y="-484.8" font-family="Times,serif" font-size="14.00" fill="#000000">validator</text>
+</a>
+</g>
+</g>
+<!-- ZcashFoundation/zebra#5214 -->
+<g id="node8" class="node open">
 <title>ZcashFoundation/zebra#5214</title>
-<g id="a_node1"><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_node8"><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="240,-366 8,-366 8,-313 240,-313 240,-366"/>
 <text text-anchor="middle" x="124" y="-350.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#5214</text>
 <text text-anchor="middle" x="124" y="-335.8" font-family="Times,serif" font-size="14.00" fill="#000000">Task: Make a list of</text>
@@ -31,9 +132,9 @@
 </g>
 </g>
 <!-- ZcashFoundation/zebra#5423 -->
-<g id="node2" class="node open">
+<g id="node9" class="node open">
 <title>ZcashFoundation/zebra#5423</title>
-<g id="a_node2"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/5423" xlink:title="ZcashFoundation/zebra#5423&#10;Tag Zebra 1.0.0&#45;rc.1" target="_blank">
+<g id="a_node9"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/5423" xlink:title="ZcashFoundation/zebra#5423&#10;Tag Zebra 1.0.0&#45;rc.1" target="_blank">
 <polygon fill="#c2e0c6" stroke="#000000" points="508,-272.5 276,-272.5 276,-234.5 508,-234.5 508,-272.5"/>
 <text text-anchor="middle" x="392" y="-257.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#5423</text>
 <text text-anchor="middle" x="392" y="-242.3" font-family="Times,serif" font-size="14.00" fill="#000000">Tag Zebra 1.0.0&#45;rc.1</text>
@@ -41,15 +142,15 @@
 </g>
 </g>
 <!-- ZcashFoundation/zebra#5214&#45;&gt;ZcashFoundation/zebra#5423 -->
-<g id="edge1" class="edge">
+<g id="edge4" class="edge">
 <title>ZcashFoundation/zebra#5214&#45;&gt;ZcashFoundation/zebra#5423</title>
 <path fill="none" stroke="#000000" d="M213.07,-312.93C222.18,-310.12 231.28,-307.28 240,-304.5 268.58,-295.4 300.03,-284.92 326.88,-275.84"/>
 <polygon fill="#000000" stroke="#000000" points="328.1963,-279.0894 336.54,-272.56 325.9456,-272.4611 328.1963,-279.0894"/>
 </g>
 <!-- ZcashFoundation/zebra#5445 -->
-<g id="node3" class="node open">
+<g id="node10" class="node open">
 <title>ZcashFoundation/zebra#5445</title>
-<g id="a_node3"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/5445" xlink:title="ZcashFoundation/zebra#5445&#10;Bump `zcash_proofs` to&#10;0.8.0" target="_blank">
+<g id="a_node10"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/5445" xlink:title="ZcashFoundation/zebra#5445&#10;Bump `zcash_proofs` to&#10;0.8.0" target="_blank">
 <polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="240,-194 8,-194 8,-141 240,-141 240,-194"/>
 <text text-anchor="middle" x="124" y="-178.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#5445</text>
 <text text-anchor="middle" x="124" y="-163.8" font-family="Times,serif" font-size="14.00" fill="#000000">Bump `zcash_proofs` to</text>
@@ -58,7 +159,7 @@
 </g>
 </g>
 <!-- ZcashFoundation/zebra#5445&#45;&gt;ZcashFoundation/zebra#5423 -->
-<g id="edge2" class="edge">
+<g id="edge5" class="edge">
 <title>ZcashFoundation/zebra#5445&#45;&gt;ZcashFoundation/zebra#5423</title>
 <path fill="none" stroke="#000000" d="M210.2,-194.07C220.26,-197.23 230.36,-200.42 240,-203.5 267.93,-212.43 298.66,-222.49 325.14,-231.24"/>
 <polygon fill="#000000" stroke="#000000" points="324.0967,-234.5814 334.69,-234.4 326.2957,-227.9357 324.0967,-234.5814"/>
@@ -98,9 +199,9 @@
 <polygon fill="#000000" stroke="#000000" points="287.5923,-60.0579 295.51,-53.018 284.9303,-53.5838 287.5923,-60.0579"/>
 </g>
 <!-- ZcashFoundation/zebra#5446 -->
-<g id="node4" class="node open">
+<g id="node11" class="node open">
 <title>ZcashFoundation/zebra#5446</title>
-<g id="a_node4"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/5446" xlink:title="ZcashFoundation/zebra#5446&#10;Audit: remove zebra&#45;chain&#10;cryptographic&#10;implementations that are&#10;unused" target="_blank">
+<g id="a_node11"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/5446" xlink:title="ZcashFoundation/zebra#5446&#10;Audit: remove zebra&#45;chain&#10;cryptographic&#10;implementations that are&#10;unused" target="_blank">
 <polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="240,-295 8,-295 8,-212 240,-212 240,-295"/>
 <text text-anchor="middle" x="124" y="-279.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#5446</text>
 <text text-anchor="middle" x="124" y="-264.8" font-family="Times,serif" font-size="14.00" fill="#000000">Audit: remove zebra&#45;chain</text>
@@ -111,112 +212,11 @@
 </g>
 </g>
 <!-- ZcashFoundation/zebra#5446&#45;&gt;ZcashFoundation/zebra#5423 -->
-<g id="edge3" class="edge">
+<g id="edge6" class="edge">
 <title>ZcashFoundation/zebra#5446&#45;&gt;ZcashFoundation/zebra#5423</title>
 <path fill="none" stroke="#000000" d="M240.38,-253.5C248.71,-253.5 257.14,-253.5 265.53,-253.5"/>
 <polygon fill="#000000" stroke="#000000" points="265.74,-257.0001 275.74,-253.5 265.74,-250.0001 265.74,-257.0001"/>
 </g>
-<!-- ZcashFoundation/zebra#5335 -->
-<g id="node5" class="node open">
-<title>ZcashFoundation/zebra#5335</title>
-<g id="a_node5"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/5335" xlink:title="ZcashFoundation/zebra#5335&#10;Evict transactions from&#10;the mempool based on the&#10;ZIP&#45;317 fee rules" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="508,-804.5 276,-804.5 276,-736.5 508,-736.5 508,-804.5"/>
-<text text-anchor="middle" x="392" y="-789.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#5335</text>
-<text text-anchor="middle" x="392" y="-774.3" font-family="Times,serif" font-size="14.00" fill="#000000">Evict transactions from</text>
-<text text-anchor="middle" x="392" y="-759.3" font-family="Times,serif" font-size="14.00" fill="#000000">the mempool based on the</text>
-<text text-anchor="middle" x="392" y="-744.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZIP&#45;317 fee rules</text>
-</a>
-</g>
-</g>
-<!-- ZcashFoundation/zebra#5336 -->
-<g id="node6" class="node open">
-<title>ZcashFoundation/zebra#5336</title>
-<g id="a_node6"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/5336" xlink:title="ZcashFoundation/zebra#5336&#10;Relay mempool&#10;transactions based on the&#10;ZIP&#45;317 fee rules" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" points="776,-764.5 544,-764.5 544,-696.5 776,-696.5 776,-764.5"/>
-<text text-anchor="middle" x="660" y="-749.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#5336</text>
-<text text-anchor="middle" x="660" y="-734.3" font-family="Times,serif" font-size="14.00" fill="#000000">Relay mempool</text>
-<text text-anchor="middle" x="660" y="-719.3" font-family="Times,serif" font-size="14.00" fill="#000000">transactions based on the</text>
-<text text-anchor="middle" x="660" y="-704.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZIP&#45;317 fee rules</text>
-</a>
-</g>
-</g>
-<!-- ZcashFoundation/zebra#5335&#45;&gt;ZcashFoundation/zebra#5336 -->
-<g id="edge4" class="edge">
-<title>ZcashFoundation/zebra#5335&#45;&gt;ZcashFoundation/zebra#5336</title>
-<path fill="none" stroke="#000000" d="M508.38,-753.13C516.81,-751.87 525.33,-750.6 533.81,-749.33"/>
-<polygon fill="#000000" stroke="#000000" points="534.3652,-752.786 543.74,-747.85 533.3333,-745.8625 534.3652,-752.786"/>
-</g>
-<!-- ZcashFoundation/zebra#5235 -->
-<g id="node7" class="node open">
-<title>ZcashFoundation/zebra#5235</title>
-<g id="a_node7"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/5235" xlink:title="ZcashFoundation/zebra#5235&#10;Tracking: Implement&#10;getblocktemplate RPC" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" points="508,-718 276,-718 276,-665 508,-665 508,-718"/>
-<text text-anchor="middle" x="392" y="-702.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#5235</text>
-<text text-anchor="middle" x="392" y="-687.8" font-family="Times,serif" font-size="14.00" fill="#000000">Tracking: Implement</text>
-<text text-anchor="middle" x="392" y="-672.8" font-family="Times,serif" font-size="14.00" fill="#000000">getblocktemplate RPC</text>
-</a>
-</g>
-</g>
-<!-- ZcashFoundation/zebra#5235&#45;&gt;ZcashFoundation/zebra#5336 -->
-<g id="edge5" class="edge">
-<title>ZcashFoundation/zebra#5235&#45;&gt;ZcashFoundation/zebra#5336</title>
-<path fill="none" stroke="#000000" d="M508.38,-708.44C516.81,-709.66 525.33,-710.9 533.81,-712.14"/>
-<polygon fill="#000000" stroke="#000000" points="533.3412,-715.6085 543.74,-713.58 534.3458,-708.681 533.3412,-715.6085"/>
-</g>
-<!-- ZcashFoundation/zebra#5376 -->
-<g id="node8" class="node open">
-<title>ZcashFoundation/zebra#5376</title>
-<g id="a_node8"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/5376" xlink:title="ZcashFoundation/zebra#5376&#10;Do contextual validation&#10;on mempool transactions&#10;using the state best tip" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="240,-804.5 8,-804.5 8,-736.5 240,-736.5 240,-804.5"/>
-<text text-anchor="middle" x="124" y="-789.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#5376</text>
-<text text-anchor="middle" x="124" y="-774.3" font-family="Times,serif" font-size="14.00" fill="#000000">Do contextual validation</text>
-<text text-anchor="middle" x="124" y="-759.3" font-family="Times,serif" font-size="14.00" fill="#000000">on mempool transactions</text>
-<text text-anchor="middle" x="124" y="-744.3" font-family="Times,serif" font-size="14.00" fill="#000000">using the state best tip</text>
-</a>
-</g>
-</g>
-<!-- ZcashFoundation/zebra#5376&#45;&gt;ZcashFoundation/zebra#5235 -->
-<g id="edge6" class="edge">
-<title>ZcashFoundation/zebra#5376&#45;&gt;ZcashFoundation/zebra#5235</title>
-<path fill="none" stroke="#000000" d="M239.6,-736.42C257.01,-731.29 274.84,-726.04 291.89,-721.01"/>
-<polygon fill="#000000" stroke="#000000" points="293.2277,-724.2647 301.83,-718.08 291.2484,-717.5503 293.2277,-724.2647"/>
-</g>
-<!-- ZcashFoundation/zebra#5236 -->
-<g id="node9" class="node open">
-<title>ZcashFoundation/zebra#5236</title>
-<g id="a_node9"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/5236" xlink:title="ZcashFoundation/zebra#5236&#10;Add support for&#10;`submitblock` RPC call" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="240,-718 8,-718 8,-665 240,-665 240,-718"/>
-<text text-anchor="middle" x="124" y="-702.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#5236</text>
-<text text-anchor="middle" x="124" y="-687.8" font-family="Times,serif" font-size="14.00" fill="#000000">Add support for</text>
-<text text-anchor="middle" x="124" y="-672.8" font-family="Times,serif" font-size="14.00" fill="#000000">`submitblock` RPC call</text>
-</a>
-</g>
-</g>
-<!-- ZcashFoundation/zebra#5302 -->
-<g id="node10" class="node open">
-<title>ZcashFoundation/zebra#5302</title>
-<g id="a_node10"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/5302" xlink:title="ZcashFoundation/zebra#5302&#10;Add support for&#10;`getblocksubsidy` RPC&#10;call" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="240,-646.5 8,-646.5 8,-578.5 240,-578.5 240,-646.5"/>
-<text text-anchor="middle" x="124" y="-631.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#5302</text>
-<text text-anchor="middle" x="124" y="-616.3" font-family="Times,serif" font-size="14.00" fill="#000000">Add support for</text>
-<text text-anchor="middle" x="124" y="-601.3" font-family="Times,serif" font-size="14.00" fill="#000000">`getblocksubsidy` RPC</text>
-<text text-anchor="middle" x="124" y="-586.3" font-family="Times,serif" font-size="14.00" fill="#000000">call</text>
-</a>
-</g>
-</g>
-<!-- ZcashFoundation/zebra#5386 -->
-<g id="node11" class="node open">
-<title>ZcashFoundation/zebra#5386</title>
-<g id="a_node11"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/5386" xlink:title="ZcashFoundation/zebra#5386&#10;Use BestChainUtxo rather&#10;than AwaitUtxo in the&#10;mempool transaction&#10;validator" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="240,-560 8,-560 8,-477 240,-477 240,-560"/>
-<text text-anchor="middle" x="124" y="-544.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#5386</text>
-<text text-anchor="middle" x="124" y="-529.8" font-family="Times,serif" font-size="14.00" fill="#000000">Use BestChainUtxo rather</text>
-<text text-anchor="middle" x="124" y="-514.8" font-family="Times,serif" font-size="14.00" fill="#000000">than AwaitUtxo in the</text>
-<text text-anchor="middle" x="124" y="-499.8" font-family="Times,serif" font-size="14.00" fill="#000000">mempool transaction</text>
-<text text-anchor="middle" x="124" y="-484.8" font-family="Times,serif" font-size="14.00" fill="#000000">validator</text>
-</a>
-</g>
-</g>
 <!-- ZcashFoundation/zebra#3831&#45;&gt;ZcashFoundation/zebra#5423 -->
 <g id="edge9" class="edge">
 <title>ZcashFoundation/zebra#3831&#45;&gt;ZcashFoundation/zebra#5423</title>
diff --git a/zcash-zf-frost-dag.html b/zcash-zf-frost-dag.html
index 1667f0d5..c4e27aa3 100644
--- a/zcash-zf-frost-dag.html
+++ b/zcash-zf-frost-dag.html
@@ -22,56 +22,24 @@
 <g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 1054.5)">
 <polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-1054.5 989,-1054.5 989,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>
-</g>
-<g id="clust2" class="cluster">
 <title>cluster_1</title>
 <polygon fill="none" stroke="#0000ff" points="0,-227 0,-476 486,-476 486,-227 0,-227"/>
 <text text-anchor="middle" x="243" y="-460.8" font-family="Times,serif" font-size="14.00" fill="#000000">Epic: Re&#45;randomizable FROST</text>
 </g>
-<g id="clust3" class="cluster">
+<g id="clust2" class="cluster">
 <title>cluster_2</title>
 <polygon fill="none" stroke="#0000ff" points="0,-484 0,-719 233,-719 233,-484 0,-484"/>
 <text text-anchor="middle" x="116.5" y="-703.8" font-family="Times,serif" font-size="14.00" fill="#000000">Epic: v9/v10/v11</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 id="clust3" 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>
 </g>
 <!-- ZcashFoundation/frost#119 -->
-<g id="node4" class="node open">
+<g id="node1" class="node open">
 <title>ZcashFoundation/frost#119</title>
-<g id="a_node4"><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" stroke-width="2" points="225,-445 8,-445 8,-377 225,-377 225,-445"/>
 <text text-anchor="middle" x="116.5" y="-429.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/frost#119</text>
 <text text-anchor="middle" x="116.5" y="-414.8" font-family="Times,serif" font-size="14.00" fill="#000000">Review and officially</text>
@@ -81,9 +49,9 @@
 </g>
 </g>
 <!-- ZcashFoundation/frost#120 -->
-<g id="node5" class="node open">
+<g id="node2" class="node open">
 <title>ZcashFoundation/frost#120</title>
-<g id="a_node5"><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;V11" 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;V11" target="_blank">
 <polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="225,-359 8,-359 8,-291 225,-291 225,-359"/>
 <text text-anchor="middle" x="116.5" y="-343.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/frost#120</text>
 <text text-anchor="middle" x="116.5" y="-328.8" font-family="Times,serif" font-size="14.00" fill="#000000">Update Re&#45;randomizable</text>
@@ -93,9 +61,9 @@
 </g>
 </g>
 <!-- ZcashFoundation/frost#121 -->
-<g id="node6" class="node open">
+<g id="node3" class="node open">
 <title>ZcashFoundation/frost#121</title>
-<g id="a_node6"><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="478,-359 261,-359 261,-291 478,-291 478,-359"/>
 <text text-anchor="middle" x="369.5" y="-343.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/frost#121</text>
 <text text-anchor="middle" x="369.5" y="-328.8" font-family="Times,serif" font-size="14.00" fill="#000000">Organize the Re&#45;</text>
@@ -130,9 +98,9 @@
 <polygon fill="#000000" stroke="#000000" points="508.64,-328.5001 518.64,-325 508.64,-321.5001 508.64,-328.5001"/>
 </g>
 <!-- ZcashFoundation/frost#81 -->
-<g id="node7" class="node open">
+<g id="node4" class="node open">
 <title>ZcashFoundation/frost#81</title>
-<g id="a_node7"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/81" xlink:title="ZcashFoundation/frost#81&#10;Start rerandomized repo" target="_blank">
+<g id="a_node4"><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,-273 12.5,-273 12.5,-235 220.5,-235 220.5,-273"/>
 <text text-anchor="middle" x="116.5" y="-257.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/frost#81</text>
 <text text-anchor="middle" x="116.5" y="-242.8" font-family="Times,serif" font-size="14.00" fill="#000000">Start rerandomized repo</text>
@@ -140,9 +108,9 @@
 </g>
 </g>
 <!-- ZcashFoundation/frost#79 -->
-<g id="node8" class="node open">
+<g id="node5" class="node open">
 <title>ZcashFoundation/frost#79</title>
-<g id="a_node8"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/79" xlink:title="ZcashFoundation/frost#79&#10;Publish `frost&#45;` crates" target="_blank">
+<g id="a_node5"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/79" xlink:title="ZcashFoundation/frost#79&#10;Publish `frost&#45;` crates" target="_blank">
 <polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="220.5,-688 12.5,-688 12.5,-650 220.5,-650 220.5,-688"/>
 <text text-anchor="middle" x="116.5" y="-672.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/frost#79</text>
 <text text-anchor="middle" x="116.5" y="-657.8" font-family="Times,serif" font-size="14.00" fill="#000000">Publish `frost&#45;` crates</text>
@@ -150,9 +118,9 @@
 </g>
 </g>
 <!-- ZcashFoundation/frost#102 -->
-<g id="node9" class="node open">
+<g id="node6" class="node open">
 <title>ZcashFoundation/frost#102</title>
-<g id="a_node9"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/102" xlink:title="ZcashFoundation/frost#102&#10;frost&#45;core: add and use C&#10;iphersuite.identifier_to_&#10;scalar()" target="_blank">
+<g id="a_node6"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/102" xlink:title="ZcashFoundation/frost#102&#10;frost&#45;core: add and use C&#10;iphersuite.identifier_to_&#10;scalar()" target="_blank">
 <polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="225,-632 8,-632 8,-564 225,-564 225,-632"/>
 <text text-anchor="middle" x="116.5" y="-616.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/frost#102</text>
 <text text-anchor="middle" x="116.5" y="-601.8" font-family="Times,serif" font-size="14.00" fill="#000000">frost&#45;core: add and use C</text>
@@ -162,9 +130,9 @@
 </g>
 </g>
 <!-- ZcashFoundation/frost#133 -->
-<g id="node10" class="node open">
+<g id="node7" class="node open">
 <title>ZcashFoundation/frost#133</title>
-<g id="a_node10"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/133" xlink:title="ZcashFoundation/frost#133&#10;Use nonce_generate test&#10;vectors" target="_blank">
+<g id="a_node7"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/133" xlink:title="ZcashFoundation/frost#133&#10;Use nonce_generate test&#10;vectors" target="_blank">
 <polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="225,-545.5 8,-545.5 8,-492.5 225,-492.5 225,-545.5"/>
 <text text-anchor="middle" x="116.5" y="-530.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/frost#133</text>
 <text text-anchor="middle" x="116.5" y="-515.3" font-family="Times,serif" font-size="14.00" fill="#000000">Use nonce_generate test</text>
@@ -172,6 +140,38 @@
 </a>
 </g>
 </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#39 -->
 <g id="node12" class="node open">
 <title>ZcashFoundation/frost#39</title>
diff --git a/zcash-zf-frost-dag.svg b/zcash-zf-frost-dag.svg
index e69407fc..fe95df50 100644
--- a/zcash-zf-frost-dag.svg
+++ b/zcash-zf-frost-dag.svg
@@ -10,56 +10,24 @@
 <g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 1054.5)">
 <polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-1054.5 989,-1054.5 989,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>
-</g>
-<g id="clust2" class="cluster">
 <title>cluster_1</title>
 <polygon fill="none" stroke="#0000ff" points="0,-227 0,-476 486,-476 486,-227 0,-227"/>
 <text text-anchor="middle" x="243" y="-460.8" font-family="Times,serif" font-size="14.00" fill="#000000">Epic: Re&#45;randomizable FROST</text>
 </g>
-<g id="clust3" class="cluster">
+<g id="clust2" class="cluster">
 <title>cluster_2</title>
 <polygon fill="none" stroke="#0000ff" points="0,-484 0,-719 233,-719 233,-484 0,-484"/>
 <text text-anchor="middle" x="116.5" y="-703.8" font-family="Times,serif" font-size="14.00" fill="#000000">Epic: v9/v10/v11</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 id="clust3" 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>
 </g>
 <!-- ZcashFoundation/frost#119 -->
-<g id="node4" class="node open">
+<g id="node1" class="node open">
 <title>ZcashFoundation/frost#119</title>
-<g id="a_node4"><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" stroke-width="2" points="225,-445 8,-445 8,-377 225,-377 225,-445"/>
 <text text-anchor="middle" x="116.5" y="-429.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/frost#119</text>
 <text text-anchor="middle" x="116.5" y="-414.8" font-family="Times,serif" font-size="14.00" fill="#000000">Review and officially</text>
@@ -69,9 +37,9 @@
 </g>
 </g>
 <!-- ZcashFoundation/frost#120 -->
-<g id="node5" class="node open">
+<g id="node2" class="node open">
 <title>ZcashFoundation/frost#120</title>
-<g id="a_node5"><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;V11" 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;V11" target="_blank">
 <polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="225,-359 8,-359 8,-291 225,-291 225,-359"/>
 <text text-anchor="middle" x="116.5" y="-343.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/frost#120</text>
 <text text-anchor="middle" x="116.5" y="-328.8" font-family="Times,serif" font-size="14.00" fill="#000000">Update Re&#45;randomizable</text>
@@ -81,9 +49,9 @@
 </g>
 </g>
 <!-- ZcashFoundation/frost#121 -->
-<g id="node6" class="node open">
+<g id="node3" class="node open">
 <title>ZcashFoundation/frost#121</title>
-<g id="a_node6"><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="478,-359 261,-359 261,-291 478,-291 478,-359"/>
 <text text-anchor="middle" x="369.5" y="-343.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/frost#121</text>
 <text text-anchor="middle" x="369.5" y="-328.8" font-family="Times,serif" font-size="14.00" fill="#000000">Organize the Re&#45;</text>
@@ -118,9 +86,9 @@
 <polygon fill="#000000" stroke="#000000" points="508.64,-328.5001 518.64,-325 508.64,-321.5001 508.64,-328.5001"/>
 </g>
 <!-- ZcashFoundation/frost#81 -->
-<g id="node7" class="node open">
+<g id="node4" class="node open">
 <title>ZcashFoundation/frost#81</title>
-<g id="a_node7"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/81" xlink:title="ZcashFoundation/frost#81&#10;Start rerandomized repo" target="_blank">
+<g id="a_node4"><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,-273 12.5,-273 12.5,-235 220.5,-235 220.5,-273"/>
 <text text-anchor="middle" x="116.5" y="-257.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/frost#81</text>
 <text text-anchor="middle" x="116.5" y="-242.8" font-family="Times,serif" font-size="14.00" fill="#000000">Start rerandomized repo</text>
@@ -128,9 +96,9 @@
 </g>
 </g>
 <!-- ZcashFoundation/frost#79 -->
-<g id="node8" class="node open">
+<g id="node5" class="node open">
 <title>ZcashFoundation/frost#79</title>
-<g id="a_node8"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/79" xlink:title="ZcashFoundation/frost#79&#10;Publish `frost&#45;` crates" target="_blank">
+<g id="a_node5"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/79" xlink:title="ZcashFoundation/frost#79&#10;Publish `frost&#45;` crates" target="_blank">
 <polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="220.5,-688 12.5,-688 12.5,-650 220.5,-650 220.5,-688"/>
 <text text-anchor="middle" x="116.5" y="-672.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/frost#79</text>
 <text text-anchor="middle" x="116.5" y="-657.8" font-family="Times,serif" font-size="14.00" fill="#000000">Publish `frost&#45;` crates</text>
@@ -138,9 +106,9 @@
 </g>
 </g>
 <!-- ZcashFoundation/frost#102 -->
-<g id="node9" class="node open">
+<g id="node6" class="node open">
 <title>ZcashFoundation/frost#102</title>
-<g id="a_node9"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/102" xlink:title="ZcashFoundation/frost#102&#10;frost&#45;core: add and use C&#10;iphersuite.identifier_to_&#10;scalar()" target="_blank">
+<g id="a_node6"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/102" xlink:title="ZcashFoundation/frost#102&#10;frost&#45;core: add and use C&#10;iphersuite.identifier_to_&#10;scalar()" target="_blank">
 <polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="225,-632 8,-632 8,-564 225,-564 225,-632"/>
 <text text-anchor="middle" x="116.5" y="-616.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/frost#102</text>
 <text text-anchor="middle" x="116.5" y="-601.8" font-family="Times,serif" font-size="14.00" fill="#000000">frost&#45;core: add and use C</text>
@@ -150,9 +118,9 @@
 </g>
 </g>
 <!-- ZcashFoundation/frost#133 -->
-<g id="node10" class="node open">
+<g id="node7" class="node open">
 <title>ZcashFoundation/frost#133</title>
-<g id="a_node10"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/133" xlink:title="ZcashFoundation/frost#133&#10;Use nonce_generate test&#10;vectors" target="_blank">
+<g id="a_node7"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/133" xlink:title="ZcashFoundation/frost#133&#10;Use nonce_generate test&#10;vectors" target="_blank">
 <polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="225,-545.5 8,-545.5 8,-492.5 225,-492.5 225,-545.5"/>
 <text text-anchor="middle" x="116.5" y="-530.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/frost#133</text>
 <text text-anchor="middle" x="116.5" y="-515.3" font-family="Times,serif" font-size="14.00" fill="#000000">Use nonce_generate test</text>
@@ -160,6 +128,38 @@
 </a>
 </g>
 </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#39 -->
 <g id="node12" class="node open">
 <title>ZcashFoundation/frost#39</title>