diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/visualization/deparser.html b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/visualization/deparser.html
index dcd8955..22d55c7 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/visualization/deparser.html
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/visualization/deparser.html
@@ -102,7 +102,7 @@
 <td width=50 style="border: 1px solid black" align=center>120-127</td>
 </tr><tr><td width=50 align=right>PHV&nbsp;&nbsp;</td>
 <td height=50 colspan=4 align=center bgcolor=#DDDDDD>0</td>
-<td height=50 colspan=1 align=center bgcolor=#DDDDDD>67</td>
+<td height=50 colspan=1 align=center bgcolor=#DDDDDD>68</td>
 <td height=50 colspan=11 align=center bgcolor=#FFFFFF>----</td>
 </tr></table><br />
 <table border=0 style="border: 1px solid black;"><tr><td width=50 align=right>POV&nbsp;&nbsp;</td>
@@ -129,13 +129,13 @@
 <tr class=fde_row_0><td height=50 width=50>0-15</td><td>----</td><td>&nbsp;</td><td>&nbsp;</td></tr>
 <tr class=fde_row_0><td height=50 width=50>16</td><td>_bridged_intr_md_</td><td>PHV 0 bit 16</td><td>(phv[0] & 0x10000)</td></tr>
 <tr class=fde_row_0><td height=50 width=50>17-31</td><td>----</td><td>&nbsp;</td><td>&nbsp;</td></tr>
-<tr class=fde_row_0><td height=50 width=50>32</td><td>packet_in_hdr</td><td>PHV 67 bit 0</td><td>(phv[67] & 0x1)</td></tr>
-<tr class=fde_row_1><td height=50 width=50>33</td><td>packet_out_hdr</td><td>PHV 67 bit 1</td><td>(phv[67] & 0x2)</td></tr>
-<tr class=fde_row_0><td height=50 width=50>34</td><td>ethernet</td><td>PHV 67 bit 2</td><td>(phv[67] & 0x4)</td></tr>
-<tr class=fde_row_1><td height=50 width=50>35</td><td>ipv4</td><td>PHV 67 bit 3</td><td>(phv[67] & 0x8)</td></tr>
-<tr class=fde_row_0><td height=50 width=50>36</td><td>tcp</td><td>PHV 67 bit 4</td><td>(phv[67] & 0x10)</td></tr>
-<tr class=fde_row_1><td height=50 width=50>37</td><td>udp</td><td>PHV 67 bit 5</td><td>(phv[67] & 0x20)</td></tr>
-<tr class=fde_row_0><td height=50 width=50>38</td><td>metadata_bridge</td><td>PHV 67 bit 6</td><td>(phv[67] & 0x40)</td></tr>
+<tr class=fde_row_0><td height=50 width=50>32</td><td>packet_in_hdr</td><td>PHV 68 bit 0</td><td>(phv[68] & 0x1)</td></tr>
+<tr class=fde_row_1><td height=50 width=50>33</td><td>packet_out_hdr</td><td>PHV 68 bit 1</td><td>(phv[68] & 0x2)</td></tr>
+<tr class=fde_row_0><td height=50 width=50>34</td><td>ethernet</td><td>PHV 68 bit 2</td><td>(phv[68] & 0x4)</td></tr>
+<tr class=fde_row_1><td height=50 width=50>35</td><td>ipv4</td><td>PHV 68 bit 3</td><td>(phv[68] & 0x8)</td></tr>
+<tr class=fde_row_0><td height=50 width=50>36</td><td>tcp</td><td>PHV 68 bit 4</td><td>(phv[68] & 0x10)</td></tr>
+<tr class=fde_row_1><td height=50 width=50>37</td><td>udp</td><td>PHV 68 bit 5</td><td>(phv[68] & 0x20)</td></tr>
+<tr class=fde_row_0><td height=50 width=50>38</td><td>metadata_bridge</td><td>PHV 68 bit 6</td><td>(phv[68] & 0x40)</td></tr>
 <tr class=fde_row_0><td height=50 width=50>39-254</td><td>----</td><td>&nbsp;</td><td>&nbsp;</td></tr>
 </table>
 </div></div><br><br>
@@ -182,35 +182,35 @@
 
         <tr class="fde_row_0">
             <td style="border-right: 1px solid black">ethernet (34)</td>
-            <td>65</td>
-            <td>3</td>
-            <td>3</td>
-            <td>3</td>
+            <td>66</td>
+            <td>4</td>
+            <td>4</td>
+            <td>4</td>
         </tr>
         
 
         <tr class="fde_row_1">
             <td style="border-right: 1px solid black">ethernet (34)</td>
-            <td>3</td>
-            <td>132</td>
-            <td>132</td>
-            <td>66</td>
+            <td>4</td>
+            <td>133</td>
+            <td>133</td>
+            <td>67</td>
         </tr>
         
 
         <tr class="fde_row_0">
             <td style="border-right: 1px solid black">ethernet (34)</td>
-            <td>4</td>
-            <td>4</td>
-            <td>4</td>
-            <td>4</td>
+            <td>5</td>
+            <td>5</td>
+            <td>5</td>
+            <td>5</td>
         </tr>
         
 
         <tr class="fde_row_1">
             <td style="border-right: 1px solid black">ethernet (34)</td>
-            <td>133</td>
-            <td>133</td>
+            <td>134</td>
+            <td>134</td>
             <td>-</td>
             <td>-</td>
         </tr>
@@ -263,46 +263,46 @@
 
         <tr class="fde_row_1">
             <td style="border-right: 1px solid black">udp (37)</td>
-            <td>5</td>
-            <td>5</td>
-            <td>5</td>
-            <td>5</td>
+            <td><font color=#333333><i>289</i></font></td>
+            <td>65</td>
+            <td><font color=#333333><i>322</i></font></td>
+            <td><font color=#333333><i>322</i></font></td>
         </tr>
         
 
         <tr class="fde_row_0">
             <td style="border-right: 1px solid black">udp (37)</td>
-            <td><font color=#333333><i>289</i></font></td>
-            <td><font color=#333333><i>290</i></font></td>
-            <td><font color=#333333><i>322</i></font></td>
-            <td><font color=#333333><i>322</i></font></td>
+            <td><font color=#333333><i>257</i></font></td>
+            <td><font color=#333333><i>257</i></font></td>
+            <td><font color=#333333><i>257</i></font></td>
+            <td><font color=#333333><i>257</i></font></td>
         </tr>
         
 
         <tr class="fde_row_1">
             <td style="border-right: 1px solid black">tcp (36)</td>
-            <td><font color=#333333><i>289</i></font></td>
-            <td><font color=#333333><i>290</i></font></td>
-            <td><font color=#333333><i>291</i></font></td>
-            <td><font color=#333333><i>292</i></font></td>
+            <td>65</td>
+            <td>132</td>
+            <td>132</td>
+            <td>3</td>
         </tr>
         
 
         <tr class="fde_row_0">
             <td style="border-right: 1px solid black">tcp (36)</td>
-            <td><font color=#333333><i>322</i></font></td>
-            <td><font color=#333333><i>322</i></font></td>
-            <td><font color=#333333><i>323</i></font></td>
-            <td><font color=#333333><i>323</i></font></td>
+            <td>3</td>
+            <td>3</td>
+            <td>3</td>
+            <td><font color=#333333><i>289</i></font></td>
         </tr>
         
 
         <tr class="fde_row_1">
             <td style="border-right: 1px solid black">tcp (36)</td>
-            <td><font color=#333333><i>324</i></font></td>
-            <td><font color=#333333><i>324</i></font></td>
-            <td><font color=#333333><i>325</i></font></td>
-            <td><font color=#333333><i>325</i></font></td>
+            <td><font color=#333333><i>322</i></font></td>
+            <td><font color=#333333><i>322</i></font></td>
+            <td><font color=#333333><i>323</i></font></td>
+            <td><font color=#333333><i>323</i></font></td>
         </tr>
         
 
@@ -401,8 +401,8 @@
 
         <tr class="fde_row_0">
             <td style="border-right: 1px solid black">packet_out_hdr (1)</td>
-            <td><font color=#333333><i>340</i></font></td>
-            <td><font color=#333333><i>340</i></font></td>
+            <td><font color=#333333><i>334</i></font></td>
+            <td><font color=#333333><i>334</i></font></td>
             <td>-</td>
             <td>-</td>
         </tr>
@@ -410,8 +410,8 @@
 
         <tr class="fde_row_1">
             <td style="border-right: 1px solid black">packet_in_hdr (0)</td>
-            <td><font color=#333333><i>340</i></font></td>
-            <td><font color=#333333><i>340</i></font></td>
+            <td><font color=#333333><i>334</i></font></td>
+            <td><font color=#333333><i>334</i></font></td>
             <td>-</td>
             <td>-</td>
         </tr>
@@ -419,145 +419,145 @@
 
         <tr class="fde_row_0">
             <td style="border-right: 1px solid black">ethernet (2)</td>
-            <td><font color=#333333><i>300</i></font></td>
-            <td><font color=#333333><i>270</i></font></td>
-            <td><font color=#333333><i>270</i></font></td>
-            <td><font color=#333333><i>270</i></font></td>
-        </tr>
-        
-
-        <tr class="fde_row_1">
-            <td style="border-right: 1px solid black">ethernet (2)</td>
-            <td><font color=#333333><i>270</i></font></td>
-            <td><font color=#333333><i>338</i></font></td>
-            <td><font color=#333333><i>338</i></font></td>
-            <td><font color=#333333><i>301</i></font></td>
-        </tr>
-        
-
-        <tr class="fde_row_0">
-            <td style="border-right: 1px solid black">ethernet (2)</td>
-            <td><font color=#333333><i>271</i></font></td>
-            <td><font color=#333333><i>271</i></font></td>
-            <td><font color=#333333><i>271</i></font></td>
-            <td><font color=#333333><i>271</i></font></td>
-        </tr>
-        
-
-        <tr class="fde_row_1">
-            <td style="border-right: 1px solid black">ethernet (2)</td>
-            <td><font color=#333333><i>339</i></font></td>
-            <td><font color=#333333><i>339</i></font></td>
-            <td>-</td>
-            <td>-</td>
-        </tr>
-        
-
-        <tr class="fde_row_0">
-            <td style="border-right: 1px solid black">ipv4 (3)</td>
             <td><font color=#333333><i>296</i></font></td>
+            <td><font color=#333333><i>266</i></font></td>
+            <td><font color=#333333><i>266</i></font></td>
+            <td><font color=#333333><i>266</i></font></td>
+        </tr>
+        
+
+        <tr class="fde_row_1">
+            <td style="border-right: 1px solid black">ethernet (2)</td>
+            <td><font color=#333333><i>266</i></font></td>
+            <td><font color=#333333><i>332</i></font></td>
+            <td><font color=#333333><i>332</i></font></td>
             <td><font color=#333333><i>297</i></font></td>
-            <td><font color=#333333><i>332</i></font></td>
-            <td><font color=#333333><i>332</i></font></td>
+        </tr>
+        
+
+        <tr class="fde_row_0">
+            <td style="border-right: 1px solid black">ethernet (2)</td>
+            <td><font color=#333333><i>267</i></font></td>
+            <td><font color=#333333><i>267</i></font></td>
+            <td><font color=#333333><i>267</i></font></td>
+            <td><font color=#333333><i>267</i></font></td>
         </tr>
         
 
         <tr class="fde_row_1">
-            <td style="border-right: 1px solid black">ipv4 (3)</td>
+            <td style="border-right: 1px solid black">ethernet (2)</td>
             <td><font color=#333333><i>333</i></font></td>
             <td><font color=#333333><i>333</i></font></td>
-            <td><font color=#333333><i>334</i></font></td>
-            <td><font color=#333333><i>334</i></font></td>
+            <td>-</td>
+            <td>-</td>
         </tr>
         
 
         <tr class="fde_row_0">
             <td style="border-right: 1px solid black">ipv4 (3)</td>
-            <td><font color=#333333><i>264</i></font></td>
-            <td><font color=#333333><i>264</i></font></td>
-            <td><font color=#333333><i>264</i></font></td>
-            <td><font color=#333333><i>264</i></font></td>
+            <td><font color=#333333><i>292</i></font></td>
+            <td><font color=#333333><i>293</i></font></td>
+            <td><font color=#333333><i>326</i></font></td>
+            <td><font color=#333333><i>326</i></font></td>
         </tr>
         
 
         <tr class="fde_row_1">
             <td style="border-right: 1px solid black">ipv4 (3)</td>
-            <td><font color=#333333><i>265</i></font></td>
-            <td><font color=#333333><i>265</i></font></td>
-            <td><font color=#333333><i>265</i></font></td>
-            <td><font color=#333333><i>265</i></font></td>
+            <td><font color=#333333><i>327</i></font></td>
+            <td><font color=#333333><i>327</i></font></td>
+            <td><font color=#333333><i>328</i></font></td>
+            <td><font color=#333333><i>328</i></font></td>
         </tr>
         
 
         <tr class="fde_row_0">
             <td style="border-right: 1px solid black">ipv4 (3)</td>
-            <td><font color=#333333><i>266</i></font></td>
-            <td><font color=#333333><i>266</i></font></td>
-            <td><font color=#333333><i>266</i></font></td>
-            <td><font color=#333333><i>266</i></font></td>
+            <td><font color=#333333><i>260</i></font></td>
+            <td><font color=#333333><i>260</i></font></td>
+            <td><font color=#333333><i>260</i></font></td>
+            <td><font color=#333333><i>260</i></font></td>
+        </tr>
+        
+
+        <tr class="fde_row_1">
+            <td style="border-right: 1px solid black">ipv4 (3)</td>
+            <td><font color=#333333><i>261</i></font></td>
+            <td><font color=#333333><i>261</i></font></td>
+            <td><font color=#333333><i>261</i></font></td>
+            <td><font color=#333333><i>261</i></font></td>
+        </tr>
+        
+
+        <tr class="fde_row_0">
+            <td style="border-right: 1px solid black">ipv4 (3)</td>
+            <td><font color=#333333><i>262</i></font></td>
+            <td><font color=#333333><i>262</i></font></td>
+            <td><font color=#333333><i>262</i></font></td>
+            <td><font color=#333333><i>262</i></font></td>
         </tr>
         
 
         <tr class="fde_row_1">
             <td style="border-right: 1px solid black">udp (5)</td>
-            <td><font color=#333333><i>298</i></font></td>
-            <td><font color=#333333><i>299</i></font></td>
-            <td><font color=#333333><i>336</i></font></td>
-            <td><font color=#333333><i>336</i></font></td>
+            <td><font color=#333333><i>294</i></font></td>
+            <td><font color=#333333><i>295</i></font></td>
+            <td><font color=#333333><i>329</i></font></td>
+            <td><font color=#333333><i>329</i></font></td>
         </tr>
         
 
         <tr class="fde_row_0">
             <td style="border-right: 1px solid black">udp (5)</td>
-            <td><font color=#333333><i>267</i></font></td>
-            <td><font color=#333333><i>267</i></font></td>
-            <td><font color=#333333><i>267</i></font></td>
-            <td><font color=#333333><i>267</i></font></td>
+            <td><font color=#333333><i>263</i></font></td>
+            <td><font color=#333333><i>263</i></font></td>
+            <td><font color=#333333><i>263</i></font></td>
+            <td><font color=#333333><i>263</i></font></td>
         </tr>
         
 
         <tr class="fde_row_1">
             <td style="border-right: 1px solid black">tcp (4)</td>
-            <td><font color=#333333><i>298</i></font></td>
-            <td><font color=#333333><i>299</i></font></td>
-            <td><font color=#333333><i>335</i></font></td>
-            <td><font color=#333333><i>335</i></font></td>
+            <td><font color=#333333><i>294</i></font></td>
+            <td><font color=#333333><i>295</i></font></td>
+            <td><font color=#333333><i>329</i></font></td>
+            <td><font color=#333333><i>329</i></font></td>
         </tr>
         
 
         <tr class="fde_row_0">
             <td style="border-right: 1px solid black">tcp (4)</td>
-            <td><font color=#333333><i>336</i></font></td>
-            <td><font color=#333333><i>336</i></font></td>
-            <td><font color=#333333><i>337</i></font></td>
-            <td><font color=#333333><i>337</i></font></td>
+            <td><font color=#333333><i>330</i></font></td>
+            <td><font color=#333333><i>330</i></font></td>
+            <td><font color=#333333><i>331</i></font></td>
+            <td><font color=#333333><i>331</i></font></td>
         </tr>
         
 
         <tr class="fde_row_1">
             <td style="border-right: 1px solid black">tcp (4)</td>
-            <td><font color=#333333><i>267</i></font></td>
-            <td><font color=#333333><i>267</i></font></td>
-            <td><font color=#333333><i>267</i></font></td>
-            <td><font color=#333333><i>267</i></font></td>
+            <td><font color=#333333><i>263</i></font></td>
+            <td><font color=#333333><i>263</i></font></td>
+            <td><font color=#333333><i>263</i></font></td>
+            <td><font color=#333333><i>263</i></font></td>
         </tr>
         
 
         <tr class="fde_row_0">
             <td style="border-right: 1px solid black">tcp (4)</td>
-            <td><font color=#333333><i>268</i></font></td>
-            <td><font color=#333333><i>268</i></font></td>
-            <td><font color=#333333><i>268</i></font></td>
-            <td><font color=#333333><i>268</i></font></td>
+            <td><font color=#333333><i>264</i></font></td>
+            <td><font color=#333333><i>264</i></font></td>
+            <td><font color=#333333><i>264</i></font></td>
+            <td><font color=#333333><i>264</i></font></td>
         </tr>
         
 
         <tr class="fde_row_1">
             <td style="border-right: 1px solid black">tcp (4)</td>
-            <td><font color=#333333><i>269</i></font></td>
-            <td><font color=#333333><i>269</i></font></td>
-            <td><font color=#333333><i>269</i></font></td>
-            <td><font color=#333333><i>269</i></font></td>
+            <td><font color=#333333><i>265</i></font></td>
+            <td><font color=#333333><i>265</i></font></td>
+            <td><font color=#333333><i>265</i></font></td>
+            <td><font color=#333333><i>265</i></font></td>
         </tr>
         
 </table>
@@ -569,7 +569,7 @@
 </div></div><br><br>
 </td></tr>
 </table>
-<br><i>Created on Tue Sep 12 11:17:02 2017</i>
+<br><i>Created on Wed Sep 13 01:00:44 2017</i>
 
 <br><i>Compiler version: 5.1.0 (fca32d1)</i>
 
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/visualization/mau.html b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/visualization/mau.html
index 8f091ce..62496e9 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/visualization/mau.html
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/visualization/mau.html
@@ -69,10 +69,10 @@
 </tr>
 <tr>
 <td align="center">2</td>
+<td align="center">6</td>
+<td align="center">0</td>
+<td align="center">29</td>
 <td align="center">2</td>
-<td align="center">0</td>
-<td align="center">9</td>
-<td align="center">0</td>
 <td align="center">2</td>
 <td align="center">4</td>
 <td align="center">4</td>
@@ -289,10 +289,10 @@
 </tr>
 <tr>
 <td align="center">Totals</td>
-<td align="center">19</td>
+<td align="center">23</td>
 <td align="center">16</td>
-<td align="center">41</td>
-<td align="center">1</td>
+<td align="center">61</td>
+<td align="center">3</td>
 <td align="center">4</td>
 <td align="center">13</td>
 <td align="center">9</td>
@@ -372,10 +372,10 @@
 </tr>
 <tr>
 <td align="center">2</td>
-<td align="center" bgcolor="#07fe00" >1.56%</td>
+<td align="center" bgcolor="#17fe00" >4.69%</td>
 <td align="center" bgcolor="#00c000" >0.00%</td>
-<td align="center" bgcolor="#0bfe00" >2.16%</td>
-<td align="center" bgcolor="#00c000" >0.00%</td>
+<td align="center" bgcolor="#23fe00" >6.97%</td>
+<td align="center" bgcolor="#a9fe00" >33.33%</td>
 <td align="center" bgcolor="#3ffe00" >12.50%</td>
 <td align="center" bgcolor="#19fe00" >5.00%</td>
 <td align="center" bgcolor="#2afe00" >8.33%</td>
@@ -592,10 +592,10 @@
 </tr>
 <tr>
 <td align="center">Average</td>
-<td align="center" bgcolor="#06fe00" >1.24%</td>
+<td align="center" bgcolor="#07fe00" >1.50%</td>
 <td align="center" bgcolor="#0afe00" >2.02%</td>
-<td align="center" bgcolor="#04fe00" >0.82%</td>
-<td align="center" bgcolor="#07fe00" >1.39%</td>
+<td align="center" bgcolor="#06fe00" >1.22%</td>
+<td align="center" bgcolor="#15fe00" >4.17%</td>
 <td align="center" bgcolor="#0afe00" >2.08%</td>
 <td align="center" bgcolor="#06fe00" >1.35%</td>
 <td align="center" bgcolor="#07fe00" >1.56%</td>
@@ -618,31 +618,31 @@
 <text x="18" y="22" textLength="30" lengthAdjust="spacingAndGlyphs" textHeight="6" heightAdjust="spacingAndGlyphs" style="fill:black;">Crossbar</text>
 <rect x="16" y="32" width="8" height="8" style="stroke:black; stroke-width:1; fill:aquamarine""><title>Crossbar Byte 0 in exact Group 0 (parity group 0)
 contains:
-  {udp.dstPort[7:0]} for table table0__action__
+  {ipv4.dstAddr[7:0]} for table table0__action__
 </title></rect>
 <rect x="16" y="40" width="8" height="8" style="stroke:black; stroke-width:1; fill:aquamarine""><title>Crossbar Byte 1 in exact Group 0 (parity group 0)
 contains:
-  {udp.dstPort[15:8]} for table table0__action__
+  {ipv4.dstAddr[15:8]} for table table0__action__
 </title></rect>
 <rect x="16" y="48" width="8" height="8" style="stroke:black; stroke-width:1; fill:aquamarine""><title>Crossbar Byte 2 in exact Group 0 (parity group 0)
 contains:
-  {udp.srcPort[7:0]} for table table0__action__
+  {ipv4.dstAddr[23:16]} for table table0__action__
 </title></rect>
 <rect x="16" y="56" width="8" height="8" style="stroke:black; stroke-width:1; fill:aquamarine""><title>Crossbar Byte 3 in exact Group 0 (parity group 0)
 contains:
-  {udp.srcPort[15:8]} for table table0__action__
+  {tcp.dstPort[7:0]} for table table0__action__
 </title></rect>
 <rect x="24" y="32" width="8" height="8" style="stroke:black; stroke-width:1; fill:aquamarine""><title>Crossbar Byte 4 in exact Group 0 (parity group 0)
 contains:
-  {ipv4.dstAddr[7:0]} for table table0__action__
+  {ipv4.srcAddr[31:24]} for table table0__action__
 </title></rect>
 <rect x="24" y="40" width="8" height="8" style="stroke:black; stroke-width:1; fill:aquamarine""><title>Crossbar Byte 5 in exact Group 0 (parity group 0)
 contains:
-  {ipv4.dstAddr[15:8]} for table table0__action__
+  {tcp.srcPort[7:0]} for table table0__action__
 </title></rect>
 <rect x="24" y="48" width="8" height="8" style="stroke:black; stroke-width:1; fill:aquamarine""><title>Crossbar Byte 6 in exact Group 0 (parity group 0)
 contains:
-  {ipv4.dstAddr[23:16]} for table table0__action__
+  {tcp.dstPort[15:8]} for table table0__action__
 </title></rect>
 <rect x="24" y="56" width="8" height="8" style="stroke:black; stroke-width:1; fill:aquamarine""><title>Crossbar Byte 7 in exact Group 0 (parity group 0)
 contains:
@@ -650,7 +650,7 @@
 </title></rect>
 <rect x="40" y="32" width="8" height="8" style="stroke:black; stroke-width:1; fill:aquamarine""><title>Crossbar Byte 8 in exact Group 0 (parity group 1)
 contains:
-  {ipv4.srcAddr[31:24]} for table table0__action__
+  {ipv4.srcAddr[7:0]} for table table0__action__
 </title></rect>
 <rect x="40" y="40" width="8" height="8" style="stroke:black; stroke-width:1; fill:aquamarine""><title>Crossbar Byte 9 in exact Group 0 (parity group 1)
 contains:
@@ -658,7 +658,7 @@
 </title></rect>
 <rect x="40" y="48" width="8" height="8" style="stroke:black; stroke-width:1; fill:aquamarine""><title>Crossbar Byte 10 in exact Group 0 (parity group 1)
 contains:
-  {ipv4.srcAddr[7:0]} for table table0__action__
+  {tcp.srcPort[15:8]} for table table0__action__
 </title></rect>
 <rect x="40" y="56" width="8" height="8" style="stroke:black; stroke-width:1; fill:aquamarine""><title>Crossbar Byte 11 in exact Group 0 (parity group 1)
 contains:
@@ -3102,20 +3102,20 @@
  Unit: 4</title></rect>
 <rect x="608" y="56" width="8" height="8" style="stroke:black; stroke-width:1; fill:white""><title>16-bit ALU:
  Unit: 5</title></rect>
-<rect x="616" y="56" width="8" height="8" style="stroke:black; stroke-width:1; fill:blue""><title>16-bit ALU:
- Unit: 6
- Occupied By:
-For Match Table table0's action ecmp_group:
-   alu_a Instruction at PHV Container Number: 134 has bit width 23
-</title></rect>
+<rect x="616" y="56" width="8" height="8" style="stroke:black; stroke-width:1; fill:white""><title>16-bit ALU:
+ Unit: 6</title></rect>
 <rect x="624" y="56" width="8" height="8" style="stroke:black; stroke-width:1; fill:blue""><title>16-bit ALU:
  Unit: 7
  Occupied By:
 For Match Table table0's action ecmp_group:
    alu_a Instruction at PHV Container Number: 135 has bit width 23
 </title></rect>
-<rect x="600" y="64" width="8" height="8" style="stroke:black; stroke-width:1; fill:white""><title>16-bit ALU:
- Unit: 8</title></rect>
+<rect x="600" y="64" width="8" height="8" style="stroke:black; stroke-width:1; fill:blue""><title>16-bit ALU:
+ Unit: 8
+ Occupied By:
+For Match Table table0's action ecmp_group:
+   alu_a Instruction at PHV Container Number: 136 has bit width 23
+</title></rect>
 <rect x="608" y="64" width="8" height="8" style="stroke:black; stroke-width:1; fill:white""><title>16-bit ALU:
  Unit: 9</title></rect>
 <rect x="616" y="64" width="8" height="8" style="stroke:black; stroke-width:1; fill:white""><title>16-bit ALU:
@@ -3296,23 +3296,23 @@
  Unit: 1</title></rect>
 <rect x="656" y="48" width="8" height="8" style="stroke:black; stroke-width:1; fill:white""><title>8-bit ALU:
  Unit: 2</title></rect>
-<rect x="664" y="48" width="8" height="8" style="stroke:black; stroke-width:1; fill:burlywood""><title>8-bit ALU:
- Unit: 3
- Occupied By:
-For Match Table table0's action send_to_cpu:
-   deposit-field Instruction at PHV Container Number: 67 has bit width 20
-
-For Match Table process_packet_out_table's action _process_packet_out:
-   deposit-field Instruction at PHV Container Number: 67 has bit width 20
-</title></rect>
-<rect x="640" y="56" width="8" height="8" style="stroke:black; stroke-width:1; fill:blue""><title>8-bit ALU:
+<rect x="664" y="48" width="8" height="8" style="stroke:black; stroke-width:1; fill:white""><title>8-bit ALU:
+ Unit: 3</title></rect>
+<rect x="640" y="56" width="8" height="8" style="stroke:black; stroke-width:1; fill:burlywood""><title>8-bit ALU:
  Unit: 4
  Occupied By:
-For Match Table table0's action _drop:
+For Match Table table0's action send_to_cpu:
+   deposit-field Instruction at PHV Container Number: 68 has bit width 20
+
+For Match Table process_packet_out_table's action _process_packet_out:
    deposit-field Instruction at PHV Container Number: 68 has bit width 20
 </title></rect>
-<rect x="648" y="56" width="8" height="8" style="stroke:black; stroke-width:1; fill:white""><title>8-bit ALU:
- Unit: 5</title></rect>
+<rect x="648" y="56" width="8" height="8" style="stroke:black; stroke-width:1; fill:blue""><title>8-bit ALU:
+ Unit: 5
+ Occupied By:
+For Match Table table0's action _drop:
+   deposit-field Instruction at PHV Container Number: 69 has bit width 20
+</title></rect>
 <rect x="656" y="56" width="8" height="8" style="stroke:black; stroke-width:1; fill:white""><title>8-bit ALU:
  Unit: 6</title></rect>
 <rect x="664" y="56" width="8" height="8" style="stroke:black; stroke-width:1; fill:white""><title>8-bit ALU:
@@ -6252,20 +6252,32 @@
 <text x="18" y="22" textLength="30" lengthAdjust="spacingAndGlyphs" textHeight="6" heightAdjust="spacingAndGlyphs" style="fill:black;">Crossbar</text>
 <rect x="16" y="32" width="8" height="8" style="stroke:black; stroke-width:1; fill:cornflowerblue""><title>Crossbar Byte 0 in exact Group 0 (parity group 0)
 contains:
-  {ig_intr_md_for_tm.ucast_egress_port[7:0]} for table _condition_2
+  {ig_intr_md.ingress_port[7:0]} for table ingress_port_count_table
 </title></rect>
 <rect x="16" y="40" width="8" height="8" style="stroke:black; stroke-width:1; fill:cornflowerblue""><title>Crossbar Byte 1 in exact Group 0 (parity group 0)
 contains:
+  {unused[6:0], ig_intr_md.ingress_port[8:8]} for table ingress_port_count_table
+</title></rect>
+<rect x="16" y="48" width="8" height="8" style="stroke:black; stroke-width:1; fill:cornflowerblue""><title>Crossbar Byte 2 in exact Group 0 (parity group 0)
+contains:
+  {ig_intr_md_for_tm.ucast_egress_port[7:0]} for table _condition_2
+</title></rect>
+<rect x="16" y="56" width="8" height="8" style="stroke:black; stroke-width:1; fill:cornflowerblue""><title>Crossbar Byte 3 in exact Group 0 (parity group 0)
+contains:
   {unused[6:0], ig_intr_md_for_tm.ucast_egress_port[8:8]} for table _condition_2
 </title></rect>
-<rect x="16" y="48" width="8" height="8" style="stroke:black; stroke-width:1; fill:white""><title>Crossbar Byte 2 in exact Group 0 (parity group 0)</title></rect>
-<rect x="16" y="56" width="8" height="8" style="stroke:black; stroke-width:1; fill:white""><title>Crossbar Byte 3 in exact Group 0 (parity group 0)</title></rect>
 <rect x="24" y="32" width="8" height="8" style="stroke:black; stroke-width:1; fill:white""><title>Crossbar Byte 4 in exact Group 0 (parity group 0)</title></rect>
 <rect x="24" y="40" width="8" height="8" style="stroke:black; stroke-width:1; fill:white""><title>Crossbar Byte 5 in exact Group 0 (parity group 0)</title></rect>
 <rect x="24" y="48" width="8" height="8" style="stroke:black; stroke-width:1; fill:white""><title>Crossbar Byte 6 in exact Group 0 (parity group 0)</title></rect>
 <rect x="24" y="56" width="8" height="8" style="stroke:black; stroke-width:1; fill:white""><title>Crossbar Byte 7 in exact Group 0 (parity group 0)</title></rect>
-<rect x="40" y="32" width="8" height="8" style="stroke:black; stroke-width:1; fill:white""><title>Crossbar Byte 8 in exact Group 0 (parity group 1)</title></rect>
-<rect x="40" y="40" width="8" height="8" style="stroke:black; stroke-width:1; fill:white""><title>Crossbar Byte 9 in exact Group 0 (parity group 1)</title></rect>
+<rect x="40" y="32" width="8" height="8" style="stroke:black; stroke-width:1; fill:crimson""><title>Crossbar Byte 8 in exact Group 0 (parity group 1)
+contains:
+  {ig_intr_md_for_tm.ucast_egress_port[7:0]} for table egress_port_count_table
+</title></rect>
+<rect x="40" y="40" width="8" height="8" style="stroke:black; stroke-width:1; fill:crimson""><title>Crossbar Byte 9 in exact Group 0 (parity group 1)
+contains:
+  {unused[6:0], ig_intr_md_for_tm.ucast_egress_port[8:8]} for table egress_port_count_table
+</title></rect>
 <rect x="40" y="48" width="8" height="8" style="stroke:black; stroke-width:1; fill:white""><title>Crossbar Byte 10 in exact Group 0 (parity group 1)</title></rect>
 <rect x="40" y="56" width="8" height="8" style="stroke:black; stroke-width:1; fill:white""><title>Crossbar Byte 11 in exact Group 0 (parity group 1)</title></rect>
 <rect x="48" y="32" width="8" height="8" style="stroke:black; stroke-width:1; fill:white""><title>Crossbar Byte 12 in exact Group 0 (parity group 1)</title></rect>
@@ -6632,7 +6644,7 @@
  Unit Number: 42
  Entry Bit Width: 128
  Depth: 1024</title></rect>
-<rect x="360" y="104" width="16" height="16" style="stroke:black; stroke-width:1; fill:crimson""><title>SRAM:
+<rect x="360" y="104" width="16" height="16" style="stroke:black; stroke-width:1; fill:cyan""><title>SRAM:
  Row: 4  Col: 6
  Unit Number: 54
  Entry Bit Width: 128
@@ -6665,7 +6677,7 @@
  Unit Number: 66
  Entry Bit Width: 128
  Depth: 1024</title></rect>
-<rect x="360" y="56" width="16" height="16" style="stroke:black; stroke-width:1; fill:cyan""><title>SRAM:
+<rect x="360" y="56" width="16" height="16" style="stroke:black; stroke-width:1; fill:limegreen""><title>SRAM:
  Row: 6  Col: 6
  Unit Number: 78
  Entry Bit Width: 128
@@ -6718,7 +6730,7 @@
  Unit Number: 43
  Entry Bit Width: 128
  Depth: 1024</title></rect>
-<rect x="384" y="104" width="16" height="16" style="stroke:black; stroke-width:1; fill:crimson""><title>SRAM:
+<rect x="384" y="104" width="16" height="16" style="stroke:black; stroke-width:1; fill:cyan""><title>SRAM:
  Row: 4  Col: 7
  Unit Number: 55
  Entry Bit Width: 128
@@ -6751,7 +6763,7 @@
  Unit Number: 67
  Entry Bit Width: 128
  Depth: 1024</title></rect>
-<rect x="384" y="56" width="16" height="16" style="stroke:black; stroke-width:1; fill:cyan""><title>SRAM:
+<rect x="384" y="56" width="16" height="16" style="stroke:black; stroke-width:1; fill:limegreen""><title>SRAM:
  Row: 6  Col: 7
  Unit Number: 79
  Entry Bit Width: 128
@@ -7090,9 +7102,12 @@
  Result Bit width: 1
  Depth: 512</title></rect>
 <text x="82" y="254" textLength="46" lengthAdjust="spacingAndGlyphs" textHeight="6" heightAdjust="spacingAndGlyphs" style="fill:black;">Hash Distr.</text>
-<rect x="80" y="264" width="8" height="8" style="stroke:black; stroke-width:1; fill:white""><title>Hash Distribution Group:
+<rect x="80" y="264" width="8" height="8" style="stroke:black; stroke-width:1; fill:cornflowerblue""><title>Hash Distribution Group:
  Hash ID: 0
  Group ID: 0
+
+ Occupied By:
+ingress_port_count_table
 </title></rect>
 <rect x="88" y="264" width="8" height="8" style="stroke:black; stroke-width:1; fill:white""><title>Hash Distribution Group:
  Hash ID: 0
@@ -7102,9 +7117,12 @@
  Hash ID: 0
  Group ID: 2
 </title></rect>
-<rect x="104" y="264" width="8" height="8" style="stroke:black; stroke-width:1; fill:white""><title>Hash Distribution Group:
+<rect x="104" y="264" width="8" height="8" style="stroke:black; stroke-width:1; fill:crimson""><title>Hash Distribution Group:
  Hash ID: 1
  Group ID: 0
+
+ Occupied By:
+egress_port_count_table
 </title></rect>
 <rect x="112" y="264" width="8" height="8" style="stroke:black; stroke-width:1; fill:white""><title>Hash Distribution Group:
  Hash ID: 1
@@ -7115,16 +7133,26 @@
  Group ID: 2
 </title></rect>
 <text x="170" y="238" textLength="46" lengthAdjust="spacingAndGlyphs" textHeight="6" heightAdjust="spacingAndGlyphs" style="fill:black;">Hash Bits</text>
-<rect x="176" y="248" width="8" height="8" style="stroke:black; stroke-width:1; fill:white""><title>Hash Bit 0 in hash match group 0</title></rect>
-<rect x="184" y="248" width="8" height="8" style="stroke:black; stroke-width:1; fill:white""><title>Hash Bit 1 in hash match group 0</title></rect>
-<rect x="192" y="248" width="8" height="8" style="stroke:black; stroke-width:1; fill:white""><title>Hash Bit 2 in hash match group 0</title></rect>
-<rect x="200" y="248" width="8" height="8" style="stroke:black; stroke-width:1; fill:white""><title>Hash Bit 3 in hash match group 0</title></rect>
-<rect x="208" y="248" width="8" height="8" style="stroke:black; stroke-width:1; fill:white""><title>Hash Bit 4 in hash match group 0</title></rect>
-<rect x="216" y="248" width="8" height="8" style="stroke:black; stroke-width:1; fill:white""><title>Hash Bit 5 in hash match group 0</title></rect>
-<rect x="224" y="248" width="8" height="8" style="stroke:black; stroke-width:1; fill:white""><title>Hash Bit 6 in hash match group 0</title></rect>
-<rect x="232" y="248" width="8" height="8" style="stroke:black; stroke-width:1; fill:white""><title>Hash Bit 7 in hash match group 0</title></rect>
-<rect x="240" y="248" width="8" height="8" style="stroke:black; stroke-width:1; fill:white""><title>Hash Bit 8 in hash match group 0</title></rect>
-<rect x="248" y="248" width="8" height="8" style="stroke:black; stroke-width:1; fill:white""><title>Hash Bit 9 in hash match group 0</title></rect>
+<rect x="176" y="248" width="8" height="8" style="stroke:black; stroke-width:1; fill:cornflowerblue""><title>Hash Bit 0 in hash match group 0
+Occupied by: ingress_port_count_table for Statistics Address</title></rect>
+<rect x="184" y="248" width="8" height="8" style="stroke:black; stroke-width:1; fill:cornflowerblue""><title>Hash Bit 1 in hash match group 0
+Occupied by: ingress_port_count_table for Statistics Address</title></rect>
+<rect x="192" y="248" width="8" height="8" style="stroke:black; stroke-width:1; fill:cornflowerblue""><title>Hash Bit 2 in hash match group 0
+Occupied by: ingress_port_count_table for Statistics Address</title></rect>
+<rect x="200" y="248" width="8" height="8" style="stroke:black; stroke-width:1; fill:cornflowerblue""><title>Hash Bit 3 in hash match group 0
+Occupied by: ingress_port_count_table for Statistics Address</title></rect>
+<rect x="208" y="248" width="8" height="8" style="stroke:black; stroke-width:1; fill:cornflowerblue""><title>Hash Bit 4 in hash match group 0
+Occupied by: ingress_port_count_table for Statistics Address</title></rect>
+<rect x="216" y="248" width="8" height="8" style="stroke:black; stroke-width:1; fill:cornflowerblue""><title>Hash Bit 5 in hash match group 0
+Occupied by: ingress_port_count_table for Statistics Address</title></rect>
+<rect x="224" y="248" width="8" height="8" style="stroke:black; stroke-width:1; fill:cornflowerblue""><title>Hash Bit 6 in hash match group 0
+Occupied by: ingress_port_count_table for Statistics Address</title></rect>
+<rect x="232" y="248" width="8" height="8" style="stroke:black; stroke-width:1; fill:cornflowerblue""><title>Hash Bit 7 in hash match group 0
+Occupied by: ingress_port_count_table for Statistics Address</title></rect>
+<rect x="240" y="248" width="8" height="8" style="stroke:black; stroke-width:1; fill:cornflowerblue""><title>Hash Bit 8 in hash match group 0
+Occupied by: ingress_port_count_table for Statistics Address</title></rect>
+<rect x="248" y="248" width="8" height="8" style="stroke:black; stroke-width:1; fill:cornflowerblue""><title>Hash Bit 9 in hash match group 0
+Occupied by: ingress_port_count_table for Statistics Address</title></rect>
 <rect x="256" y="248" width="8" height="8" style="stroke:black; stroke-width:1; fill:white""><title>Hash Bit 10 in hash match group 0</title></rect>
 <rect x="264" y="248" width="8" height="8" style="stroke:black; stroke-width:1; fill:white""><title>Hash Bit 11 in hash match group 0</title></rect>
 <rect x="272" y="248" width="8" height="8" style="stroke:black; stroke-width:1; fill:white""><title>Hash Bit 12 in hash match group 0</title></rect>
@@ -7176,16 +7204,26 @@
 <rect x="256" y="272" width="8" height="8" style="stroke:black; stroke-width:1; fill:white""><title>Hash Bit 49 in hash match group 0</title></rect>
 <rect x="264" y="272" width="8" height="8" style="stroke:black; stroke-width:1; fill:white""><title>Hash Bit 50 in hash match group 0</title></rect>
 <rect x="272" y="272" width="8" height="8" style="stroke:black; stroke-width:1; fill:white""><title>Hash Bit 51 in hash match group 0</title></rect>
-<rect x="296" y="248" width="8" height="8" style="stroke:black; stroke-width:1; fill:white""><title>Hash Bit 0 in hash match group 1</title></rect>
-<rect x="304" y="248" width="8" height="8" style="stroke:black; stroke-width:1; fill:white""><title>Hash Bit 1 in hash match group 1</title></rect>
-<rect x="312" y="248" width="8" height="8" style="stroke:black; stroke-width:1; fill:white""><title>Hash Bit 2 in hash match group 1</title></rect>
-<rect x="320" y="248" width="8" height="8" style="stroke:black; stroke-width:1; fill:white""><title>Hash Bit 3 in hash match group 1</title></rect>
-<rect x="328" y="248" width="8" height="8" style="stroke:black; stroke-width:1; fill:white""><title>Hash Bit 4 in hash match group 1</title></rect>
-<rect x="336" y="248" width="8" height="8" style="stroke:black; stroke-width:1; fill:white""><title>Hash Bit 5 in hash match group 1</title></rect>
-<rect x="344" y="248" width="8" height="8" style="stroke:black; stroke-width:1; fill:white""><title>Hash Bit 6 in hash match group 1</title></rect>
-<rect x="352" y="248" width="8" height="8" style="stroke:black; stroke-width:1; fill:white""><title>Hash Bit 7 in hash match group 1</title></rect>
-<rect x="360" y="248" width="8" height="8" style="stroke:black; stroke-width:1; fill:white""><title>Hash Bit 8 in hash match group 1</title></rect>
-<rect x="368" y="248" width="8" height="8" style="stroke:black; stroke-width:1; fill:white""><title>Hash Bit 9 in hash match group 1</title></rect>
+<rect x="296" y="248" width="8" height="8" style="stroke:black; stroke-width:1; fill:crimson""><title>Hash Bit 0 in hash match group 1
+Occupied by: egress_port_count_table for Statistics Address</title></rect>
+<rect x="304" y="248" width="8" height="8" style="stroke:black; stroke-width:1; fill:crimson""><title>Hash Bit 1 in hash match group 1
+Occupied by: egress_port_count_table for Statistics Address</title></rect>
+<rect x="312" y="248" width="8" height="8" style="stroke:black; stroke-width:1; fill:crimson""><title>Hash Bit 2 in hash match group 1
+Occupied by: egress_port_count_table for Statistics Address</title></rect>
+<rect x="320" y="248" width="8" height="8" style="stroke:black; stroke-width:1; fill:crimson""><title>Hash Bit 3 in hash match group 1
+Occupied by: egress_port_count_table for Statistics Address</title></rect>
+<rect x="328" y="248" width="8" height="8" style="stroke:black; stroke-width:1; fill:crimson""><title>Hash Bit 4 in hash match group 1
+Occupied by: egress_port_count_table for Statistics Address</title></rect>
+<rect x="336" y="248" width="8" height="8" style="stroke:black; stroke-width:1; fill:crimson""><title>Hash Bit 5 in hash match group 1
+Occupied by: egress_port_count_table for Statistics Address</title></rect>
+<rect x="344" y="248" width="8" height="8" style="stroke:black; stroke-width:1; fill:crimson""><title>Hash Bit 6 in hash match group 1
+Occupied by: egress_port_count_table for Statistics Address</title></rect>
+<rect x="352" y="248" width="8" height="8" style="stroke:black; stroke-width:1; fill:crimson""><title>Hash Bit 7 in hash match group 1
+Occupied by: egress_port_count_table for Statistics Address</title></rect>
+<rect x="360" y="248" width="8" height="8" style="stroke:black; stroke-width:1; fill:crimson""><title>Hash Bit 8 in hash match group 1
+Occupied by: egress_port_count_table for Statistics Address</title></rect>
+<rect x="368" y="248" width="8" height="8" style="stroke:black; stroke-width:1; fill:crimson""><title>Hash Bit 9 in hash match group 1
+Occupied by: egress_port_count_table for Statistics Address</title></rect>
 <rect x="376" y="248" width="8" height="8" style="stroke:black; stroke-width:1; fill:white""><title>Hash Bit 10 in hash match group 1</title></rect>
 <rect x="384" y="248" width="8" height="8" style="stroke:black; stroke-width:1; fill:white""><title>Hash Bit 11 in hash match group 1</title></rect>
 <rect x="392" y="248" width="8" height="8" style="stroke:black; stroke-width:1; fill:white""><title>Hash Bit 12 in hash match group 1</title></rect>
@@ -7597,7 +7635,7 @@
  Unit: 13
  Entry Bit Width: 44
  Depth: 4</title></rect>
-<rect x="72" y="40" width="8" height="8" style="stroke:black; stroke-width:1; fill:limegreen""><title>Gateway Table Gateway:
+<rect x="72" y="40" width="8" height="8" style="stroke:black; stroke-width:1; fill:darkorange""><title>Gateway Table Gateway:
  Unit: 14
  Entry Bit Width: 44
  Depth: 4
@@ -7809,7 +7847,7 @@
  Unit Number: 23
  Entry Bit Width: 11
  Depth: 1024</title></rect>
-<rect x="280" y="104" width="8" height="8" style="stroke:black; stroke-width:1; fill:crimson""><title>Map RAM:
+<rect x="280" y="104" width="8" height="8" style="stroke:black; stroke-width:1; fill:cyan""><title>Map RAM:
  Row: 4  Unit: 0
  Unit Number: 24
  Entry Bit Width: 11
@@ -7817,7 +7855,7 @@
  Occupied By: ingress_port_counter
  Used For: synthetic two port
  </title></rect>
-<rect x="288" y="104" width="8" height="8" style="stroke:black; stroke-width:1; fill:crimson""><title>Map RAM:
+<rect x="288" y="104" width="8" height="8" style="stroke:black; stroke-width:1; fill:cyan""><title>Map RAM:
  Row: 4  Unit: 1
  Unit Number: 25
  Entry Bit Width: 11
@@ -7875,7 +7913,7 @@
  Unit Number: 35
  Entry Bit Width: 11
  Depth: 1024</title></rect>
-<rect x="280" y="56" width="8" height="8" style="stroke:black; stroke-width:1; fill:cyan""><title>Map RAM:
+<rect x="280" y="56" width="8" height="8" style="stroke:black; stroke-width:1; fill:limegreen""><title>Map RAM:
  Row: 6  Unit: 0
  Unit Number: 36
  Entry Bit Width: 11
@@ -7883,7 +7921,7 @@
  Occupied By: egress_port_counter
  Used For: synthetic two port
  </title></rect>
-<rect x="288" y="56" width="8" height="8" style="stroke:black; stroke-width:1; fill:cyan""><title>Map RAM:
+<rect x="288" y="56" width="8" height="8" style="stroke:black; stroke-width:1; fill:limegreen""><title>Map RAM:
  Row: 6  Unit: 1
  Unit Number: 37
  Entry Bit Width: 11
@@ -7946,10 +7984,10 @@
  Unit: 0 right</title></rect>
 <rect x="336" y="152" width="8" height="8" style="stroke:black; stroke-width:1; fill:white""><title>128-bit Statistics ALU:
  Unit: 2 right</title></rect>
-<rect x="336" y="104" width="8" height="8" style="stroke:black; stroke-width:1; fill:crimson""><title>128-bit Statistics ALU:
+<rect x="336" y="104" width="8" height="8" style="stroke:black; stroke-width:1; fill:cyan""><title>128-bit Statistics ALU:
  Unit: 4 right
  Occupied By: ingress_port_counter</title></rect>
-<rect x="336" y="56" width="8" height="8" style="stroke:black; stroke-width:1; fill:cyan""><title>128-bit Statistics ALU:
+<rect x="336" y="56" width="8" height="8" style="stroke:black; stroke-width:1; fill:limegreen""><title>128-bit Statistics ALU:
  Unit: 6 right
  Occupied By: egress_port_counter</title></rect>
 <rect x="336" y="176" width="8" height="8" style="stroke:black; stroke-width:1; fill:white""><title>128-bit Meter ALU:
@@ -8421,7 +8459,7 @@
  ID: 0
 
  Occupied By: ingress_port_count_table</title></rect>
-<rect x="192" y="600" width="8" height="8" style="stroke:black; stroke-width:1; fill:darkorange""><title>Logical Table ID:
+<rect x="192" y="600" width="8" height="8" style="stroke:black; stroke-width:1; fill:crimson""><title>Logical Table ID:
  ID: 1
 
  Occupied By: egress_port_count_table</title></rect>
@@ -8468,7 +8506,7 @@
  ID: 15
 </title></rect>
 <text x="562" y="22" textLength="94" lengthAdjust="spacingAndGlyphs" textHeight="6" heightAdjust="spacingAndGlyphs" style="fill:black;">PHV Container Activity</text>
-<rect x="560" y="48" width="8" height="8" style="stroke:black; stroke-width:1; fill:darkorange""><title>32-bit ALU:
+<rect x="560" y="48" width="8" height="8" style="stroke:black; stroke-width:1; fill:crimson""><title>32-bit ALU:
  Unit: 0
  Occupied By:
 For Match Table ingress_port_count_table's action count_ingress:
@@ -8927,13 +8965,13 @@
 <text x="610" y="38" textLength="14" lengthAdjust="spacingAndGlyphs" textHeight="6" heightAdjust="spacingAndGlyphs" style="fill:black;">16</text>
 <text x="650" y="38" textLength="14" lengthAdjust="spacingAndGlyphs" textHeight="6" heightAdjust="spacingAndGlyphs" style="fill:black;">8</text>
 <text x="722" y="54"   style="fill:black; font-weight:bold;">Legend</text>
-<rect x="720" y="64" width="16" height="16" style="stroke:black; stroke-width:1; fill:darkorange""><title>egress_port_count_table</title></rect>
+<rect x="720" y="64" width="16" height="16" style="stroke:black; stroke-width:1; fill:crimson""><title>egress_port_count_table</title></rect>
 <text x="738" y="78"   style="fill:black;">egress_port_count_table</text>
-<rect x="720" y="88" width="16" height="16" style="stroke:black; stroke-width:1; fill:cyan""><title>egress_port_counter</title></rect>
+<rect x="720" y="88" width="16" height="16" style="stroke:black; stroke-width:1; fill:limegreen""><title>egress_port_counter</title></rect>
 <text x="738" y="102"   style="fill:black;">egress_port_counter</text>
 <rect x="720" y="112" width="16" height="16" style="stroke:black; stroke-width:1; fill:cornflowerblue""><title>ingress_port_count_table</title></rect>
 <text x="738" y="126"   style="fill:black;">ingress_port_count_table</text>
-<rect x="720" y="136" width="16" height="16" style="stroke:black; stroke-width:1; fill:crimson""><title>ingress_port_counter</title></rect>
+<rect x="720" y="136" width="16" height="16" style="stroke:black; stroke-width:1; fill:cyan""><title>ingress_port_counter</title></rect>
 <text x="738" y="150"   style="fill:black;">ingress_port_counter</text>
 <rect x="720" y="168" width="16" height="16" style="stroke:black; stroke-width:1; fill:gray""><title>Unavailable</title></rect>
 
@@ -8944,13 +8982,13 @@
 <rect x="712" y="32" width="224" height="168" style="stroke:black; stroke-width:1; fill:none""></rect>
 <text x="978" y="54"   style="fill:black;">Totals</text>
 <text x="986" y="78"   style="fill:black;">Exact Match Input xbar</text>
-<text x="994" y="102"   style="fill:black;">  2 of 128 (1.56%)</text>
+<text x="994" y="102"   style="fill:black;">  6 of 128 (4.69%)</text>
 <text x="986" y="126"   style="fill:black;">Ternary Match Input xbar</text>
 <text x="994" y="150"   style="fill:black;">  0 of 66 (0.00%)</text>
 <text x="986" y="174"   style="fill:black;">Hash Bit</text>
-<text x="994" y="198"   style="fill:black;">  9 of 416 (2.16%)</text>
+<text x="994" y="198"   style="fill:black;">  29 of 416 (6.97%)</text>
 <text x="986" y="222"   style="fill:black;">Hash Dist Unit</text>
-<text x="994" y="246"   style="fill:black;">  0 of 6 (0.00%)</text>
+<text x="994" y="246"   style="fill:black;">  2 of 6 (33.33%)</text>
 <text x="986" y="270"   style="fill:black;">Gateway</text>
 <text x="994" y="294"   style="fill:black;">  2 of 16 (12.50%)</text>
 <text x="986" y="318"   style="fill:black;">SRAM</text>
@@ -32224,7 +32262,7 @@
 </svg><br>
 
 
-<br><i>Created on Tue Sep 12 11:16:59 2017</i>
+<br><i>Created on Wed Sep 13 01:00:40 2017</i>
 <br><i>Compiler version: 5.1.0 (fca32d1)</i>
 </div>
 </body>
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/visualization/parser.egress.html b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/visualization/parser.egress.html
index a344e7b..d6ececa 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/visualization/parser.egress.html
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/visualization/parser.egress.html
@@ -1169,19 +1169,19 @@
 <td><center>0</center></td>
 <td><center>1</center></td>
 <td><center>0</center></td>
-<td><center>14e</center></td>
+<td><center>148</center></td>
 <td><center>0</center></td>
-<td><center>14c</center></td>
-<td><center>14d</center></td>
-<td><center>108</center></td>
+<td><center>146</center></td>
+<td><center>147</center></td>
+<td><center>104</center></td>
 <td><center>0</center></td>
 <td><center>0</center></td>
 <td><center>0</center></td>
 <td><center>0</center></td>
-<td><center>129</center></td>
+<td><center>125</center></td>
 <td><center>1ff</center></td>
 <td><center>51</center></td>
-<td><center>128</center></td>
+<td><center>124</center></td>
 <td><center>0</center></td>
 <td><center>0</center></td>
 <td><center>1</center></td>
@@ -1202,9 +1202,9 @@
 <td><center>0</center></td>
 <td><center>0</center></td>
 <td><center>0</center></td>
-<td><center>109</center></td>
+<td><center>105</center></td>
 <td><center>0</center></td>
-<td><center>10a</center></td>
+<td><center>106</center></td>
 <td><center>c</center></td>
 <td><center>8</center></td>
 <td><center>0</center></td>
@@ -1338,28 +1338,28 @@
 </tr><tr>
 <td valign=top align=right><font size=-3>Extractions&nbsp;&nbsp;&nbsp;</font></td>
 <td height=1 style="position: relative">
-<div class="extr_arrow" style="width:27px; top: 0px;">296</div>
+<div class="extr_arrow" style="width:27px; top: 0px;">292</div>
 </td>
 <td height=1 style="position: relative">
-<div class="extr_arrow" style="width:27px; top: 0px;">297</div>
+<div class="extr_arrow" style="width:27px; top: 0px;">293</div>
 </td>
 <td height=1 style="position: relative">
-<div class="extr_arrow" style="width:54px; top: 0px;">332</div>
+<div class="extr_arrow" style="width:54px; top: 0px;">326</div>
 </td>
 <td height=1 style="position: relative">
 </td>
 <td height=1 style="position: relative">
-<div class="extr_arrow" style="width:54px; top: 0px;">333</div>
+<div class="extr_arrow" style="width:54px; top: 0px;">327</div>
 </td>
 <td height=1 style="position: relative">
 </td>
 <td height=1 style="position: relative">
-<div class="extr_arrow" style="width:54px; top: 0px;">334</div>
+<div class="extr_arrow" style="width:54px; top: 0px;">328</div>
 </td>
 <td height=1 style="position: relative">
 </td>
 <td height=1 style="position: relative">
-<div class="extr_arrow" style="width:108px; top: 0px;">264</div>
+<div class="extr_arrow" style="width:108px; top: 0px;">260</div>
 </td>
 <td height=1 style="position: relative">
 </td>
@@ -1368,7 +1368,7 @@
 <td height=1 style="position: relative">
 </td>
 <td height=1 style="position: relative">
-<div class="extr_arrow" style="width:108px; top: 0px;">265</div>
+<div class="extr_arrow" style="width:108px; top: 0px;">261</div>
 </td>
 <td height=1 style="position: relative">
 </td>
@@ -1377,7 +1377,7 @@
 <td height=1 style="position: relative">
 </td>
 <td height=1 style="position: relative">
-<div class="extr_arrow" style="width:108px; top: 0px;">266</div>
+<div class="extr_arrow" style="width:108px; top: 0px;">262</div>
 </td>
 <td height=1 style="position: relative">
 </td>
@@ -1971,19 +1971,19 @@
 <td><center>0</center></td>
 <td><center>1</center></td>
 <td><center>0</center></td>
-<td><center>151</center></td>
+<td><center>14b</center></td>
 <td><center>0</center></td>
-<td><center>14f</center></td>
-<td><center>150</center></td>
-<td><center>10b</center></td>
+<td><center>149</center></td>
+<td><center>14a</center></td>
+<td><center>107</center></td>
 <td><center>0</center></td>
 <td><center>0</center></td>
 <td><center>0</center></td>
 <td><center>0</center></td>
-<td><center>12b</center></td>
+<td><center>127</center></td>
 <td><center>1ff</center></td>
 <td><center>51</center></td>
-<td><center>12a</center></td>
+<td><center>126</center></td>
 <td><center>0</center></td>
 <td><center>0</center></td>
 <td><center>1</center></td>
@@ -2004,9 +2004,9 @@
 <td><center>0</center></td>
 <td><center>0</center></td>
 <td><center>0</center></td>
-<td><center>10c</center></td>
+<td><center>108</center></td>
 <td><center>0</center></td>
-<td><center>10d</center></td>
+<td><center>109</center></td>
 <td><center>c</center></td>
 <td><center>8</center></td>
 <td><center>0</center></td>
@@ -2138,28 +2138,28 @@
 </tr><tr>
 <td valign=top align=right><font size=-3>Extractions&nbsp;&nbsp;&nbsp;</font></td>
 <td height=1 style="position: relative">
-<div class="extr_arrow" style="width:27px; top: 0px;">298</div>
+<div class="extr_arrow" style="width:27px; top: 0px;">294</div>
 </td>
 <td height=1 style="position: relative">
-<div class="extr_arrow" style="width:27px; top: 0px;">299</div>
+<div class="extr_arrow" style="width:27px; top: 0px;">295</div>
 </td>
 <td height=1 style="position: relative">
-<div class="extr_arrow" style="width:54px; top: 0px;">335</div>
+<div class="extr_arrow" style="width:54px; top: 0px;">329</div>
 </td>
 <td height=1 style="position: relative">
 </td>
 <td height=1 style="position: relative">
-<div class="extr_arrow" style="width:54px; top: 0px;">336</div>
+<div class="extr_arrow" style="width:54px; top: 0px;">330</div>
 </td>
 <td height=1 style="position: relative">
 </td>
 <td height=1 style="position: relative">
-<div class="extr_arrow" style="width:54px; top: 0px;">337</div>
+<div class="extr_arrow" style="width:54px; top: 0px;">331</div>
 </td>
 <td height=1 style="position: relative">
 </td>
 <td height=1 style="position: relative">
-<div class="extr_arrow" style="width:108px; top: 0px;">267</div>
+<div class="extr_arrow" style="width:108px; top: 0px;">263</div>
 </td>
 <td height=1 style="position: relative">
 </td>
@@ -2168,7 +2168,7 @@
 <td height=1 style="position: relative">
 </td>
 <td height=1 style="position: relative">
-<div class="extr_arrow" style="width:108px; top: 0px;">268</div>
+<div class="extr_arrow" style="width:108px; top: 0px;">264</div>
 </td>
 <td height=1 style="position: relative">
 </td>
@@ -2177,7 +2177,7 @@
 <td height=1 style="position: relative">
 </td>
 <td height=1 style="position: relative">
-<div class="extr_arrow" style="width:108px; top: 0px;">269</div>
+<div class="extr_arrow" style="width:108px; top: 0px;">265</div>
 </td>
 <td height=1 style="position: relative">
 </td>
@@ -2370,17 +2370,17 @@
 <td><center>0</center></td>
 <td><center>1ff</center></td>
 <td><center>0</center></td>
-<td><center>150</center></td>
+<td><center>149</center></td>
 <td><center>1ff</center></td>
-<td><center>10b</center></td>
+<td><center>107</center></td>
 <td><center>0</center></td>
 <td><center>0</center></td>
 <td><center>0</center></td>
 <td><center>0</center></td>
-<td><center>12b</center></td>
+<td><center>127</center></td>
 <td><center>1ff</center></td>
 <td><center>51</center></td>
-<td><center>12a</center></td>
+<td><center>126</center></td>
 <td><center>0</center></td>
 <td><center>0</center></td>
 <td><center>1</center></td>
@@ -2535,18 +2535,18 @@
 </tr><tr>
 <td valign=top align=right><font size=-3>Extractions&nbsp;&nbsp;&nbsp;</font></td>
 <td height=1 style="position: relative">
-<div class="extr_arrow" style="width:27px; top: 0px;">298</div>
+<div class="extr_arrow" style="width:27px; top: 0px;">294</div>
 </td>
 <td height=1 style="position: relative">
-<div class="extr_arrow" style="width:27px; top: 0px;">299</div>
+<div class="extr_arrow" style="width:27px; top: 0px;">295</div>
 </td>
 <td height=1 style="position: relative">
-<div class="extr_arrow" style="width:54px; top: 0px;">336</div>
+<div class="extr_arrow" style="width:54px; top: 0px;">329</div>
 </td>
 <td height=1 style="position: relative">
 </td>
 <td height=1 style="position: relative">
-<div class="extr_arrow" style="width:108px; top: 0px;">267</div>
+<div class="extr_arrow" style="width:108px; top: 0px;">263</div>
 </td>
 <td height=1 style="position: relative">
 </td>
@@ -3150,7 +3150,7 @@
 <td><center>0</center></td>
 <td><center>1ff</center></td>
 <td><center>0</center></td>
-<td><center>154</center></td>
+<td><center>14e</center></td>
 <td><center>1ff</center></td>
 <td><center>1ff</center></td>
 <td><center>0</center></td>
@@ -3315,7 +3315,7 @@
 </tr><tr>
 <td valign=top align=right><font size=-3>Extractions&nbsp;&nbsp;&nbsp;</font></td>
 <td height=1 style="position: relative">
-<div class="extr_arrow" style="width:54px; top: 0px;">340</div>
+<div class="extr_arrow" style="width:54px; top: 0px;">334</div>
 </td>
 <td height=1 style="position: relative">
 </td>
@@ -3546,17 +3546,17 @@
 <td><center>0</center></td>
 <td><center>1ff</center></td>
 <td><center>0</center></td>
-<td><center>152</center></td>
-<td><center>153</center></td>
-<td><center>10e</center></td>
+<td><center>14c</center></td>
+<td><center>14d</center></td>
+<td><center>10a</center></td>
 <td><center>0</center></td>
 <td><center>0</center></td>
 <td><center>0</center></td>
 <td><center>0</center></td>
-<td><center>12d</center></td>
+<td><center>129</center></td>
 <td><center>1ff</center></td>
 <td><center>51</center></td>
-<td><center>12c</center></td>
+<td><center>128</center></td>
 <td><center>0</center></td>
 <td><center>0</center></td>
 <td><center>1</center></td>
@@ -3577,7 +3577,7 @@
 <td><center>0</center></td>
 <td><center>0</center></td>
 <td><center>0</center></td>
-<td><center>10f</center></td>
+<td><center>10b</center></td>
 <td><center>0</center></td>
 <td><center>1ff</center></td>
 <td><center>8</center></td>
@@ -3712,10 +3712,10 @@
 </tr><tr>
 <td valign=top align=right><font size=-3>Extractions&nbsp;&nbsp;&nbsp;</font></td>
 <td height=1 style="position: relative">
-<div class="extr_arrow" style="width:27px; top: 0px;">300</div>
+<div class="extr_arrow" style="width:27px; top: 0px;">296</div>
 </td>
 <td height=1 style="position: relative">
-<div class="extr_arrow" style="width:108px; top: 0px;">270</div>
+<div class="extr_arrow" style="width:108px; top: 0px;">266</div>
 </td>
 <td height=1 style="position: relative">
 </td>
@@ -3724,15 +3724,15 @@
 <td height=1 style="position: relative">
 </td>
 <td height=1 style="position: relative">
-<div class="extr_arrow" style="width:54px; top: 0px;">338</div>
+<div class="extr_arrow" style="width:54px; top: 0px;">332</div>
 </td>
 <td height=1 style="position: relative">
 </td>
 <td height=1 style="position: relative">
-<div class="extr_arrow" style="width:27px; top: 0px;">301</div>
+<div class="extr_arrow" style="width:27px; top: 0px;">297</div>
 </td>
 <td height=1 style="position: relative">
-<div class="extr_arrow" style="width:108px; top: 0px;">271</div>
+<div class="extr_arrow" style="width:108px; top: 0px;">267</div>
 </td>
 <td height=1 style="position: relative">
 </td>
@@ -3741,7 +3741,7 @@
 <td height=1 style="position: relative">
 </td>
 <td height=1 style="position: relative">
-<div class="extr_arrow" style="width:54px; top: 0px;">339</div>
+<div class="extr_arrow" style="width:54px; top: 0px;">333</div>
 </td>
 <td height=1 style="position: relative">
 </td>
@@ -3952,17 +3952,17 @@
 <td><center>0</center></td>
 <td><center>1ff</center></td>
 <td><center>0</center></td>
-<td><center>152</center></td>
-<td><center>153</center></td>
-<td><center>10e</center></td>
+<td><center>14c</center></td>
+<td><center>14d</center></td>
+<td><center>10a</center></td>
 <td><center>0</center></td>
 <td><center>0</center></td>
 <td><center>0</center></td>
 <td><center>0</center></td>
-<td><center>12d</center></td>
+<td><center>129</center></td>
 <td><center>1ff</center></td>
 <td><center>51</center></td>
-<td><center>12c</center></td>
+<td><center>128</center></td>
 <td><center>0</center></td>
 <td><center>0</center></td>
 <td><center>1</center></td>
@@ -3983,7 +3983,7 @@
 <td><center>0</center></td>
 <td><center>0</center></td>
 <td><center>0</center></td>
-<td><center>10f</center></td>
+<td><center>10b</center></td>
 <td><center>0</center></td>
 <td><center>1ff</center></td>
 <td><center>8</center></td>
@@ -4118,10 +4118,10 @@
 </tr><tr>
 <td valign=top align=right><font size=-3>Extractions&nbsp;&nbsp;&nbsp;</font></td>
 <td height=1 style="position: relative">
-<div class="extr_arrow" style="width:27px; top: 0px;">300</div>
+<div class="extr_arrow" style="width:27px; top: 0px;">296</div>
 </td>
 <td height=1 style="position: relative">
-<div class="extr_arrow" style="width:108px; top: 0px;">270</div>
+<div class="extr_arrow" style="width:108px; top: 0px;">266</div>
 </td>
 <td height=1 style="position: relative">
 </td>
@@ -4130,15 +4130,15 @@
 <td height=1 style="position: relative">
 </td>
 <td height=1 style="position: relative">
-<div class="extr_arrow" style="width:54px; top: 0px;">338</div>
+<div class="extr_arrow" style="width:54px; top: 0px;">332</div>
 </td>
 <td height=1 style="position: relative">
 </td>
 <td height=1 style="position: relative">
-<div class="extr_arrow" style="width:27px; top: 0px;">301</div>
+<div class="extr_arrow" style="width:27px; top: 0px;">297</div>
 </td>
 <td height=1 style="position: relative">
-<div class="extr_arrow" style="width:108px; top: 0px;">271</div>
+<div class="extr_arrow" style="width:108px; top: 0px;">267</div>
 </td>
 <td height=1 style="position: relative">
 </td>
@@ -4147,7 +4147,7 @@
 <td height=1 style="position: relative">
 </td>
 <td height=1 style="position: relative">
-<div class="extr_arrow" style="width:54px; top: 0px;">339</div>
+<div class="extr_arrow" style="width:54px; top: 0px;">333</div>
 </td>
 <td height=1 style="position: relative">
 </td>
@@ -4358,7 +4358,7 @@
 <td><center>0</center></td>
 <td><center>1ff</center></td>
 <td><center>0</center></td>
-<td><center>154</center></td>
+<td><center>14e</center></td>
 <td><center>1ff</center></td>
 <td><center>1ff</center></td>
 <td><center>0</center></td>
@@ -4523,7 +4523,7 @@
 </tr><tr>
 <td valign=top align=right><font size=-3>Extractions&nbsp;&nbsp;&nbsp;</font></td>
 <td height=1 style="position: relative">
-<div class="extr_arrow" style="width:54px; top: 0px;">340</div>
+<div class="extr_arrow" style="width:54px; top: 0px;">334</div>
 </td>
 <td height=1 style="position: relative">
 </td>
@@ -5156,17 +5156,17 @@
 <td><center>0</center></td>
 <td><center>1ff</center></td>
 <td><center>0</center></td>
-<td><center>152</center></td>
-<td><center>153</center></td>
-<td><center>10e</center></td>
+<td><center>14c</center></td>
+<td><center>14d</center></td>
+<td><center>10a</center></td>
 <td><center>0</center></td>
 <td><center>0</center></td>
 <td><center>0</center></td>
 <td><center>0</center></td>
-<td><center>12d</center></td>
+<td><center>129</center></td>
 <td><center>1ff</center></td>
 <td><center>51</center></td>
-<td><center>12c</center></td>
+<td><center>128</center></td>
 <td><center>0</center></td>
 <td><center>0</center></td>
 <td><center>1</center></td>
@@ -5187,7 +5187,7 @@
 <td><center>0</center></td>
 <td><center>0</center></td>
 <td><center>0</center></td>
-<td><center>10f</center></td>
+<td><center>10b</center></td>
 <td><center>0</center></td>
 <td><center>1ff</center></td>
 <td><center>8</center></td>
@@ -5322,10 +5322,10 @@
 </tr><tr>
 <td valign=top align=right><font size=-3>Extractions&nbsp;&nbsp;&nbsp;</font></td>
 <td height=1 style="position: relative">
-<div class="extr_arrow" style="width:27px; top: 0px;">300</div>
+<div class="extr_arrow" style="width:27px; top: 0px;">296</div>
 </td>
 <td height=1 style="position: relative">
-<div class="extr_arrow" style="width:108px; top: 0px;">270</div>
+<div class="extr_arrow" style="width:108px; top: 0px;">266</div>
 </td>
 <td height=1 style="position: relative">
 </td>
@@ -5334,15 +5334,15 @@
 <td height=1 style="position: relative">
 </td>
 <td height=1 style="position: relative">
-<div class="extr_arrow" style="width:54px; top: 0px;">338</div>
+<div class="extr_arrow" style="width:54px; top: 0px;">332</div>
 </td>
 <td height=1 style="position: relative">
 </td>
 <td height=1 style="position: relative">
-<div class="extr_arrow" style="width:27px; top: 0px;">301</div>
+<div class="extr_arrow" style="width:27px; top: 0px;">297</div>
 </td>
 <td height=1 style="position: relative">
-<div class="extr_arrow" style="width:108px; top: 0px;">271</div>
+<div class="extr_arrow" style="width:108px; top: 0px;">267</div>
 </td>
 <td height=1 style="position: relative">
 </td>
@@ -5351,7 +5351,7 @@
 <td height=1 style="position: relative">
 </td>
 <td height=1 style="position: relative">
-<div class="extr_arrow" style="width:54px; top: 0px;">339</div>
+<div class="extr_arrow" style="width:54px; top: 0px;">333</div>
 </td>
 <td height=1 style="position: relative">
 </td>
@@ -6639,7 +6639,7 @@
 <br></td></tr>
 
 </table>
-<br><i>Created on Tue Sep 12 11:17:02 2017</i>
+<br><i>Created on Wed Sep 13 01:00:44 2017</i>
 
 <br><i>Compiler version: 5.1.0 (fca32d1)</i>
 
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/visualization/parser.ingress.html b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/visualization/parser.ingress.html
index ebd9d26..70eed06 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/visualization/parser.ingress.html
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/visualization/parser.ingress.html
@@ -1013,7 +1013,7 @@
 <tr>
 <th>&nbsp;</th></tr>
 <td>Default</td>
-<td style="text-align: left;">&nbsp;<font size=+1>-></font>&nbsp;<a href="#row244">Row 244 (state start)</a></td>
+<td style="text-align: left;">&nbsp;<font size=+1>-></font>&nbsp;<a href="#row245">Row 245 (state start)</a></td>
 </tr>
 </table>
 </div></div><br><br>
@@ -1167,17 +1167,17 @@
 <td><center>0</center></td>
 <td><center>1ff</center></td>
 <td><center>0</center></td>
-<td><center>84</center></td>
 <td><center>85</center></td>
-<td><center>3</center></td>
+<td><center>86</center></td>
+<td><center>4</center></td>
 <td><center>0</center></td>
 <td><center>0</center></td>
 <td><center>0</center></td>
 <td><center>0</center></td>
-<td><center>42</center></td>
-<td><center>1ff</center></td>
 <td><center>43</center></td>
-<td><center>41</center></td>
+<td><center>1ff</center></td>
+<td><center>44</center></td>
+<td><center>42</center></td>
 <td><center>0</center></td>
 <td><center>0</center></td>
 <td><center>1</center></td>
@@ -1198,7 +1198,7 @@
 <td><center>0</center></td>
 <td><center>0</center></td>
 <td><center>0</center></td>
-<td><center>4</center></td>
+<td><center>5</center></td>
 <td><center>0</center></td>
 <td><center>1ff</center></td>
 <td><center>8</center></td>
@@ -1333,23 +1333,6 @@
 </tr><tr>
 <td valign=top align=right><font size=-3>Extractions&nbsp;&nbsp;&nbsp;</font></td>
 <td height=1 style="position: relative">
-<div class="extr_arrow" style="width:27px; top: 0px;">65</div>
-</td>
-<td height=1 style="position: relative">
-<div class="extr_arrow" style="width:108px; top: 0px;">3</div>
-</td>
-<td height=1 style="position: relative">
-</td>
-<td height=1 style="position: relative">
-</td>
-<td height=1 style="position: relative">
-</td>
-<td height=1 style="position: relative">
-<div class="extr_arrow" style="width:54px; top: 0px;">132</div>
-</td>
-<td height=1 style="position: relative">
-</td>
-<td height=1 style="position: relative">
 <div class="extr_arrow" style="width:27px; top: 0px;">66</div>
 </td>
 <td height=1 style="position: relative">
@@ -1367,6 +1350,23 @@
 <td height=1 style="position: relative">
 </td>
 <td height=1 style="position: relative">
+<div class="extr_arrow" style="width:27px; top: 0px;">67</div>
+</td>
+<td height=1 style="position: relative">
+<div class="extr_arrow" style="width:108px; top: 0px;">5</div>
+</td>
+<td height=1 style="position: relative">
+</td>
+<td height=1 style="position: relative">
+</td>
+<td height=1 style="position: relative">
+</td>
+<td height=1 style="position: relative">
+<div class="extr_arrow" style="width:54px; top: 0px;">134</div>
+</td>
+<td height=1 style="position: relative">
+</td>
+<td height=1 style="position: relative">
 </td>
 <td height=1 style="position: relative">
 </td>
@@ -1404,7 +1404,7 @@
 </td>
 </tr></table>
 <div style="height:40px;">&nbsp;</div>
-PHV 67 <font size=+1>|=</font> 0x4<br>
+PHV 68 <font size=+1>|=</font> 0x4<br>
 <br>
 </div></div><br><br>
 <div class="data_box">
@@ -1421,7 +1421,7 @@
 </tr>
 </table>
 <br>Previous states: 
-<a href="#row243">Row 243</a><br>
+<a href="#row244">Row 244</a><br>
 </div></div><br><br>
 </td></tr>
 
@@ -1582,7 +1582,7 @@
 <td><center>0</center></td>
 <td><center>120</center></td>
 <td><center>1ff</center></td>
-<td><center>43</center></td>
+<td><center>44</center></td>
 <td><center>40</center></td>
 <td><center>0</center></td>
 <td><center>0</center></td>
@@ -1813,7 +1813,7 @@
 </td>
 </tr></table>
 <div style="height:40px;">&nbsp;</div>
-PHV 67 <font size=+1>|=</font> 0x8<br>
+PHV 68 <font size=+1>|=</font> 0x8<br>
 <br>
 </div></div><br><br>
 <div class="data_box">
@@ -1836,7 +1836,7 @@
 </tr>
 </table>
 <br>Previous states: 
-<a href="#row254">Row 254</a>, <a href="#row245">Row 245</a>, <a href="#row246">Row 246</a><br>
+<a href="#row254">Row 254</a>, <a href="#row246">Row 246</a>, <a href="#row247">Row 247</a><br>
 </div></div><br><br>
 </td></tr>
 
@@ -2223,7 +2223,7 @@
 [<a href="javascript:void(0)" onclick="toggle_visibility('transitions_252');" style="text-decoration: none;"><font size=+3><b>.</b></font></a>] <a style="text-decoration: none; color: #0000FF;" href="#transitions_252">Transitions</a> <br><br><div id="transitions_252" style="display: block;">
 End<br>
 <br>Previous states: 
-<a href="#row254">Row 254</a>, <a href="#row245">Row 245</a>, <a href="#row246">Row 246</a><br>
+<a href="#row254">Row 254</a>, <a href="#row246">Row 246</a>, <a href="#row247">Row 247</a><br>
 </div></div><br><br>
 </td></tr>
 
@@ -2287,9 +2287,8 @@
 </tr>
 <tr>
 <td><center>0</center></td>
-<td><center>ff</center></td>
 <td><center>0</center></td>
-<td><center>4</center></td>
+<td><center>14</center></td>
 <td><center>0</center></td>
 <td><center>0</center></td>
 <td><center>0</center></td>
@@ -2297,6 +2296,7 @@
 <td><center>0</center></td>
 <td><center>0</center></td>
 <td><center>0</center></td>
+<td><center>1</center></td>
 <td><center>0</center></td>
 <td><center>0</center></td>
 <td><center>14</center></td>
@@ -2373,44 +2373,44 @@
 <td><center>0</center></td>
 <td><center>1</center></td>
 <td><center>0</center></td>
-<td><center>144</center></td>
-<td><center>0</center></td>
-<td><center>142</center></td>
 <td><center>143</center></td>
+<td><center>0</center></td>
+<td><center>84</center></td>
+<td><center>142</center></td>
+<td><center>3</center></td>
+<td><center>0</center></td>
+<td><center>0</center></td>
+<td><center>0</center></td>
+<td><center>0</center></td>
+<td><center>121</center></td>
+<td><center>1ff</center></td>
+<td><center>44</center></td>
+<td><center>41</center></td>
+<td><center>0</center></td>
+<td><center>0</center></td>
+<td><center>1</center></td>
+<td><center>0</center></td>
+<td><center>8</center></td>
+<td><center>1</center></td>
+<td><center>0</center></td>
+<td><center>a</center></td>
+<td><center>1ff</center></td>
+<td><center>10</center></td>
+<td><center>0</center></td>
+<td><center>0</center></td>
+<td><center>0</center></td>
+<td><center>0</center></td>
+<td><center>0</center></td>
+<td><center>0</center></td>
+<td><center>0</center></td>
+<td><center>0</center></td>
+<td><center>0</center></td>
+<td><center>0</center></td>
 <td><center>101</center></td>
 <td><center>0</center></td>
-<td><center>0</center></td>
-<td><center>0</center></td>
-<td><center>0</center></td>
-<td><center>122</center></td>
-<td><center>123</center></td>
-<td><center>43</center></td>
-<td><center>121</center></td>
-<td><center>0</center></td>
-<td><center>0</center></td>
-<td><center>1</center></td>
-<td><center>0</center></td>
-<td><center>6</center></td>
-<td><center>4</center></td>
-<td><center>a</center></td>
-<td><center>8</center></td>
-<td><center>145</center></td>
-<td><center>0</center></td>
-<td><center>0</center></td>
-<td><center>0</center></td>
-<td><center>0</center></td>
-<td><center>0</center></td>
-<td><center>0</center></td>
-<td><center>0</center></td>
-<td><center>0</center></td>
-<td><center>0</center></td>
-<td><center>0</center></td>
-<td><center>0</center></td>
 <td><center>102</center></td>
-<td><center>0</center></td>
-<td><center>1ff</center></td>
-<td><center>10</center></td>
 <td><center>c</center></td>
+<td><center>3</center></td>
 <td><center>0</center></td>
 <td><center>0</center></td>
 <td><center>0</center></td>
@@ -2420,7 +2420,7 @@
 <td><center>0</center></td>
 <td><center>0</center></td>
 <td><center>0</center></td>
-<td><center>2</center></td>
+<td><center>0</center></td>
 <td><center>0</center></td>
 <td><center>0</center></td>
 <td><center>0</center></td>
@@ -2429,7 +2429,7 @@
 <td><center>0</center></td>
 <td><center>10</center></td>
 <td><center>0</center></td>
-<td><center>1</center></td>
+<td><center>7</center></td>
 </tr>
 </table> <br>
 </div></div><br><br>
@@ -2524,7 +2524,7 @@
 <td bgcolor=#AAAAAA style="width: 25px; height: 25px; "><font color=#555555 size=-1><center>16</center></font></td>
 <td bgcolor=#AAAAAA style="width: 25px; height: 25px; "><font color=#555555 size=-1><center>17</center></font></td>
 <td bgcolor=#AAAAAA style="width: 25px; height: 25px; "><font color=#555555 size=-1><center>18</center></font></td>
-<td bgcolor=#AAAAAA style="width: 25px; height: 25px; "><font color=#555555 size=-1><center>19</center></font></td>
+<td bgcolor=#AAAAAA style="width: 25px; height: 25px; border-right: 2px solid black;"><font color=#555555 size=-1><center>19</center></font></td>
 <td bgcolor=#DDDDDD style="width: 25px; height: 25px; "><font color=#777777 size=-1><center>20</center></font></td>
 <td bgcolor=#DDDDDD style="width: 25px; height: 25px; "><font color=#777777 size=-1><center>21</center></font></td>
 <td bgcolor=#DDDDDD style="width: 25px; height: 25px; "><font color=#777777 size=-1><center>22</center></font></td>
@@ -2540,17 +2540,26 @@
 </tr><tr>
 <td valign=top align=right><font size=-3>Extractions&nbsp;&nbsp;&nbsp;</font></td>
 <td height=1 style="position: relative">
+<div class="extr_arrow" style="width:27px; top: 0px;">65</div>
+</td>
+<td height=1 style="position: relative">
+<div class="extr_arrow" style="width:54px; top: 0px;">132</div>
+</td>
+<td height=1 style="position: relative">
+</td>
+<td height=1 style="position: relative">
+<div class="extr_arrow" style="width:108px; top: 0px;">3</div>
+</td>
+<td height=1 style="position: relative">
+</td>
+<td height=1 style="position: relative">
+</td>
+<td height=1 style="position: relative">
+</td>
+<td height=1 style="position: relative">
 <div class="extr_arrow" style="width:27px; top: 0px;">289</div>
 </td>
 <td height=1 style="position: relative">
-<div class="extr_arrow" style="width:27px; top: 0px;">290</div>
-</td>
-<td height=1 style="position: relative">
-<div class="extr_arrow" style="width:27px; top: 0px;">291</div>
-</td>
-<td height=1 style="position: relative">
-</td>
-<td height=1 style="position: relative">
 <div class="extr_arrow" style="width:54px; top: 0px;">322</div>
 </td>
 <td height=1 style="position: relative">
@@ -2561,16 +2570,6 @@
 <td height=1 style="position: relative">
 </td>
 <td height=1 style="position: relative">
-<div class="extr_arrow" style="width:54px; top: 0px;">324</div>
-</td>
-<td height=1 style="position: relative">
-</td>
-<td height=1 style="position: relative">
-<div class="extr_arrow" style="width:54px; top: 0px;">325</div>
-</td>
-<td height=1 style="position: relative">
-</td>
-<td height=1 style="position: relative">
 <div class="extr_arrow" style="width:108px; top: 0px;">257</div>
 </td>
 <td height=1 style="position: relative">
@@ -2614,18 +2613,12 @@
 </td>
 </tr></table>
 <div style="height:40px;">&nbsp;</div>
-PHV 67 <font size=+1>|=</font> 0x10<br>
+PHV 68 <font size=+1>|=</font> 0x10<br>
 <br>
 </div></div><br><br>
 <div class="data_box">
 [<a href="javascript:void(0)" onclick="toggle_visibility('transitions_251');" style="text-decoration: none;"><font size=+3><b>.</b></font></a>] <a style="text-decoration: none; color: #0000FF;" href="#transitions_251">Transitions</a> <br><br><div id="transitions_251" style="display: block;">
-<table border=0 id="transitions_table_251" class="draggable transitions_table">
-<tr>
-<th>&nbsp;</th></tr>
-<td>Default</td>
-<td style="text-align: left;">&nbsp;<font size=+1>-></font>&nbsp;<a href="#row248">Row 248 (state parse_tcp//spilled)</a></td>
-</tr>
-</table>
+End<br>
 <br>Previous states: 
 <a href="#row253">Row 253</a><br>
 </div></div><br><br>
@@ -2781,21 +2774,21 @@
 <td><center>0</center></td>
 <td><center>142</center></td>
 <td><center>1ff</center></td>
-<td><center>5</center></td>
+<td><center>101</center></td>
 <td><center>0</center></td>
 <td><center>0</center></td>
 <td><center>0</center></td>
 <td><center>0</center></td>
-<td><center>122</center></td>
-<td><center>1ff</center></td>
-<td><center>43</center></td>
 <td><center>121</center></td>
+<td><center>1ff</center></td>
+<td><center>44</center></td>
+<td><center>41</center></td>
 <td><center>0</center></td>
 <td><center>0</center></td>
 <td><center>1</center></td>
 <td><center>0</center></td>
 <td><center>0</center></td>
-<td><center>6</center></td>
+<td><center>2</center></td>
 <td><center>0</center></td>
 <td><center>0</center></td>
 <td><center>1ff</center></td>
@@ -2814,26 +2807,26 @@
 <td><center>0</center></td>
 <td><center>1ff</center></td>
 <td><center>0</center></td>
-<td><center>0</center></td>
-<td><center>0</center></td>
-<td><center>0</center></td>
-<td><center>0</center></td>
-<td><center>0</center></td>
-<td><center>0</center></td>
-<td><center>1ff</center></td>
-<td><center>0</center></td>
-<td><center>0</center></td>
-<td><center>0</center></td>
-<td><center>0</center></td>
-<td><center>0</center></td>
-<td><center>0</center></td>
-<td><center>0</center></td>
-<td><center>0</center></td>
-<td><center>0</center></td>
 <td><center>4</center></td>
+<td><center>0</center></td>
+<td><center>0</center></td>
+<td><center>0</center></td>
+<td><center>0</center></td>
+<td><center>0</center></td>
+<td><center>1ff</center></td>
+<td><center>0</center></td>
+<td><center>0</center></td>
+<td><center>0</center></td>
+<td><center>0</center></td>
+<td><center>0</center></td>
+<td><center>0</center></td>
+<td><center>0</center></td>
+<td><center>0</center></td>
+<td><center>0</center></td>
+<td><center>1</center></td>
 <td><center>20</center></td>
 <td><center>0</center></td>
-<td><center>5</center></td>
+<td><center>0</center></td>
 </tr>
 </table> <br>
 </div></div><br><br>
@@ -2944,19 +2937,10 @@
 </tr><tr>
 <td valign=top align=right><font size=-3>Extractions&nbsp;&nbsp;&nbsp;</font></td>
 <td height=1 style="position: relative">
-<div class="extr_arrow" style="width:108px; top: 0px;">5</div>
-</td>
-<td height=1 style="position: relative">
-</td>
-<td height=1 style="position: relative">
-</td>
-<td height=1 style="position: relative">
-</td>
-<td height=1 style="position: relative">
 <div class="extr_arrow" style="width:27px; top: 0px;">289</div>
 </td>
 <td height=1 style="position: relative">
-<div class="extr_arrow" style="width:27px; top: 0px;">290</div>
+<div class="extr_arrow" style="width:27px; top: 0px;">65</div>
 </td>
 <td height=1 style="position: relative">
 <div class="extr_arrow" style="width:54px; top: 0px;">322</div>
@@ -2964,6 +2948,15 @@
 <td height=1 style="position: relative">
 </td>
 <td height=1 style="position: relative">
+<div class="extr_arrow" style="width:108px; top: 0px;">257</div>
+</td>
+<td height=1 style="position: relative">
+</td>
+<td height=1 style="position: relative">
+</td>
+<td height=1 style="position: relative">
+</td>
+<td height=1 style="position: relative">
 </td>
 <td height=1 style="position: relative">
 </td>
@@ -3013,7 +3006,7 @@
 </td>
 </tr></table>
 <div style="height:40px;">&nbsp;</div>
-PHV 67 <font size=+1>|=</font> 0x20<br>
+PHV 68 <font size=+1>|=</font> 0x20<br>
 <br>
 </div></div><br><br>
 <div class="data_box">
@@ -3413,398 +3406,10 @@
 
 <tr><td id="row248" class="row_cell">
 <a href="#row248">Row 248</a> <br><br>
-State parse_tcp//spilled (from state parse_tcp)<br />
-<br>
-<div class="data_box">
-[<a href="javascript:void(0)" onclick="toggle_visibility('reg_data_248');" style="text-decoration: none;"><font size=+3><b>.</b></font></a>] <a style="text-decoration: none; color: #0000FF;" href="#reg_data_248">Raw register data</a> <br><br><div id="reg_data_248" style="display: none;">
-TCAM word: <table border=1>
-<tr>
-<td><center><font size=-3></font></center></td>
-<td><center><font size=-3>curr_state</font></center></td>
-<td><center><font size=-3>lookup_16</font></center></td>
-<td><center><font size=-3>lookup_8[1]</font></center></td>
-<td><center><font size=-3>lookup_8[0]</font></center></td>
-<td><center><font size=-3>ver_1</font></center></td>
-<td><center><font size=-3>ver_0</font></center></td>
-<td><center><font size=-3>ctr_zero</font></center></td>
-<td><center><font size=-3>ctr_neg</font></center></td>
-</tr>
-<tr>
-<td><center>value</center></td>
-<td><center>4</center></td>
-<td><center>ffff</center></td>
-<td><center>ff</center></td>
-<td><center>ff</center></td>
-<td><center>1</center></td>
-<td><center>1</center></td>
-<td><center>1</center></td>
-<td><center>1</center></td>
-</tr>
-<tr>
-<td><center>mask</center></td>
-<td><center>ff</center></td>
-<td><center>0</center></td>
-<td><center>0</center></td>
-<td><center>0</center></td>
-<td><center>0</center></td>
-<td><center>0</center></td>
-<td><center>0</center></td>
-<td><center>0</center></td>
-</tr>
-</table> <br>
-Early action: <table border=1>
-<tr>
-<td><center><font size=-3>ctr_amt_idx</font></center></td>
-<td><center><font size=-3>nxt_state_mask</font></center></td>
-<td><center><font size=-3>shift_amt</font></center></td>
-<td><center><font size=-3>nxt_state</font></center></td>
-<td><center><font size=-3>lookup_offset_8[1]</font></center></td>
-<td><center><font size=-3>ctr_ld_src</font></center></td>
-<td><center><font size=-3>lookup_offset_8[0]</font></center></td>
-<td><center><font size=-3>ld_lookup_8[0]</font></center></td>
-<td><center><font size=-3>ld_lookup_16</font></center></td>
-<td><center><font size=-3>ld_lookup_8[1]</font></center></td>
-<td><center><font size=-3>done</font></center></td>
-<td><center><font size=-3>lookup_offset_16</font></center></td>
-<td><center><font size=-3>ctr_load</font></center></td>
-<td><center><font size=-3>buf_req</font></center></td>
-</tr>
-<tr>
-<td><center>0</center></td>
-<td><center>0</center></td>
-<td><center>14</center></td>
-<td><center>0</center></td>
-<td><center>0</center></td>
-<td><center>0</center></td>
-<td><center>0</center></td>
-<td><center>0</center></td>
-<td><center>0</center></td>
-<td><center>0</center></td>
-<td><center>1</center></td>
-<td><center>0</center></td>
-<td><center>0</center></td>
-<td><center>14</center></td>
-</tr>
-</table> <br>
-Action: <table border=1>
-<tr>
-<td><center><font size=-3>phv_8b_src_type_3</font></center></td>
-<td><center><font size=-3>phv_8b_src_type_2</font></center></td>
-<td><center><font size=-3>phv_8b_src_type_1</font></center></td>
-<td><center><font size=-3>phv_8b_src_type_0</font></center></td>
-<td><center><font size=-3>csum_addr[1]</font></center></td>
-<td><center><font size=-3>phv_16b_dst_2</font></center></td>
-<td><center><font size=-3>phv_8b_offset_rot_imm_0</font></center></td>
-<td><center><font size=-3>phv_16b_dst_0</font></center></td>
-<td><center><font size=-3>phv_16b_dst_1</font></center></td>
-<td><center><font size=-3>phv_32b_dst_0</font></center></td>
-<td><center><font size=-3>phv_8b_offset_add_dst_1</font></center></td>
-<td><center><font size=-3>phv_8b_offset_add_dst_0</font></center></td>
-<td><center><font size=-3>phv_8b_offset_add_dst_3</font></center></td>
-<td><center><font size=-3>phv_8b_offset_add_dst_2</font></center></td>
-<td><center><font size=-3>phv_8b_dst_2</font></center></td>
-<td><center><font size=-3>phv_8b_dst_3</font></center></td>
-<td><center><font size=-3>phv_8b_dst_0</font></center></td>
-<td><center><font size=-3>phv_8b_dst_1</font></center></td>
-<td><center><font size=-3>pri_upd_en_shr</font></center></td>
-<td><center><font size=-3>phv_32b_src_type_1</font></center></td>
-<td><center><font size=-3>dst_offset_rst</font></center></td>
-<td><center><font size=-3>phv_32b_src_type_0</font></center></td>
-<td><center><font size=-3>phv_16b_src_1</font></center></td>
-<td><center><font size=-3>phv_16b_src_0</font></center></td>
-<td><center><font size=-3>phv_16b_src_3</font></center></td>
-<td><center><font size=-3>phv_16b_src_2</font></center></td>
-<td><center><font size=-3>phv_16b_dst_3</font></center></td>
-<td><center><font size=-3>phv_32b_src_2</font></center></td>
-<td><center><font size=-3>pri_upd_src</font></center></td>
-<td><center><font size=-3>phv_16b_offset_add_dst_3</font></center></td>
-<td><center><font size=-3>phv_16b_offset_rot_imm_1</font></center></td>
-<td><center><font size=-3>csum_en[1]</font></center></td>
-<td><center><font size=-3>phv_16b_offset_add_dst_1</font></center></td>
-<td><center><font size=-3>phv_16b_offset_add_dst_0</font></center></td>
-<td><center><font size=-3>dst_offset_inc</font></center></td>
-<td><center><font size=-3>phv_16b_offset_add_dst_2</font></center></td>
-<td><center><font size=-3>csum_addr[0]</font></center></td>
-<td><center><font size=-3>pri_upd_type</font></center></td>
-<td><center><font size=-3>phv_32b_dst_1</font></center></td>
-<td><center><font size=-3>phv_32b_src_3</font></center></td>
-<td><center><font size=-3>phv_32b_dst_2</font></center></td>
-<td><center><font size=-3>phv_32b_src_1</font></center></td>
-<td><center><font size=-3>phv_32b_src_0</font></center></td>
-<td><center><font size=-3>phv_32b_offset_rot_imm_1</font></center></td>
-<td><center><font size=-3>phv_32b_offset_rot_imm_0</font></center></td>
-<td><center><font size=-3>phv_8b_offset_rot_imm_3</font></center></td>
-<td><center><font size=-3>phv_8b_offset_rot_imm_2</font></center></td>
-<td><center><font size=-3>phv_16b_offset_rot_imm_0</font></center></td>
-<td><center><font size=-3>phv_32b_dst_3</font></center></td>
-<td><center><font size=-3>pri_upd_val_mask</font></center></td>
-<td><center><font size=-3>phv_16b_src_type_1</font></center></td>
-<td><center><font size=-3>phv_16b_src_type_0</font></center></td>
-<td><center><font size=-3>phv_8b_src_3</font></center></td>
-<td><center><font size=-3>csum_en[0]</font></center></td>
-<td><center><font size=-3>phv_32b_offset_add_dst_3</font></center></td>
-<td><center><font size=-3>phv_32b_offset_add_dst_2</font></center></td>
-<td><center><font size=-3>phv_32b_offset_add_dst_1</font></center></td>
-<td><center><font size=-3>phv_32b_offset_add_dst_0</font></center></td>
-<td><center><font size=-3>phv_8b_src_1</font></center></td>
-<td><center><font size=-3>phv_8b_src_0</font></center></td>
-<td><center><font size=-3>phv_8b_offset_rot_imm_1</font></center></td>
-<td><center><font size=-3>phv_8b_src_2</font></center></td>
-</tr>
-<tr>
-<td><center>0</center></td>
-<td><center>0</center></td>
-<td><center>0</center></td>
-<td><center>0</center></td>
-<td><center>0</center></td>
-<td><center>1ff</center></td>
-<td><center>0</center></td>
-<td><center>1ff</center></td>
-<td><center>1ff</center></td>
-<td><center>1ff</center></td>
-<td><center>0</center></td>
-<td><center>0</center></td>
-<td><center>0</center></td>
-<td><center>0</center></td>
-<td><center>1ff</center></td>
-<td><center>1ff</center></td>
-<td><center>124</center></td>
-<td><center>1ff</center></td>
-<td><center>0</center></td>
-<td><center>0</center></td>
-<td><center>1</center></td>
-<td><center>0</center></td>
-<td><center>0</center></td>
-<td><center>0</center></td>
-<td><center>0</center></td>
-<td><center>0</center></td>
-<td><center>1ff</center></td>
-<td><center>0</center></td>
-<td><center>0</center></td>
-<td><center>0</center></td>
-<td><center>0</center></td>
-<td><center>0</center></td>
-<td><center>0</center></td>
-<td><center>0</center></td>
-<td><center>0</center></td>
-<td><center>0</center></td>
-<td><center>0</center></td>
-<td><center>0</center></td>
-<td><center>1ff</center></td>
-<td><center>0</center></td>
-<td><center>1ff</center></td>
-<td><center>0</center></td>
-<td><center>0</center></td>
-<td><center>0</center></td>
-<td><center>0</center></td>
-<td><center>0</center></td>
-<td><center>0</center></td>
-<td><center>0</center></td>
-<td><center>1ff</center></td>
-<td><center>0</center></td>
-<td><center>0</center></td>
-<td><center>0</center></td>
-<td><center>0</center></td>
-<td><center>0</center></td>
-<td><center>0</center></td>
-<td><center>0</center></td>
-<td><center>0</center></td>
-<td><center>0</center></td>
-<td><center>0</center></td>
-<td><center>3</center></td>
-<td><center>0</center></td>
-<td><center>0</center></td>
-</tr>
-</table> <br>
-</div></div><br><br>
-
-<div class="data_box">
-[<a href="javascript:void(0)" onclick="toggle_visibility('input_buffer_248');" style="text-decoration: none;"><font size=+3><b>.</b></font></a>] <a style="text-decoration: none; color: #0000FF;" href="#input_buffer_248">Input buffer</a> <br><br><div id="input_buffer_248" style="display: block;">
-<div style="min-width: 1060;"></div>
-<table border=0><tr>
-<td valign=bottom align=right><font size=-3>Matches&nbsp;&nbsp;&nbsp;</font></td>
-<td height=1 style="position: relative">
-</td>
-<td height=1 style="position: relative">
-</td>
-<td height=1 style="position: relative">
-</td>
-<td height=1 style="position: relative">
-</td>
-<td height=1 style="position: relative">
-</td>
-<td height=1 style="position: relative">
-</td>
-<td height=1 style="position: relative">
-</td>
-<td height=1 style="position: relative">
-</td>
-<td height=1 style="position: relative">
-</td>
-<td height=1 style="position: relative">
-</td>
-<td height=1 style="position: relative">
-</td>
-<td height=1 style="position: relative">
-</td>
-<td height=1 style="position: relative">
-</td>
-<td height=1 style="position: relative">
-</td>
-<td height=1 style="position: relative">
-</td>
-<td height=1 style="position: relative">
-</td>
-<td height=1 style="position: relative">
-</td>
-<td height=1 style="position: relative">
-</td>
-<td height=1 style="position: relative">
-</td>
-<td height=1 style="position: relative">
-</td>
-<td height=1 style="position: relative">
-</td>
-<td height=1 style="position: relative">
-</td>
-<td height=1 style="position: relative">
-</td>
-<td height=1 style="position: relative">
-</td>
-<td height=1 style="position: relative">
-</td>
-<td height=1 style="position: relative">
-</td>
-<td height=1 style="position: relative">
-</td>
-<td height=1 style="position: relative">
-</td>
-<td height=1 style="position: relative">
-</td>
-<td height=1 style="position: relative">
-</td>
-<td height=1 style="position: relative">
-</td>
-<td height=1 style="position: relative">
-</td>
-<td height=20></td></tr><tr>
-<td align=right><font size=-3>Bytes&nbsp;&nbsp;&nbsp;</font></td>
-<td bgcolor=#AAAAAA style="width: 25px; height: 25px; "><font color=#555555 size=-1><center>0</center></font></td>
-<td bgcolor=#AAAAAA style="width: 25px; height: 25px; "><font color=#555555 size=-1><center>1</center></font></td>
-<td bgcolor=#AAAAAA style="width: 25px; height: 25px; "><font color=#555555 size=-1><center>2</center></font></td>
-<td bgcolor=#AAAAAA style="width: 25px; height: 25px; "><font color=#555555 size=-1><center>3</center></font></td>
-<td bgcolor=#AAAAAA style="width: 25px; height: 25px; "><font color=#555555 size=-1><center>4</center></font></td>
-<td bgcolor=#AAAAAA style="width: 25px; height: 25px; "><font color=#555555 size=-1><center>5</center></font></td>
-<td bgcolor=#AAAAAA style="width: 25px; height: 25px; "><font color=#555555 size=-1><center>6</center></font></td>
-<td bgcolor=#AAAAAA style="width: 25px; height: 25px; "><font color=#555555 size=-1><center>7</center></font></td>
-<td bgcolor=#AAAAAA style="width: 25px; height: 25px; "><font color=#555555 size=-1><center>8</center></font></td>
-<td bgcolor=#AAAAAA style="width: 25px; height: 25px; "><font color=#555555 size=-1><center>9</center></font></td>
-<td bgcolor=#AAAAAA style="width: 25px; height: 25px; "><font color=#555555 size=-1><center>10</center></font></td>
-<td bgcolor=#AAAAAA style="width: 25px; height: 25px; "><font color=#555555 size=-1><center>11</center></font></td>
-<td bgcolor=#AAAAAA style="width: 25px; height: 25px; "><font color=#555555 size=-1><center>12</center></font></td>
-<td bgcolor=#AAAAAA style="width: 25px; height: 25px; "><font color=#555555 size=-1><center>13</center></font></td>
-<td bgcolor=#AAAAAA style="width: 25px; height: 25px; "><font color=#555555 size=-1><center>14</center></font></td>
-<td bgcolor=#AAAAAA style="width: 25px; height: 25px; "><font color=#555555 size=-1><center>15</center></font></td>
-<td bgcolor=#AAAAAA style="width: 25px; height: 25px; "><font color=#555555 size=-1><center>16</center></font></td>
-<td bgcolor=#AAAAAA style="width: 25px; height: 25px; "><font color=#555555 size=-1><center>17</center></font></td>
-<td bgcolor=#AAAAAA style="width: 25px; height: 25px; "><font color=#555555 size=-1><center>18</center></font></td>
-<td bgcolor=#AAAAAA style="width: 25px; height: 25px; border-right: 2px solid black;"><font color=#555555 size=-1><center>19</center></font></td>
-<td bgcolor=#DDDDDD style="width: 25px; height: 25px; "><font color=#777777 size=-1><center>20</center></font></td>
-<td bgcolor=#DDDDDD style="width: 25px; height: 25px; "><font color=#777777 size=-1><center>21</center></font></td>
-<td bgcolor=#DDDDDD style="width: 25px; height: 25px; "><font color=#777777 size=-1><center>22</center></font></td>
-<td bgcolor=#DDDDDD style="width: 25px; height: 25px; "><font color=#777777 size=-1><center>23</center></font></td>
-<td bgcolor=#DDDDDD style="width: 25px; height: 25px; "><font color=#777777 size=-1><center>24</center></font></td>
-<td bgcolor=#DDDDDD style="width: 25px; height: 25px; "><font color=#777777 size=-1><center>25</center></font></td>
-<td bgcolor=#DDDDDD style="width: 25px; height: 25px; "><font color=#777777 size=-1><center>26</center></font></td>
-<td bgcolor=#DDDDDD style="width: 25px; height: 25px; "><font color=#777777 size=-1><center>27</center></font></td>
-<td bgcolor=#DDDDDD style="width: 25px; height: 25px; "><font color=#777777 size=-1><center>28</center></font></td>
-<td bgcolor=#DDDDDD style="width: 25px; height: 25px; "><font color=#777777 size=-1><center>29</center></font></td>
-<td bgcolor=#DDDDDD style="width: 25px; height: 25px; "><font color=#777777 size=-1><center>30</center></font></td>
-<td bgcolor=#DDDDDD style="width: 25px; height: 25px; "><font color=#777777 size=-1><center>31</center></font></td>
-</tr><tr>
-<td valign=top align=right><font size=-3>Extractions&nbsp;&nbsp;&nbsp;</font></td>
-<td height=1 style="position: relative">
-</td>
-<td height=1 style="position: relative">
-</td>
-<td height=1 style="position: relative">
-</td>
-<td height=1 style="position: relative">
-<div class="extr_arrow" style="width:27px; top: 0px;">292</div>
-</td>
-<td height=1 style="position: relative">
-</td>
-<td height=1 style="position: relative">
-</td>
-<td height=1 style="position: relative">
-</td>
-<td height=1 style="position: relative">
-</td>
-<td height=1 style="position: relative">
-</td>
-<td height=1 style="position: relative">
-</td>
-<td height=1 style="position: relative">
-</td>
-<td height=1 style="position: relative">
-</td>
-<td height=1 style="position: relative">
-</td>
-<td height=1 style="position: relative">
-</td>
-<td height=1 style="position: relative">
-</td>
-<td height=1 style="position: relative">
-</td>
-<td height=1 style="position: relative">
-</td>
-<td height=1 style="position: relative">
-</td>
-<td height=1 style="position: relative">
-</td>
-<td height=1 style="position: relative">
-</td>
-<td height=1 style="position: relative">
-</td>
-<td height=1 style="position: relative">
-</td>
-<td height=1 style="position: relative">
-</td>
-<td height=1 style="position: relative">
-</td>
-<td height=1 style="position: relative">
-</td>
-<td height=1 style="position: relative">
-</td>
-<td height=1 style="position: relative">
-</td>
-<td height=1 style="position: relative">
-</td>
-<td height=1 style="position: relative">
-</td>
-<td height=1 style="position: relative">
-</td>
-<td height=1 style="position: relative">
-</td>
-<td height=1 style="position: relative">
-</td>
-</tr></table>
-<div style="height:40px;">&nbsp;</div>
-</div></div><br><br>
-<div class="data_box">
-[<a href="javascript:void(0)" onclick="toggle_visibility('transitions_248');" style="text-decoration: none;"><font size=+3><b>.</b></font></a>] <a style="text-decoration: none; color: #0000FF;" href="#transitions_248">Transitions</a> <br><br><div id="transitions_248" style="display: block;">
-End<br>
-<br>Previous states: 
-<a href="#row251">Row 251</a><br>
-</div></div><br><br>
-</td></tr>
-
-<tr><td id="row247" class="row_cell">
-<a href="#row247">Row 247</a> <br><br>
 State parse_pkt_out (from state default_parser)<br />
 <br>
 <div class="data_box">
-[<a href="javascript:void(0)" onclick="toggle_visibility('reg_data_247');" style="text-decoration: none;"><font size=+3><b>.</b></font></a>] <a style="text-decoration: none; color: #0000FF;" href="#reg_data_247">Raw register data</a> <br><br><div id="reg_data_247" style="display: none;">
+[<a href="javascript:void(0)" onclick="toggle_visibility('reg_data_248');" style="text-decoration: none;"><font size=+3><b>.</b></font></a>] <a style="text-decoration: none; color: #0000FF;" href="#reg_data_248">Raw register data</a> <br><br><div id="reg_data_248" style="display: none;">
 TCAM word: <table border=1>
 <tr>
 <td><center><font size=-3></font></center></td>
@@ -3956,7 +3561,7 @@
 <td><center>0</center></td>
 <td><center>1ff</center></td>
 <td><center>1ff</center></td>
-<td><center>43</center></td>
+<td><center>44</center></td>
 <td><center>1ff</center></td>
 <td><center>0</center></td>
 <td><center>0</center></td>
@@ -4007,7 +3612,7 @@
 </div></div><br><br>
 
 <div class="data_box">
-[<a href="javascript:void(0)" onclick="toggle_visibility('input_buffer_247');" style="text-decoration: none;"><font size=+3><b>.</b></font></a>] <a style="text-decoration: none; color: #0000FF;" href="#input_buffer_247">Input buffer</a> <br><br><div id="input_buffer_247" style="display: block;">
+[<a href="javascript:void(0)" onclick="toggle_visibility('input_buffer_248');" style="text-decoration: none;"><font size=+3><b>.</b></font></a>] <a style="text-decoration: none; color: #0000FF;" href="#input_buffer_248">Input buffer</a> <br><br><div id="input_buffer_248" style="display: block;">
 <div style="min-width: 1060;"></div>
 <table border=0><tr>
 <td valign=bottom align=right><font size=-3>Matches&nbsp;&nbsp;&nbsp;</font></td>
@@ -4178,29 +3783,29 @@
 </td>
 </tr></table>
 <div style="height:40px;">&nbsp;</div>
-PHV 67 <font size=+1>|=</font> 0x2<br>
+PHV 68 <font size=+1>|=</font> 0x2<br>
 <br>
 </div></div><br><br>
 <div class="data_box">
-[<a href="javascript:void(0)" onclick="toggle_visibility('transitions_247');" style="text-decoration: none;"><font size=+3><b>.</b></font></a>] <a style="text-decoration: none; color: #0000FF;" href="#transitions_247">Transitions</a> <br><br><div id="transitions_247" style="display: block;">
-<table border=0 id="transitions_table_247" class="draggable transitions_table">
+[<a href="javascript:void(0)" onclick="toggle_visibility('transitions_248');" style="text-decoration: none;"><font size=+3><b>.</b></font></a>] <a style="text-decoration: none; color: #0000FF;" href="#transitions_248">Transitions</a> <br><br><div id="transitions_248" style="display: block;">
+<table border=0 id="transitions_table_248" class="draggable transitions_table">
 <tr>
 <th>&nbsp;</th></tr>
 <td>Default</td>
-<td style="text-align: left;">&nbsp;<font size=+1>-></font>&nbsp;<a href="#row245">Row 245 (state parse_ethernet)</a></td>
+<td style="text-align: left;">&nbsp;<font size=+1>-></font>&nbsp;<a href="#row246">Row 246 (state parse_ethernet)</a></td>
 </tr>
 </table>
 <br>Previous states: 
-<a href="#row242">Row 242</a><br>
+<a href="#row243">Row 243</a><br>
 </div></div><br><br>
 </td></tr>
 
-<tr><td id="row246" class="row_cell">
-<a href="#row246">Row 246</a> <br><br>
+<tr><td id="row247" class="row_cell">
+<a href="#row247">Row 247</a> <br><br>
 State parse_ethernet (from state default_parser)<br />
 <br>
 <div class="data_box">
-[<a href="javascript:void(0)" onclick="toggle_visibility('reg_data_246');" style="text-decoration: none;"><font size=+3><b>.</b></font></a>] <a style="text-decoration: none; color: #0000FF;" href="#reg_data_246">Raw register data</a> <br><br><div id="reg_data_246" style="display: none;">
+[<a href="javascript:void(0)" onclick="toggle_visibility('reg_data_247');" style="text-decoration: none;"><font size=+3><b>.</b></font></a>] <a style="text-decoration: none; color: #0000FF;" href="#reg_data_247">Raw register data</a> <br><br><div id="reg_data_247" style="display: none;">
 TCAM word: <table border=1>
 <tr>
 <td><center><font size=-3></font></center></td>
@@ -4343,17 +3948,17 @@
 <td><center>0</center></td>
 <td><center>1ff</center></td>
 <td><center>0</center></td>
-<td><center>84</center></td>
 <td><center>85</center></td>
-<td><center>3</center></td>
+<td><center>86</center></td>
+<td><center>4</center></td>
 <td><center>0</center></td>
 <td><center>0</center></td>
 <td><center>0</center></td>
 <td><center>0</center></td>
-<td><center>42</center></td>
-<td><center>1ff</center></td>
 <td><center>43</center></td>
-<td><center>41</center></td>
+<td><center>1ff</center></td>
+<td><center>44</center></td>
+<td><center>42</center></td>
 <td><center>0</center></td>
 <td><center>0</center></td>
 <td><center>1</center></td>
@@ -4374,7 +3979,7 @@
 <td><center>0</center></td>
 <td><center>0</center></td>
 <td><center>0</center></td>
-<td><center>4</center></td>
+<td><center>5</center></td>
 <td><center>0</center></td>
 <td><center>1ff</center></td>
 <td><center>8</center></td>
@@ -4403,7 +4008,7 @@
 </div></div><br><br>
 
 <div class="data_box">
-[<a href="javascript:void(0)" onclick="toggle_visibility('input_buffer_246');" style="text-decoration: none;"><font size=+3><b>.</b></font></a>] <a style="text-decoration: none; color: #0000FF;" href="#input_buffer_246">Input buffer</a> <br><br><div id="input_buffer_246" style="display: block;">
+[<a href="javascript:void(0)" onclick="toggle_visibility('input_buffer_247');" style="text-decoration: none;"><font size=+3><b>.</b></font></a>] <a style="text-decoration: none; color: #0000FF;" href="#input_buffer_247">Input buffer</a> <br><br><div id="input_buffer_247" style="display: block;">
 <div style="min-width: 1060;"></div>
 <table border=0><tr>
 <td valign=bottom align=right><font size=-3>Matches&nbsp;&nbsp;&nbsp;</font></td>
@@ -4509,23 +4114,6 @@
 </tr><tr>
 <td valign=top align=right><font size=-3>Extractions&nbsp;&nbsp;&nbsp;</font></td>
 <td height=1 style="position: relative">
-<div class="extr_arrow" style="width:27px; top: 0px;">65</div>
-</td>
-<td height=1 style="position: relative">
-<div class="extr_arrow" style="width:108px; top: 0px;">3</div>
-</td>
-<td height=1 style="position: relative">
-</td>
-<td height=1 style="position: relative">
-</td>
-<td height=1 style="position: relative">
-</td>
-<td height=1 style="position: relative">
-<div class="extr_arrow" style="width:54px; top: 0px;">132</div>
-</td>
-<td height=1 style="position: relative">
-</td>
-<td height=1 style="position: relative">
 <div class="extr_arrow" style="width:27px; top: 0px;">66</div>
 </td>
 <td height=1 style="position: relative">
@@ -4543,6 +4131,23 @@
 <td height=1 style="position: relative">
 </td>
 <td height=1 style="position: relative">
+<div class="extr_arrow" style="width:27px; top: 0px;">67</div>
+</td>
+<td height=1 style="position: relative">
+<div class="extr_arrow" style="width:108px; top: 0px;">5</div>
+</td>
+<td height=1 style="position: relative">
+</td>
+<td height=1 style="position: relative">
+</td>
+<td height=1 style="position: relative">
+</td>
+<td height=1 style="position: relative">
+<div class="extr_arrow" style="width:54px; top: 0px;">134</div>
+</td>
+<td height=1 style="position: relative">
+</td>
+<td height=1 style="position: relative">
 </td>
 <td height=1 style="position: relative">
 </td>
@@ -4580,12 +4185,12 @@
 </td>
 </tr></table>
 <div style="height:40px;">&nbsp;</div>
-PHV 67 <font size=+1>|=</font> 0x4<br>
+PHV 68 <font size=+1>|=</font> 0x4<br>
 <br>
 </div></div><br><br>
 <div class="data_box">
-[<a href="javascript:void(0)" onclick="toggle_visibility('transitions_246');" style="text-decoration: none;"><font size=+3><b>.</b></font></a>] <a style="text-decoration: none; color: #0000FF;" href="#transitions_246">Transitions</a> <br><br><div id="transitions_246" style="display: block;">
-<table border=0 id="transitions_table_246" class="draggable transitions_table">
+[<a href="javascript:void(0)" onclick="toggle_visibility('transitions_247');" style="text-decoration: none;"><font size=+3><b>.</b></font></a>] <a style="text-decoration: none; color: #0000FF;" href="#transitions_247">Transitions</a> <br><br><div id="transitions_247" style="display: block;">
+<table border=0 id="transitions_table_247" class="draggable transitions_table">
 <tr>
 <th>16b</th>
 <th>&nbsp;</th></tr>
@@ -4597,16 +4202,16 @@
 </tr>
 </table>
 <br>Previous states: 
-<a href="#row242">Row 242</a><br>
+<a href="#row243">Row 243</a><br>
 </div></div><br><br>
 </td></tr>
 
-<tr><td id="row245" class="row_cell">
-<a href="#row245">Row 245</a> <br><br>
+<tr><td id="row246" class="row_cell">
+<a href="#row246">Row 246</a> <br><br>
 State parse_ethernet (from state parse_pkt_out)<br />
 <br>
 <div class="data_box">
-[<a href="javascript:void(0)" onclick="toggle_visibility('reg_data_245');" style="text-decoration: none;"><font size=+3><b>.</b></font></a>] <a style="text-decoration: none; color: #0000FF;" href="#reg_data_245">Raw register data</a> <br><br><div id="reg_data_245" style="display: none;">
+[<a href="javascript:void(0)" onclick="toggle_visibility('reg_data_246');" style="text-decoration: none;"><font size=+3><b>.</b></font></a>] <a style="text-decoration: none; color: #0000FF;" href="#reg_data_246">Raw register data</a> <br><br><div id="reg_data_246" style="display: none;">
 TCAM word: <table border=1>
 <tr>
 <td><center><font size=-3></font></center></td>
@@ -4749,17 +4354,17 @@
 <td><center>0</center></td>
 <td><center>1ff</center></td>
 <td><center>0</center></td>
-<td><center>84</center></td>
 <td><center>85</center></td>
-<td><center>3</center></td>
+<td><center>86</center></td>
+<td><center>4</center></td>
 <td><center>0</center></td>
 <td><center>0</center></td>
 <td><center>0</center></td>
 <td><center>0</center></td>
-<td><center>42</center></td>
-<td><center>1ff</center></td>
 <td><center>43</center></td>
-<td><center>41</center></td>
+<td><center>1ff</center></td>
+<td><center>44</center></td>
+<td><center>42</center></td>
 <td><center>0</center></td>
 <td><center>0</center></td>
 <td><center>1</center></td>
@@ -4780,7 +4385,7 @@
 <td><center>0</center></td>
 <td><center>0</center></td>
 <td><center>0</center></td>
-<td><center>4</center></td>
+<td><center>5</center></td>
 <td><center>0</center></td>
 <td><center>1ff</center></td>
 <td><center>8</center></td>
@@ -4809,7 +4414,7 @@
 </div></div><br><br>
 
 <div class="data_box">
-[<a href="javascript:void(0)" onclick="toggle_visibility('input_buffer_245');" style="text-decoration: none;"><font size=+3><b>.</b></font></a>] <a style="text-decoration: none; color: #0000FF;" href="#input_buffer_245">Input buffer</a> <br><br><div id="input_buffer_245" style="display: block;">
+[<a href="javascript:void(0)" onclick="toggle_visibility('input_buffer_246');" style="text-decoration: none;"><font size=+3><b>.</b></font></a>] <a style="text-decoration: none; color: #0000FF;" href="#input_buffer_246">Input buffer</a> <br><br><div id="input_buffer_246" style="display: block;">
 <div style="min-width: 1060;"></div>
 <table border=0><tr>
 <td valign=bottom align=right><font size=-3>Matches&nbsp;&nbsp;&nbsp;</font></td>
@@ -4915,23 +4520,6 @@
 </tr><tr>
 <td valign=top align=right><font size=-3>Extractions&nbsp;&nbsp;&nbsp;</font></td>
 <td height=1 style="position: relative">
-<div class="extr_arrow" style="width:27px; top: 0px;">65</div>
-</td>
-<td height=1 style="position: relative">
-<div class="extr_arrow" style="width:108px; top: 0px;">3</div>
-</td>
-<td height=1 style="position: relative">
-</td>
-<td height=1 style="position: relative">
-</td>
-<td height=1 style="position: relative">
-</td>
-<td height=1 style="position: relative">
-<div class="extr_arrow" style="width:54px; top: 0px;">132</div>
-</td>
-<td height=1 style="position: relative">
-</td>
-<td height=1 style="position: relative">
 <div class="extr_arrow" style="width:27px; top: 0px;">66</div>
 </td>
 <td height=1 style="position: relative">
@@ -4949,6 +4537,23 @@
 <td height=1 style="position: relative">
 </td>
 <td height=1 style="position: relative">
+<div class="extr_arrow" style="width:27px; top: 0px;">67</div>
+</td>
+<td height=1 style="position: relative">
+<div class="extr_arrow" style="width:108px; top: 0px;">5</div>
+</td>
+<td height=1 style="position: relative">
+</td>
+<td height=1 style="position: relative">
+</td>
+<td height=1 style="position: relative">
+</td>
+<td height=1 style="position: relative">
+<div class="extr_arrow" style="width:54px; top: 0px;">134</div>
+</td>
+<td height=1 style="position: relative">
+</td>
+<td height=1 style="position: relative">
 </td>
 <td height=1 style="position: relative">
 </td>
@@ -4986,12 +4591,12 @@
 </td>
 </tr></table>
 <div style="height:40px;">&nbsp;</div>
-PHV 67 <font size=+1>|=</font> 0x4<br>
+PHV 68 <font size=+1>|=</font> 0x4<br>
 <br>
 </div></div><br><br>
 <div class="data_box">
-[<a href="javascript:void(0)" onclick="toggle_visibility('transitions_245');" style="text-decoration: none;"><font size=+3><b>.</b></font></a>] <a style="text-decoration: none; color: #0000FF;" href="#transitions_245">Transitions</a> <br><br><div id="transitions_245" style="display: block;">
-<table border=0 id="transitions_table_245" class="draggable transitions_table">
+[<a href="javascript:void(0)" onclick="toggle_visibility('transitions_246');" style="text-decoration: none;"><font size=+3><b>.</b></font></a>] <a style="text-decoration: none; color: #0000FF;" href="#transitions_246">Transitions</a> <br><br><div id="transitions_246" style="display: block;">
+<table border=0 id="transitions_table_246" class="draggable transitions_table">
 <tr>
 <th>16b</th>
 <th>&nbsp;</th></tr>
@@ -5003,16 +4608,16 @@
 </tr>
 </table>
 <br>Previous states: 
-<a href="#row247">Row 247</a><br>
+<a href="#row248">Row 248</a><br>
 </div></div><br><br>
 </td></tr>
 
-<tr><td id="row244" class="row_cell">
-<a href="#row244">Row 244</a> <br><br>
+<tr><td id="row245" class="row_cell">
+<a href="#row245">Row 245</a> <br><br>
 State start (from state &lt;POV initialization&gt;_&lt;Ingress intrinsic metadata&gt;_&lt;Phase 0&gt;)<br />
 <br>
 <div class="data_box">
-[<a href="javascript:void(0)" onclick="toggle_visibility('reg_data_244');" style="text-decoration: none;"><font size=+3><b>.</b></font></a>] <a style="text-decoration: none; color: #0000FF;" href="#reg_data_244">Raw register data</a> <br><br><div id="reg_data_244" style="display: none;">
+[<a href="javascript:void(0)" onclick="toggle_visibility('reg_data_245');" style="text-decoration: none;"><font size=+3><b>.</b></font></a>] <a style="text-decoration: none; color: #0000FF;" href="#reg_data_245">Raw register data</a> <br><br><div id="reg_data_245" style="display: none;">
 TCAM word: <table border=1>
 <tr>
 <td><center><font size=-3></font></center></td>
@@ -5164,7 +4769,7 @@
 <td><center>0</center></td>
 <td><center>1ff</center></td>
 <td><center>1ff</center></td>
-<td><center>43</center></td>
+<td><center>44</center></td>
 <td><center>1ff</center></td>
 <td><center>0</center></td>
 <td><center>0</center></td>
@@ -5215,7 +4820,7 @@
 </div></div><br><br>
 
 <div class="data_box">
-[<a href="javascript:void(0)" onclick="toggle_visibility('input_buffer_244');" style="text-decoration: none;"><font size=+3><b>.</b></font></a>] <a style="text-decoration: none; color: #0000FF;" href="#input_buffer_244">Input buffer</a> <br><br><div id="input_buffer_244" style="display: block;">
+[<a href="javascript:void(0)" onclick="toggle_visibility('input_buffer_245');" style="text-decoration: none;"><font size=+3><b>.</b></font></a>] <a style="text-decoration: none; color: #0000FF;" href="#input_buffer_245">Input buffer</a> <br><br><div id="input_buffer_245" style="display: block;">
 <div style="min-width: 1060;"></div>
 <table border=0><tr>
 <td valign=bottom align=right><font size=-3>Matches&nbsp;&nbsp;&nbsp;</font></td>
@@ -5386,20 +4991,20 @@
 </td>
 </tr></table>
 <div style="height:20px;">&nbsp;</div>
-PHV 67 <font size=+1>|=</font> 0x40<br>
+PHV 68 <font size=+1>|=</font> 0x40<br>
 <br>
 </div></div><br><br>
 <div class="data_box">
-[<a href="javascript:void(0)" onclick="toggle_visibility('transitions_244');" style="text-decoration: none;"><font size=+3><b>.</b></font></a>] <a style="text-decoration: none; color: #0000FF;" href="#transitions_244">Transitions</a> <br><br><div id="transitions_244" style="display: block;">
-<table border=0 id="transitions_table_244" class="draggable transitions_table">
+[<a href="javascript:void(0)" onclick="toggle_visibility('transitions_245');" style="text-decoration: none;"><font size=+3><b>.</b></font></a>] <a style="text-decoration: none; color: #0000FF;" href="#transitions_245">Transitions</a> <br><br><div id="transitions_245" style="display: block;">
+<table border=0 id="transitions_table_245" class="draggable transitions_table">
 <tr>
 <th>8b[0]</th>
 <th>&nbsp;</th></tr>
 <td>00</td>
-<td style="text-align: left;">&nbsp;<font size=+1>-></font>&nbsp;<a href="#row243">Row 243 (state parse_pkt_in)</a></td>
+<td style="text-align: left;">&nbsp;<font size=+1>-></font>&nbsp;<a href="#row244">Row 244 (state parse_pkt_in)</a></td>
 </tr>
 <td>Default</td>
-<td style="text-align: left;">&nbsp;<font size=+1>-></font>&nbsp;<a href="#row242">Row 242 (state default_parser)</a></td>
+<td style="text-align: left;">&nbsp;<font size=+1>-></font>&nbsp;<a href="#row243">Row 243 (state default_parser)</a></td>
 </tr>
 </table>
 <br>Previous states: 
@@ -5407,12 +5012,12 @@
 </div></div><br><br>
 </td></tr>
 
-<tr><td id="row243" class="row_cell">
-<a href="#row243">Row 243</a> <br><br>
+<tr><td id="row244" class="row_cell">
+<a href="#row244">Row 244</a> <br><br>
 State parse_pkt_in (from state start)<br />
 <br>
 <div class="data_box">
-[<a href="javascript:void(0)" onclick="toggle_visibility('reg_data_243');" style="text-decoration: none;"><font size=+3><b>.</b></font></a>] <a style="text-decoration: none; color: #0000FF;" href="#reg_data_243">Raw register data</a> <br><br><div id="reg_data_243" style="display: none;">
+[<a href="javascript:void(0)" onclick="toggle_visibility('reg_data_244');" style="text-decoration: none;"><font size=+3><b>.</b></font></a>] <a style="text-decoration: none; color: #0000FF;" href="#reg_data_244">Raw register data</a> <br><br><div id="reg_data_244" style="display: none;">
 TCAM word: <table border=1>
 <tr>
 <td><center><font size=-3></font></center></td>
@@ -5564,7 +5169,7 @@
 <td><center>0</center></td>
 <td><center>1ff</center></td>
 <td><center>1ff</center></td>
-<td><center>43</center></td>
+<td><center>44</center></td>
 <td><center>1ff</center></td>
 <td><center>0</center></td>
 <td><center>0</center></td>
@@ -5615,7 +5220,7 @@
 </div></div><br><br>
 
 <div class="data_box">
-[<a href="javascript:void(0)" onclick="toggle_visibility('input_buffer_243');" style="text-decoration: none;"><font size=+3><b>.</b></font></a>] <a style="text-decoration: none; color: #0000FF;" href="#input_buffer_243">Input buffer</a> <br><br><div id="input_buffer_243" style="display: block;">
+[<a href="javascript:void(0)" onclick="toggle_visibility('input_buffer_244');" style="text-decoration: none;"><font size=+3><b>.</b></font></a>] <a style="text-decoration: none; color: #0000FF;" href="#input_buffer_244">Input buffer</a> <br><br><div id="input_buffer_244" style="display: block;">
 <div style="min-width: 1060;"></div>
 <table border=0><tr>
 <td valign=bottom align=right><font size=-3>Matches&nbsp;&nbsp;&nbsp;</font></td>
@@ -5786,12 +5391,12 @@
 </td>
 </tr></table>
 <div style="height:40px;">&nbsp;</div>
-PHV 67 <font size=+1>|=</font> 0x1<br>
+PHV 68 <font size=+1>|=</font> 0x1<br>
 <br>
 </div></div><br><br>
 <div class="data_box">
-[<a href="javascript:void(0)" onclick="toggle_visibility('transitions_243');" style="text-decoration: none;"><font size=+3><b>.</b></font></a>] <a style="text-decoration: none; color: #0000FF;" href="#transitions_243">Transitions</a> <br><br><div id="transitions_243" style="display: block;">
-<table border=0 id="transitions_table_243" class="draggable transitions_table">
+[<a href="javascript:void(0)" onclick="toggle_visibility('transitions_244');" style="text-decoration: none;"><font size=+3><b>.</b></font></a>] <a style="text-decoration: none; color: #0000FF;" href="#transitions_244">Transitions</a> <br><br><div id="transitions_244" style="display: block;">
+<table border=0 id="transitions_table_244" class="draggable transitions_table">
 <tr>
 <th>&nbsp;</th></tr>
 <td>Default</td>
@@ -5799,16 +5404,16 @@
 </tr>
 </table>
 <br>Previous states: 
-<a href="#row244">Row 244</a><br>
+<a href="#row245">Row 245</a><br>
 </div></div><br><br>
 </td></tr>
 
-<tr><td id="row242" class="row_cell">
-<a href="#row242">Row 242</a> <br><br>
+<tr><td id="row243" class="row_cell">
+<a href="#row243">Row 243</a> <br><br>
 State default_parser (from state start)<br />
 <br>
 <div class="data_box">
-[<a href="javascript:void(0)" onclick="toggle_visibility('reg_data_242');" style="text-decoration: none;"><font size=+3><b>.</b></font></a>] <a style="text-decoration: none; color: #0000FF;" href="#reg_data_242">Raw register data</a> <br><br><div id="reg_data_242" style="display: none;">
+[<a href="javascript:void(0)" onclick="toggle_visibility('reg_data_243');" style="text-decoration: none;"><font size=+3><b>.</b></font></a>] <a style="text-decoration: none; color: #0000FF;" href="#reg_data_243">Raw register data</a> <br><br><div id="reg_data_243" style="display: none;">
 TCAM word: <table border=1>
 <tr>
 <td><center><font size=-3></font></center></td>
@@ -6010,13 +5615,13 @@
 </table> <br>
 </div></div><br><br>
 <div class="data_box">
-[<a href="javascript:void(0)" onclick="toggle_visibility('saved_242');" style="text-decoration: none;"><font size=+3><b>.</b></font></a>] <a style="text-decoration: none; color: #0000FF;" href="#saved_242">Saved matches</a> <br><br><div id="saved_242" style="display: block;">
+[<a href="javascript:void(0)" onclick="toggle_visibility('saved_243');" style="text-decoration: none;"><font size=+3><b>.</b></font></a>] <a style="text-decoration: none; color: #0000FF;" href="#saved_243">Saved matches</a> <br><br><div id="saved_243" style="display: block;">
 16b
  <font size=+1><-</font> 
 <a href="#row255">Row 255</a><br>
 </div></div><br><br>
 <div class="data_box">
-[<a href="javascript:void(0)" onclick="toggle_visibility('input_buffer_242');" style="text-decoration: none;"><font size=+3><b>.</b></font></a>] <a style="text-decoration: none; color: #0000FF;" href="#input_buffer_242">Input buffer</a> <br><br><div id="input_buffer_242" style="display: block;">
+[<a href="javascript:void(0)" onclick="toggle_visibility('input_buffer_243');" style="text-decoration: none;"><font size=+3><b>.</b></font></a>] <a style="text-decoration: none; color: #0000FF;" href="#input_buffer_243">Input buffer</a> <br><br><div id="input_buffer_243" style="display: block;">
 <div style="min-width: 1060;"></div>
 <table border=0><tr>
 <td valign=bottom align=right><font size=-3>Matches&nbsp;&nbsp;&nbsp;</font></td>
@@ -6188,23 +5793,28 @@
 <div style="height:20px;">&nbsp;</div>
 </div></div><br><br>
 <div class="data_box">
-[<a href="javascript:void(0)" onclick="toggle_visibility('transitions_242');" style="text-decoration: none;"><font size=+3><b>.</b></font></a>] <a style="text-decoration: none; color: #0000FF;" href="#transitions_242">Transitions</a> <br><br><div id="transitions_242" style="display: block;">
-<table border=0 id="transitions_table_242" class="draggable transitions_table">
+[<a href="javascript:void(0)" onclick="toggle_visibility('transitions_243');" style="text-decoration: none;"><font size=+3><b>.</b></font></a>] <a style="text-decoration: none; color: #0000FF;" href="#transitions_243">Transitions</a> <br><br><div id="transitions_243" style="display: block;">
+<table border=0 id="transitions_table_243" class="draggable transitions_table">
 <tr>
 <th>16b</th>
 <th>&nbsp;</th></tr>
 <td>00c0 && 01ff</td>
-<td style="text-align: left;">&nbsp;<font size=+1>-></font>&nbsp;<a href="#row247">Row 247 (state parse_pkt_out)</a></td>
+<td style="text-align: left;">&nbsp;<font size=+1>-></font>&nbsp;<a href="#row248">Row 248 (state parse_pkt_out)</a></td>
 </tr>
 <td>Default</td>
-<td style="text-align: left;">&nbsp;<font size=+1>-></font>&nbsp;<a href="#row246">Row 246 (state parse_ethernet)</a></td>
+<td style="text-align: left;">&nbsp;<font size=+1>-></font>&nbsp;<a href="#row247">Row 247 (state parse_ethernet)</a></td>
 </tr>
 </table>
 <br>Previous states: 
-<a href="#row244">Row 244</a><br>
+<a href="#row245">Row 245</a><br>
 </div></div><br><br>
 </td></tr>
 
+<tr><td id="row242" class="row_cell">
+<a href="#row242">Row 242</a> <br><br>
+Unmatchable
+</td></tr>
+
 <tr><td id="row241" class="row_cell">
 <a href="#row241">Row 241</a> <br><br>
 Unmatchable
@@ -7416,11 +7026,11 @@
 </td></tr>
 
 <tr><td class="row_cell">
-Matchable row occupancy: 14/256 (5.47%)
+Matchable row occupancy: 13/256 (5.08%)
 <br></td></tr>
 
 </table>
-<br><i>Created on Tue Sep 12 11:17:02 2017</i>
+<br><i>Created on Wed Sep 13 01:00:44 2017</i>
 
 <br><i>Compiler version: 5.1.0 (fca32d1)</i>
 
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/visualization/phv_allocation.html b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/visualization/phv_allocation.html
index c257013..dd55b9e 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/visualization/phv_allocation.html
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/visualization/phv_allocation.html
@@ -67,66 +67,58 @@
   Container Bit Width: 32
   Container Address: 3
 
-ethernet.dstAddr[39:8] in container bits [31:0]
+tcp.dstPort[7:0] in container bits [31:24]
+tcp.seqNo[31:8] in container bits [23:0]
 
-Field ethernet.dstAddr read by table table0 for a match key
+Field tcp.dstPort read by table table0 for Immediate.
+Field tcp.dstPort read by table table0's action ecmp_group (for field list)
 </title></rect>
 <text x="11" y="79" textLength="11" lengthAdjust="spacingAndGlyphs" textHeight="11" heightAdjust="spacingAndGlyphs" style="fill:black;">R<title>PHV Group: 0
   Assigned to Ingress
   Container Bit Width: 32
   Container Address: 3
 
-ethernet.dstAddr[39:8] in container bits [31:0]
+tcp.dstPort[7:0] in container bits [31:24]
+tcp.seqNo[31:8] in container bits [23:0]
 
-Field ethernet.dstAddr read by table table0 for a match key
+Field tcp.dstPort read by table table0 for Immediate.
+Field tcp.dstPort read by table table0's action ecmp_group (for field list)
 </title></text>
-<rect x="9" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 0
+<rect x="9" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 0
   Assigned to Ingress
   Container Bit Width: 32
   Container Address: 4
 
-ethernet.srcAddr[31:0] in container bits [31:0]
+ethernet.dstAddr[39:8] in container bits [31:0]
 
-Field ethernet.srcAddr read by table table0 for a match key
+Field ethernet.dstAddr read by table table0 for a match key
 </title></rect>
 <text x="11" y="97" textLength="11" lengthAdjust="spacingAndGlyphs" textHeight="11" heightAdjust="spacingAndGlyphs" style="fill:black;">R<title>PHV Group: 0
   Assigned to Ingress
   Container Bit Width: 32
   Container Address: 4
 
-ethernet.srcAddr[31:0] in container bits [31:0]
+ethernet.dstAddr[39:8] in container bits [31:0]
 
-Field ethernet.srcAddr read by table table0 for a match key
+Field ethernet.dstAddr read by table table0 for a match key
 </title></text>
 <rect x="9" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 0
   Assigned to Ingress
   Container Bit Width: 32
   Container Address: 5
 
-udp.srcPort[15:0] in container bits [31:16]
-udp.dstPort[15:0] in container bits [15:0]
+ethernet.srcAddr[31:0] in container bits [31:0]
 
-Field udp.dstPort read by table table0 for Immediate.
-Field udp.dstPort read by table table0 for Immediate.
-Field udp.srcPort read by table table0 for Immediate.
-Field udp.srcPort read by table table0 for Immediate.
-Field udp.srcPort read by table table0's action ecmp_group (for field list)
-Field udp.dstPort read by table table0's action ecmp_group (for field list)
+Field ethernet.srcAddr read by table table0 for a match key
 </title></rect>
 <text x="11" y="115" textLength="11" lengthAdjust="spacingAndGlyphs" textHeight="11" heightAdjust="spacingAndGlyphs" style="fill:black;">R<title>PHV Group: 0
   Assigned to Ingress
   Container Bit Width: 32
   Container Address: 5
 
-udp.srcPort[15:0] in container bits [31:16]
-udp.dstPort[15:0] in container bits [15:0]
+ethernet.srcAddr[31:0] in container bits [31:0]
 
-Field udp.dstPort read by table table0 for Immediate.
-Field udp.dstPort read by table table0 for Immediate.
-Field udp.srcPort read by table table0 for Immediate.
-Field udp.srcPort read by table table0 for Immediate.
-Field udp.srcPort read by table table0's action ecmp_group (for field list)
-Field udp.dstPort read by table table0's action ecmp_group (for field list)
+Field ethernet.srcAddr read by table table0 for a match key
 </title></text>
 <rect x="9" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 0
   Unassigned
@@ -563,41 +555,63 @@
   Container Bit Width: 8
   Container Address: 65
 
-ethernet.dstAddr[47:40] in container bits [7:0]
+tcp.srcPort[15:8] in container bits [7:0]
+udp.srcPort[7:0] in container bits [7:0]
 
-Field ethernet.dstAddr read by table table0 for a match key
+Field tcp.srcPort read by table table0 for Immediate.
+Field tcp.srcPort read by table table0's action ecmp_group (for field list)
 </title></rect>
 <text x="191" y="43" textLength="11" lengthAdjust="spacingAndGlyphs" textHeight="11" heightAdjust="spacingAndGlyphs" style="fill:black;">R<title>PHV Group: 4
   Assigned to Ingress
   Container Bit Width: 8
   Container Address: 65
 
-ethernet.dstAddr[47:40] in container bits [7:0]
+tcp.srcPort[15:8] in container bits [7:0]
+udp.srcPort[7:0] in container bits [7:0]
 
-Field ethernet.dstAddr read by table table0 for a match key
+Field tcp.srcPort read by table table0 for Immediate.
+Field tcp.srcPort read by table table0's action ecmp_group (for field list)
 </title></text>
-<rect x="189" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 4
+<rect x="189" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 4
   Assigned to Ingress
   Container Bit Width: 8
   Container Address: 66
 
-ethernet.srcAddr[39:32] in container bits [7:0]
+ethernet.dstAddr[47:40] in container bits [7:0]
 
-Field ethernet.srcAddr read by table table0 for a match key
+Field ethernet.dstAddr read by table table0 for a match key
 </title></rect>
 <text x="191" y="61" textLength="11" lengthAdjust="spacingAndGlyphs" textHeight="11" heightAdjust="spacingAndGlyphs" style="fill:black;">R<title>PHV Group: 4
   Assigned to Ingress
   Container Bit Width: 8
   Container Address: 66
 
+ethernet.dstAddr[47:40] in container bits [7:0]
+
+Field ethernet.dstAddr read by table table0 for a match key
+</title></text>
+<rect x="189" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 4
+  Assigned to Ingress
+  Container Bit Width: 8
+  Container Address: 67
+
+ethernet.srcAddr[39:32] in container bits [7:0]
+
+Field ethernet.srcAddr read by table table0 for a match key
+</title></rect>
+<text x="191" y="79" textLength="11" lengthAdjust="spacingAndGlyphs" textHeight="11" heightAdjust="spacingAndGlyphs" style="fill:black;">R<title>PHV Group: 4
+  Assigned to Ingress
+  Container Bit Width: 8
+  Container Address: 67
+
 ethernet.srcAddr[39:32] in container bits [7:0]
 
 Field ethernet.srcAddr read by table table0 for a match key
 </title></text>
-<rect x="189" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkred""><title>PHV Group: 4
+<rect x="189" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkred""><title>PHV Group: 4
   Assigned to Ingress
   Container Bit Width: 8
-  Container Address: 67
+  Container Address: 68
 
 POV.POV[39:32] in container bits [7:0]
 
@@ -605,10 +619,10 @@
 Field --validity_check--packet_out_hdr written by table process_packet_out_table's action _process_packet_out
 Field --validity_check--packet_in_hdr written by table table0's action send_to_cpu
 </title></rect>
-<text x="191" y="79" textLength="11" lengthAdjust="spacingAndGlyphs" textHeight="11" heightAdjust="spacingAndGlyphs" style="fill:black;">RW<title>PHV Group: 4
+<text x="191" y="97" textLength="11" lengthAdjust="spacingAndGlyphs" textHeight="11" heightAdjust="spacingAndGlyphs" style="fill:black;">RW<title>PHV Group: 4
   Assigned to Ingress
   Container Bit Width: 8
-  Container Address: 67
+  Container Address: 68
 
 POV.POV[39:32] in container bits [7:0]
 
@@ -616,31 +630,24 @@
 Field --validity_check--packet_out_hdr written by table process_packet_out_table's action _process_packet_out
 Field --validity_check--packet_in_hdr written by table table0's action send_to_cpu
 </title></text>
-<rect x="189" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:beige""><title>PHV Group: 4
+<rect x="189" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:beige""><title>PHV Group: 4
   Assigned to Ingress
   Container Bit Width: 8
-  Container Address: 68
-
-ig_intr_md_for_tm.drop_ctl[2:0] in container bits [7:5]
-
-Field ig_intr_md_for_tm.drop_ctl written by table table0's action _drop
-</title></rect>
-<text x="191" y="97" textLength="11" lengthAdjust="spacingAndGlyphs" textHeight="11" heightAdjust="spacingAndGlyphs" style="fill:black;">W<title>PHV Group: 4
-  Assigned to Ingress
-  Container Bit Width: 8
-  Container Address: 68
-
-ig_intr_md_for_tm.drop_ctl[2:0] in container bits [7:5]
-
-Field ig_intr_md_for_tm.drop_ctl written by table table0's action _drop
-</title></text>
-<rect x="189" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 4
-  Unassigned
-  Container Bit Width: 8
   Container Address: 69
 
+ig_intr_md_for_tm.drop_ctl[2:0] in container bits [7:5]
 
+Field ig_intr_md_for_tm.drop_ctl written by table table0's action _drop
 </title></rect>
+<text x="191" y="115" textLength="11" lengthAdjust="spacingAndGlyphs" textHeight="11" heightAdjust="spacingAndGlyphs" style="fill:black;">W<title>PHV Group: 4
+  Assigned to Ingress
+  Container Bit Width: 8
+  Container Address: 69
+
+ig_intr_md_for_tm.drop_ctl[2:0] in container bits [7:5]
+
+Field ig_intr_md_for_tm.drop_ctl written by table table0's action _drop
+</title></text>
 <rect x="189" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 4
   Unassigned
   Container Bit Width: 8
@@ -1157,84 +1164,103 @@
   Container Bit Width: 16
   Container Address: 132
 
-ethernet.dstAddr[7:0] in container bits [15:8]
-ethernet.srcAddr[47:40] in container bits [7:0]
+tcp.srcPort[7:0] in container bits [15:8]
+tcp.dstPort[15:8] in container bits [7:0]
 
-Field ethernet.dstAddr read by table table0 for a match key
-Field ethernet.srcAddr read by table table0 for a match key
+Field tcp.srcPort read by table table0 for Immediate.
+Field tcp.dstPort read by table table0 for Immediate.
+Field tcp.srcPort read by table table0's action ecmp_group (for field list)
+Field tcp.dstPort read by table table0's action ecmp_group (for field list)
 </title></rect>
 <text x="371" y="97" textLength="11" lengthAdjust="spacingAndGlyphs" textHeight="11" heightAdjust="spacingAndGlyphs" style="fill:black;">R<title>PHV Group: 8
   Assigned to Ingress
   Container Bit Width: 16
   Container Address: 132
 
+tcp.srcPort[7:0] in container bits [15:8]
+tcp.dstPort[15:8] in container bits [7:0]
+
+Field tcp.srcPort read by table table0 for Immediate.
+Field tcp.dstPort read by table table0 for Immediate.
+Field tcp.srcPort read by table table0's action ecmp_group (for field list)
+Field tcp.dstPort read by table table0's action ecmp_group (for field list)
+</title></text>
+<rect x="369" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 8
+  Assigned to Ingress
+  Container Bit Width: 16
+  Container Address: 133
+
 ethernet.dstAddr[7:0] in container bits [15:8]
 ethernet.srcAddr[47:40] in container bits [7:0]
 
 Field ethernet.dstAddr read by table table0 for a match key
 Field ethernet.srcAddr read by table table0 for a match key
-</title></text>
-<rect x="369" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 8
-  Assigned to Ingress
-  Container Bit Width: 16
-  Container Address: 133
-
-ethernet.etherType[15:0] in container bits [15:0]
-
-Field ethernet.etherType read by table table0 for a match key
 </title></rect>
 <text x="371" y="115" textLength="11" lengthAdjust="spacingAndGlyphs" textHeight="11" heightAdjust="spacingAndGlyphs" style="fill:black;">R<title>PHV Group: 8
   Assigned to Ingress
   Container Bit Width: 16
   Container Address: 133
 
+ethernet.dstAddr[7:0] in container bits [15:8]
+ethernet.srcAddr[47:40] in container bits [7:0]
+
+Field ethernet.dstAddr read by table table0 for a match key
+Field ethernet.srcAddr read by table table0 for a match key
+</title></text>
+<rect x="369" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 8
+  Assigned to Ingress
+  Container Bit Width: 16
+  Container Address: 134
+
 ethernet.etherType[15:0] in container bits [15:0]
 
 Field ethernet.etherType read by table table0 for a match key
-</title></text>
-<rect x="369" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:goldenrod""><title>PHV Group: 8
-  Assigned to Ingress
-  Container Bit Width: 16
-  Container Address: 134
-
-ecmp_metadata.group_id[15:0] in container bits [15:0]
-
-Field ecmp_metadata.group_id written by table table0's action ecmp_group
 </title></rect>
-<text x="371" y="133" textLength="11" lengthAdjust="spacingAndGlyphs" textHeight="11" heightAdjust="spacingAndGlyphs" style="fill:black;">W<title>PHV Group: 8
+<text x="371" y="133" textLength="11" lengthAdjust="spacingAndGlyphs" textHeight="11" heightAdjust="spacingAndGlyphs" style="fill:black;">R<title>PHV Group: 8
   Assigned to Ingress
   Container Bit Width: 16
   Container Address: 134
 
-ecmp_metadata.group_id[15:0] in container bits [15:0]
+ethernet.etherType[15:0] in container bits [15:0]
 
-Field ecmp_metadata.group_id written by table table0's action ecmp_group
+Field ethernet.etherType read by table table0 for a match key
 </title></text>
 <rect x="369" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:goldenrod""><title>PHV Group: 8
   Assigned to Ingress
   Container Bit Width: 16
   Container Address: 135
 
-ecmp_metadata.selector[15:0] in container bits [15:0]
+ecmp_metadata.group_id[15:0] in container bits [15:0]
 
-Field ecmp_metadata.selector written by table table0's action ecmp_group
+Field ecmp_metadata.group_id written by table table0's action ecmp_group
 </title></rect>
 <text x="371" y="151" textLength="11" lengthAdjust="spacingAndGlyphs" textHeight="11" heightAdjust="spacingAndGlyphs" style="fill:black;">W<title>PHV Group: 8
   Assigned to Ingress
   Container Bit Width: 16
   Container Address: 135
 
+ecmp_metadata.group_id[15:0] in container bits [15:0]
+
+Field ecmp_metadata.group_id written by table table0's action ecmp_group
+</title></text>
+<rect x="387" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:goldenrod""><title>PHV Group: 8
+  Assigned to Ingress
+  Container Bit Width: 16
+  Container Address: 136
+
+ecmp_metadata.selector[15:0] in container bits [15:0]
+
+Field ecmp_metadata.selector written by table table0's action ecmp_group
+</title></rect>
+<text x="389" y="25" textLength="11" lengthAdjust="spacingAndGlyphs" textHeight="11" heightAdjust="spacingAndGlyphs" style="fill:black;">W<title>PHV Group: 8
+  Assigned to Ingress
+  Container Bit Width: 16
+  Container Address: 136
+
 ecmp_metadata.selector[15:0] in container bits [15:0]
 
 Field ecmp_metadata.selector written by table table0's action ecmp_group
 </title></text>
-<rect x="387" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 8
-  Unassigned
-  Container Bit Width: 16
-  Container Address: 136
-
-
-</title></rect>
 <rect x="387" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 8
   Unassigned
   Container Bit Width: 16
@@ -1864,7 +1890,7 @@
 ipv4.ttl[7:0] in container bits [7:0]
 
 </title></rect>
-<rect x="729" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 16
+<rect x="729" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 16
   Assigned to Ingress
   Container Bit Width: 32
   Container Address: 257
@@ -1874,10 +1900,12 @@
 tcp.res[2:0] in container bits [27:25]
 tcp.ecn[2:0] in container bits [24:22]
 tcp.ctrl[5:0] in container bits [21:16]
+udp.length_[15:0] in container bits [31:16]
 tcp.window[15:0] in container bits [15:0]
+udp.checksum[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="729" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 16
+<rect x="729" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 16
   Assigned to Ingress
   Container Bit Width: 32
   Container Address: 258
@@ -1895,42 +1923,10 @@
 
 
 </title></rect>
-<rect x="729" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 16
-  Unassigned
-  Container Bit Width: 32
-  Container Address: 260
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="729" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 16
-  Unassigned
-  Container Bit Width: 32
-  Container Address: 261
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="729" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 16
-  Unassigned
-  Container Bit Width: 32
-  Container Address: 262
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="729" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 16
-  Unassigned
-  Container Bit Width: 32
-  Container Address: 263
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="747" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 16
+<rect x="729" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 16
   Assigned to Egress
   Container Bit Width: 32
-  Container Address: 264
+  Container Address: 260
   Tag-Along Space
 
 ipv4.ttl[7:0] in container bits [31:24]
@@ -1938,28 +1934,28 @@
 ipv4.hdrChecksum[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="747" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 16
+<rect x="729" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 16
   Assigned to Egress
   Container Bit Width: 32
-  Container Address: 265
+  Container Address: 261
   Tag-Along Space
 
 ipv4.srcAddr[31:0] in container bits [31:0]
 
 </title></rect>
-<rect x="747" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 16
+<rect x="729" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 16
   Assigned to Egress
   Container Bit Width: 32
-  Container Address: 266
+  Container Address: 262
   Tag-Along Space
 
 ipv4.dstAddr[31:0] in container bits [31:0]
 
 </title></rect>
-<rect x="747" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 16
+<rect x="729" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 16
   Assigned to Egress
   Container Bit Width: 32
-  Container Address: 267
+  Container Address: 263
   Tag-Along Space
 
 udp.length_[15:0] in container bits [31:16]
@@ -1967,10 +1963,10 @@
 udp.checksum[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="747" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 16
+<rect x="747" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 16
   Assigned to Egress
   Container Bit Width: 32
-  Container Address: 268
+  Container Address: 264
   Tag-Along Space
 
 tcp.dataOffset[3:0] in container bits [31:28]
@@ -1980,32 +1976,64 @@
 tcp.window[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="747" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 16
+<rect x="747" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 16
   Assigned to Egress
   Container Bit Width: 32
-  Container Address: 269
+  Container Address: 265
   Tag-Along Space
 
 tcp.checksum[15:0] in container bits [31:16]
 tcp.urgentPtr[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="747" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 16
+<rect x="747" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 16
   Assigned to Egress
   Container Bit Width: 32
-  Container Address: 270
+  Container Address: 266
   Tag-Along Space
 
 ethernet.dstAddr[39:8] in container bits [31:0]
 
 </title></rect>
-<rect x="747" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 16
+<rect x="747" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 16
   Assigned to Egress
   Container Bit Width: 32
+  Container Address: 267
+  Tag-Along Space
+
+ethernet.srcAddr[31:0] in container bits [31:0]
+
+</title></rect>
+<rect x="747" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 16
+  Unassigned
+  Container Bit Width: 32
+  Container Address: 268
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="747" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 16
+  Unassigned
+  Container Bit Width: 32
+  Container Address: 269
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="747" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 16
+  Unassigned
+  Container Bit Width: 32
+  Container Address: 270
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="747" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 16
+  Unassigned
+  Container Bit Width: 32
   Container Address: 271
   Tag-Along Space
 
-ethernet.srcAddr[31:0] in container bits [31:0]
 
 </title></rect>
 <text x="740" y="178" textLength="16" lengthAdjust="spacingAndGlyphs" textHeight="16" heightAdjust="spacingAndGlyphs" style="fill:black;">32</text>
@@ -2148,123 +2176,119 @@
 ipv4.ihl[3:0] in container bits [3:0]
 
 </title></rect>
-<rect x="819" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 18
+<rect x="819" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 18
   Assigned to Ingress
   Container Bit Width: 8
   Container Address: 289
   Tag-Along Space
 
-tcp.srcPort[15:8] in container bits [7:0]
-udp.length_[15:8] in container bits [7:0]
+tcp.seqNo[7:0] in container bits [7:0]
+udp.srcPort[15:8] in container bits [7:0]
 
 </title></rect>
-<rect x="819" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 18
-  Assigned to Ingress
+<rect x="819" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
+  Unassigned
   Container Bit Width: 8
   Container Address: 290
   Tag-Along Space
 
-tcp.srcPort[7:0] in container bits [7:0]
-udp.length_[7:0] in container bits [7:0]
 
 </title></rect>
-<rect x="819" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 18
-  Assigned to Ingress
+<rect x="819" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
+  Unassigned
   Container Bit Width: 8
   Container Address: 291
   Tag-Along Space
 
-tcp.dstPort[15:8] in container bits [7:0]
 
 </title></rect>
-<rect x="819" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 18
-  Assigned to Ingress
-  Container Bit Width: 8
-  Container Address: 292
-  Tag-Along Space
-
-tcp.dstPort[7:0] in container bits [7:0]
-
-</title></rect>
-<rect x="819" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
-  Unassigned
-  Container Bit Width: 8
-  Container Address: 293
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="819" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
-  Unassigned
-  Container Bit Width: 8
-  Container Address: 294
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="819" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
-  Unassigned
-  Container Bit Width: 8
-  Container Address: 295
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="837" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 18
+<rect x="819" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 18
   Assigned to Egress
   Container Bit Width: 8
-  Container Address: 296
+  Container Address: 292
   Tag-Along Space
 
 ipv4.version[3:0] in container bits [7:4]
 ipv4.ihl[3:0] in container bits [3:0]
 
 </title></rect>
-<rect x="837" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 18
+<rect x="819" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 18
   Assigned to Egress
   Container Bit Width: 8
-  Container Address: 297
+  Container Address: 293
   Tag-Along Space
 
 ipv4.diffserv[7:0] in container bits [7:0]
 
 </title></rect>
-<rect x="837" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 18
+<rect x="819" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 18
   Assigned to Egress
   Container Bit Width: 8
-  Container Address: 298
+  Container Address: 294
   Tag-Along Space
 
 tcp.srcPort[15:8] in container bits [7:0]
 udp.srcPort[15:8] in container bits [7:0]
 
 </title></rect>
-<rect x="837" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 18
+<rect x="819" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 18
   Assigned to Egress
   Container Bit Width: 8
-  Container Address: 299
+  Container Address: 295
   Tag-Along Space
 
 tcp.srcPort[7:0] in container bits [7:0]
 udp.srcPort[7:0] in container bits [7:0]
 
 </title></rect>
-<rect x="837" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 18
+<rect x="837" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 18
   Assigned to Egress
   Container Bit Width: 8
-  Container Address: 300
+  Container Address: 296
   Tag-Along Space
 
 ethernet.dstAddr[47:40] in container bits [7:0]
 
 </title></rect>
-<rect x="837" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 18
+<rect x="837" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 18
   Assigned to Egress
   Container Bit Width: 8
+  Container Address: 297
+  Tag-Along Space
+
+ethernet.srcAddr[39:32] in container bits [7:0]
+
+</title></rect>
+<rect x="837" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
+  Unassigned
+  Container Bit Width: 8
+  Container Address: 298
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="837" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
+  Unassigned
+  Container Bit Width: 8
+  Container Address: 299
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="837" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
+  Unassigned
+  Container Bit Width: 8
+  Container Address: 300
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="837" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
+  Unassigned
+  Container Bit Width: 8
   Container Address: 301
   Tag-Along Space
 
-ethernet.srcAddr[39:32] in container bits [7:0]
 
 </title></rect>
 <rect x="837" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
@@ -2433,171 +2457,120 @@
 ipv4.identification[15:8] in container bits [7:0]
 
 </title></rect>
-<rect x="909" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 20
+<rect x="909" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 20
   Assigned to Ingress
   Container Bit Width: 16
   Container Address: 322
   Tag-Along Space
 
-tcp.seqNo[31:16] in container bits [15:0]
-udp.checksum[15:0] in container bits [15:0]
+tcp.ackNo[31:16] in container bits [15:0]
+udp.dstPort[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="909" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 20
+<rect x="909" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 20
   Assigned to Ingress
   Container Bit Width: 16
   Container Address: 323
   Tag-Along Space
 
-tcp.seqNo[15:0] in container bits [15:0]
+tcp.ackNo[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="909" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 20
-  Assigned to Ingress
+<rect x="909" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 20
+  Unassigned
   Container Bit Width: 16
   Container Address: 324
   Tag-Along Space
 
-tcp.ackNo[31:16] in container bits [15:0]
 
 </title></rect>
-<rect x="909" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 20
-  Assigned to Ingress
+<rect x="909" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 20
+  Unassigned
   Container Bit Width: 16
   Container Address: 325
   Tag-Along Space
 
-tcp.ackNo[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="909" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 20
-  Unassigned
-  Container Bit Width: 16
-  Container Address: 326
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="909" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 20
-  Unassigned
-  Container Bit Width: 16
-  Container Address: 327
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="927" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 20
-  Unassigned
-  Container Bit Width: 16
-  Container Address: 328
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="927" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 20
-  Unassigned
-  Container Bit Width: 16
-  Container Address: 329
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="927" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 20
-  Unassigned
-  Container Bit Width: 16
-  Container Address: 330
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="927" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 20
-  Unassigned
-  Container Bit Width: 16
-  Container Address: 331
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="927" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 20
+<rect x="909" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 20
   Assigned to Egress
   Container Bit Width: 16
-  Container Address: 332
+  Container Address: 326
   Tag-Along Space
 
 ipv4.totalLen[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="927" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 20
+<rect x="909" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 20
   Assigned to Egress
   Container Bit Width: 16
-  Container Address: 333
+  Container Address: 327
   Tag-Along Space
 
 ipv4.identification[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="927" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 20
+<rect x="927" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 20
   Assigned to Egress
   Container Bit Width: 16
-  Container Address: 334
+  Container Address: 328
   Tag-Along Space
 
 ipv4.flags[2:0] in container bits [15:13]
 ipv4.fragOffset[12:0] in container bits [12:0]
 
 </title></rect>
-<rect x="927" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 20
+<rect x="927" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 20
   Assigned to Egress
   Container Bit Width: 16
-  Container Address: 335
+  Container Address: 329
   Tag-Along Space
 
 tcp.dstPort[15:0] in container bits [15:0]
-
-</title></rect>
-<text x="920" y="178" textLength="16" lengthAdjust="spacingAndGlyphs" textHeight="16" heightAdjust="spacingAndGlyphs" style="fill:black;">16</text>
-<rect x="954" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 21
-  Assigned to Egress
-  Container Bit Width: 16
-  Container Address: 336
-  Tag-Along Space
-
-tcp.seqNo[31:16] in container bits [15:0]
 udp.dstPort[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="954" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 21
+<rect x="927" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 20
   Assigned to Egress
   Container Bit Width: 16
-  Container Address: 337
+  Container Address: 330
+  Tag-Along Space
+
+tcp.seqNo[31:16] in container bits [15:0]
+
+</title></rect>
+<rect x="927" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 20
+  Assigned to Egress
+  Container Bit Width: 16
+  Container Address: 331
   Tag-Along Space
 
 tcp.seqNo[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="954" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 21
+<rect x="927" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 20
   Assigned to Egress
   Container Bit Width: 16
-  Container Address: 338
+  Container Address: 332
   Tag-Along Space
 
 ethernet.dstAddr[7:0] in container bits [15:8]
 ethernet.srcAddr[47:40] in container bits [7:0]
 
 </title></rect>
-<rect x="954" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 21
+<rect x="927" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 20
   Assigned to Egress
   Container Bit Width: 16
-  Container Address: 339
+  Container Address: 333
   Tag-Along Space
 
 ethernet.etherType[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="954" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:gold""><title>PHV Group: 21
+<rect x="927" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:gold""><title>PHV Group: 20
   Assigned to Egress
   Container Bit Width: 16
-  Container Address: 340
+  Container Address: 334
   Tag-Along Space
 
 packet_out_hdr.egress_port[8:0] in container bits [15:7]
@@ -2606,6 +2579,55 @@
 packet_in_hdr._padding[6:0] in container bits [6:0]
 
 </title></rect>
+<rect x="927" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 20
+  Unassigned
+  Container Bit Width: 16
+  Container Address: 335
+  Tag-Along Space
+
+
+</title></rect>
+<text x="920" y="178" textLength="16" lengthAdjust="spacingAndGlyphs" textHeight="16" heightAdjust="spacingAndGlyphs" style="fill:black;">16</text>
+<rect x="954" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 21
+  Unassigned
+  Container Bit Width: 16
+  Container Address: 336
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="954" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 21
+  Unassigned
+  Container Bit Width: 16
+  Container Address: 337
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="954" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 21
+  Unassigned
+  Container Bit Width: 16
+  Container Address: 338
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="954" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 21
+  Unassigned
+  Container Bit Width: 16
+  Container Address: 339
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="954" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 21
+  Unassigned
+  Container Bit Width: 16
+  Container Address: 340
+  Tag-Along Space
+
+
+</title></rect>
 <rect x="954" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 21
   Unassigned
   Container Bit Width: 16
@@ -2859,15 +2881,16 @@
   Container Bit Width: 32
   Container Address: 3
 
-ethernet.dstAddr[39:8] in container bits [31:0]
+tcp.dstPort[7:0] in container bits [31:24]
+tcp.seqNo[31:8] in container bits [23:0]
 
 </title></rect>
-<rect x="9" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 0
+<rect x="9" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 0
   Assigned to Ingress
   Container Bit Width: 32
   Container Address: 4
 
-ethernet.srcAddr[31:0] in container bits [31:0]
+ethernet.dstAddr[39:8] in container bits [31:0]
 
 </title></rect>
 <rect x="9" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 0
@@ -2875,8 +2898,7 @@
   Container Bit Width: 32
   Container Address: 5
 
-udp.srcPort[15:0] in container bits [31:16]
-udp.dstPort[15:0] in container bits [15:0]
+ethernet.srcAddr[31:0] in container bits [31:0]
 
 </title></rect>
 <rect x="9" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 0
@@ -3302,38 +3324,40 @@
   Container Bit Width: 8
   Container Address: 65
 
-ethernet.dstAddr[47:40] in container bits [7:0]
+tcp.srcPort[15:8] in container bits [7:0]
+udp.srcPort[7:0] in container bits [7:0]
 
 </title></rect>
-<rect x="189" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 4
+<rect x="189" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 4
   Assigned to Ingress
   Container Bit Width: 8
   Container Address: 66
 
-ethernet.srcAddr[39:32] in container bits [7:0]
+ethernet.dstAddr[47:40] in container bits [7:0]
 
 </title></rect>
-<rect x="189" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkred""><title>PHV Group: 4
+<rect x="189" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 4
   Assigned to Ingress
   Container Bit Width: 8
   Container Address: 67
 
-POV.POV[39:32] in container bits [7:0]
+ethernet.srcAddr[39:32] in container bits [7:0]
 
 </title></rect>
-<rect x="189" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:beige""><title>PHV Group: 4
+<rect x="189" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkred""><title>PHV Group: 4
   Assigned to Ingress
   Container Bit Width: 8
   Container Address: 68
 
-ig_intr_md_for_tm.drop_ctl[2:0] in container bits [7:5]
+POV.POV[39:32] in container bits [7:0]
 
 </title></rect>
-<rect x="189" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 4
-  Unassigned
+<rect x="189" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:beige""><title>PHV Group: 4
+  Assigned to Ingress
   Container Bit Width: 8
   Container Address: 69
 
+ig_intr_md_for_tm.drop_ctl[2:0] in container bits [7:5]
 
 </title></rect>
 <rect x="189" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 4
@@ -3803,61 +3827,63 @@
   Container Bit Width: 16
   Container Address: 132
 
-ethernet.dstAddr[7:0] in container bits [15:8]
-ethernet.srcAddr[47:40] in container bits [7:0]
+tcp.srcPort[7:0] in container bits [15:8]
+tcp.dstPort[15:8] in container bits [7:0]
 
 </title></rect>
-<rect x="369" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 8
+<rect x="369" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 8
   Assigned to Ingress
   Container Bit Width: 16
   Container Address: 133
 
+ethernet.dstAddr[7:0] in container bits [15:8]
+ethernet.srcAddr[47:40] in container bits [7:0]
+
+</title></rect>
+<rect x="369" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 8
+  Assigned to Ingress
+  Container Bit Width: 16
+  Container Address: 134
+
 ethernet.etherType[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="369" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:goldenrod""><title>PHV Group: 8
-  Assigned to Ingress
-  Container Bit Width: 16
-  Container Address: 134
-
-ecmp_metadata.group_id[15:0] in container bits [15:0]
-
-Field ecmp_metadata.group_id read by table ecmp_group_table for a match key
-</title></rect>
-<text x="371" y="133" textLength="11" lengthAdjust="spacingAndGlyphs" textHeight="11" heightAdjust="spacingAndGlyphs" style="fill:black;">R<title>PHV Group: 8
-  Assigned to Ingress
-  Container Bit Width: 16
-  Container Address: 134
-
-ecmp_metadata.group_id[15:0] in container bits [15:0]
-
-Field ecmp_metadata.group_id read by table ecmp_group_table for a match key
-</title></text>
 <rect x="369" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:goldenrod""><title>PHV Group: 8
   Assigned to Ingress
   Container Bit Width: 16
   Container Address: 135
 
-ecmp_metadata.selector[15:0] in container bits [15:0]
+ecmp_metadata.group_id[15:0] in container bits [15:0]
 
-Field ecmp_metadata.selector read by table ecmp_group_table for a match key
+Field ecmp_metadata.group_id read by table ecmp_group_table for a match key
 </title></rect>
 <text x="371" y="151" textLength="11" lengthAdjust="spacingAndGlyphs" textHeight="11" heightAdjust="spacingAndGlyphs" style="fill:black;">R<title>PHV Group: 8
   Assigned to Ingress
   Container Bit Width: 16
   Container Address: 135
 
+ecmp_metadata.group_id[15:0] in container bits [15:0]
+
+Field ecmp_metadata.group_id read by table ecmp_group_table for a match key
+</title></text>
+<rect x="387" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:goldenrod""><title>PHV Group: 8
+  Assigned to Ingress
+  Container Bit Width: 16
+  Container Address: 136
+
+ecmp_metadata.selector[15:0] in container bits [15:0]
+
+Field ecmp_metadata.selector read by table ecmp_group_table for a match key
+</title></rect>
+<text x="389" y="25" textLength="11" lengthAdjust="spacingAndGlyphs" textHeight="11" heightAdjust="spacingAndGlyphs" style="fill:black;">R<title>PHV Group: 8
+  Assigned to Ingress
+  Container Bit Width: 16
+  Container Address: 136
+
 ecmp_metadata.selector[15:0] in container bits [15:0]
 
 Field ecmp_metadata.selector read by table ecmp_group_table for a match key
 </title></text>
-<rect x="387" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 8
-  Unassigned
-  Container Bit Width: 16
-  Container Address: 136
-
-
-</title></rect>
 <rect x="387" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 8
   Unassigned
   Container Bit Width: 16
@@ -4487,7 +4513,7 @@
 ipv4.ttl[7:0] in container bits [7:0]
 
 </title></rect>
-<rect x="729" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 16
+<rect x="729" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 16
   Assigned to Ingress
   Container Bit Width: 32
   Container Address: 257
@@ -4497,10 +4523,12 @@
 tcp.res[2:0] in container bits [27:25]
 tcp.ecn[2:0] in container bits [24:22]
 tcp.ctrl[5:0] in container bits [21:16]
+udp.length_[15:0] in container bits [31:16]
 tcp.window[15:0] in container bits [15:0]
+udp.checksum[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="729" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 16
+<rect x="729" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 16
   Assigned to Ingress
   Container Bit Width: 32
   Container Address: 258
@@ -4518,42 +4546,10 @@
 
 
 </title></rect>
-<rect x="729" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 16
-  Unassigned
-  Container Bit Width: 32
-  Container Address: 260
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="729" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 16
-  Unassigned
-  Container Bit Width: 32
-  Container Address: 261
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="729" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 16
-  Unassigned
-  Container Bit Width: 32
-  Container Address: 262
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="729" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 16
-  Unassigned
-  Container Bit Width: 32
-  Container Address: 263
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="747" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 16
+<rect x="729" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 16
   Assigned to Egress
   Container Bit Width: 32
-  Container Address: 264
+  Container Address: 260
   Tag-Along Space
 
 ipv4.ttl[7:0] in container bits [31:24]
@@ -4561,28 +4557,28 @@
 ipv4.hdrChecksum[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="747" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 16
+<rect x="729" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 16
   Assigned to Egress
   Container Bit Width: 32
-  Container Address: 265
+  Container Address: 261
   Tag-Along Space
 
 ipv4.srcAddr[31:0] in container bits [31:0]
 
 </title></rect>
-<rect x="747" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 16
+<rect x="729" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 16
   Assigned to Egress
   Container Bit Width: 32
-  Container Address: 266
+  Container Address: 262
   Tag-Along Space
 
 ipv4.dstAddr[31:0] in container bits [31:0]
 
 </title></rect>
-<rect x="747" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 16
+<rect x="729" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 16
   Assigned to Egress
   Container Bit Width: 32
-  Container Address: 267
+  Container Address: 263
   Tag-Along Space
 
 udp.length_[15:0] in container bits [31:16]
@@ -4590,10 +4586,10 @@
 udp.checksum[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="747" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 16
+<rect x="747" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 16
   Assigned to Egress
   Container Bit Width: 32
-  Container Address: 268
+  Container Address: 264
   Tag-Along Space
 
 tcp.dataOffset[3:0] in container bits [31:28]
@@ -4603,32 +4599,64 @@
 tcp.window[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="747" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 16
+<rect x="747" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 16
   Assigned to Egress
   Container Bit Width: 32
-  Container Address: 269
+  Container Address: 265
   Tag-Along Space
 
 tcp.checksum[15:0] in container bits [31:16]
 tcp.urgentPtr[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="747" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 16
+<rect x="747" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 16
   Assigned to Egress
   Container Bit Width: 32
-  Container Address: 270
+  Container Address: 266
   Tag-Along Space
 
 ethernet.dstAddr[39:8] in container bits [31:0]
 
 </title></rect>
-<rect x="747" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 16
+<rect x="747" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 16
   Assigned to Egress
   Container Bit Width: 32
+  Container Address: 267
+  Tag-Along Space
+
+ethernet.srcAddr[31:0] in container bits [31:0]
+
+</title></rect>
+<rect x="747" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 16
+  Unassigned
+  Container Bit Width: 32
+  Container Address: 268
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="747" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 16
+  Unassigned
+  Container Bit Width: 32
+  Container Address: 269
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="747" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 16
+  Unassigned
+  Container Bit Width: 32
+  Container Address: 270
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="747" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 16
+  Unassigned
+  Container Bit Width: 32
   Container Address: 271
   Tag-Along Space
 
-ethernet.srcAddr[31:0] in container bits [31:0]
 
 </title></rect>
 <text x="740" y="178" textLength="16" lengthAdjust="spacingAndGlyphs" textHeight="16" heightAdjust="spacingAndGlyphs" style="fill:black;">32</text>
@@ -4771,123 +4799,119 @@
 ipv4.ihl[3:0] in container bits [3:0]
 
 </title></rect>
-<rect x="819" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 18
+<rect x="819" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 18
   Assigned to Ingress
   Container Bit Width: 8
   Container Address: 289
   Tag-Along Space
 
-tcp.srcPort[15:8] in container bits [7:0]
-udp.length_[15:8] in container bits [7:0]
+tcp.seqNo[7:0] in container bits [7:0]
+udp.srcPort[15:8] in container bits [7:0]
 
 </title></rect>
-<rect x="819" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 18
-  Assigned to Ingress
+<rect x="819" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
+  Unassigned
   Container Bit Width: 8
   Container Address: 290
   Tag-Along Space
 
-tcp.srcPort[7:0] in container bits [7:0]
-udp.length_[7:0] in container bits [7:0]
 
 </title></rect>
-<rect x="819" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 18
-  Assigned to Ingress
+<rect x="819" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
+  Unassigned
   Container Bit Width: 8
   Container Address: 291
   Tag-Along Space
 
-tcp.dstPort[15:8] in container bits [7:0]
 
 </title></rect>
-<rect x="819" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 18
-  Assigned to Ingress
-  Container Bit Width: 8
-  Container Address: 292
-  Tag-Along Space
-
-tcp.dstPort[7:0] in container bits [7:0]
-
-</title></rect>
-<rect x="819" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
-  Unassigned
-  Container Bit Width: 8
-  Container Address: 293
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="819" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
-  Unassigned
-  Container Bit Width: 8
-  Container Address: 294
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="819" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
-  Unassigned
-  Container Bit Width: 8
-  Container Address: 295
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="837" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 18
+<rect x="819" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 18
   Assigned to Egress
   Container Bit Width: 8
-  Container Address: 296
+  Container Address: 292
   Tag-Along Space
 
 ipv4.version[3:0] in container bits [7:4]
 ipv4.ihl[3:0] in container bits [3:0]
 
 </title></rect>
-<rect x="837" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 18
+<rect x="819" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 18
   Assigned to Egress
   Container Bit Width: 8
-  Container Address: 297
+  Container Address: 293
   Tag-Along Space
 
 ipv4.diffserv[7:0] in container bits [7:0]
 
 </title></rect>
-<rect x="837" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 18
+<rect x="819" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 18
   Assigned to Egress
   Container Bit Width: 8
-  Container Address: 298
+  Container Address: 294
   Tag-Along Space
 
 tcp.srcPort[15:8] in container bits [7:0]
 udp.srcPort[15:8] in container bits [7:0]
 
 </title></rect>
-<rect x="837" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 18
+<rect x="819" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 18
   Assigned to Egress
   Container Bit Width: 8
-  Container Address: 299
+  Container Address: 295
   Tag-Along Space
 
 tcp.srcPort[7:0] in container bits [7:0]
 udp.srcPort[7:0] in container bits [7:0]
 
 </title></rect>
-<rect x="837" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 18
+<rect x="837" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 18
   Assigned to Egress
   Container Bit Width: 8
-  Container Address: 300
+  Container Address: 296
   Tag-Along Space
 
 ethernet.dstAddr[47:40] in container bits [7:0]
 
 </title></rect>
-<rect x="837" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 18
+<rect x="837" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 18
   Assigned to Egress
   Container Bit Width: 8
+  Container Address: 297
+  Tag-Along Space
+
+ethernet.srcAddr[39:32] in container bits [7:0]
+
+</title></rect>
+<rect x="837" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
+  Unassigned
+  Container Bit Width: 8
+  Container Address: 298
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="837" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
+  Unassigned
+  Container Bit Width: 8
+  Container Address: 299
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="837" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
+  Unassigned
+  Container Bit Width: 8
+  Container Address: 300
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="837" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
+  Unassigned
+  Container Bit Width: 8
   Container Address: 301
   Tag-Along Space
 
-ethernet.srcAddr[39:32] in container bits [7:0]
 
 </title></rect>
 <rect x="837" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
@@ -5056,171 +5080,120 @@
 ipv4.identification[15:8] in container bits [7:0]
 
 </title></rect>
-<rect x="909" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 20
+<rect x="909" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 20
   Assigned to Ingress
   Container Bit Width: 16
   Container Address: 322
   Tag-Along Space
 
-tcp.seqNo[31:16] in container bits [15:0]
-udp.checksum[15:0] in container bits [15:0]
+tcp.ackNo[31:16] in container bits [15:0]
+udp.dstPort[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="909" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 20
+<rect x="909" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 20
   Assigned to Ingress
   Container Bit Width: 16
   Container Address: 323
   Tag-Along Space
 
-tcp.seqNo[15:0] in container bits [15:0]
+tcp.ackNo[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="909" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 20
-  Assigned to Ingress
+<rect x="909" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 20
+  Unassigned
   Container Bit Width: 16
   Container Address: 324
   Tag-Along Space
 
-tcp.ackNo[31:16] in container bits [15:0]
 
 </title></rect>
-<rect x="909" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 20
-  Assigned to Ingress
+<rect x="909" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 20
+  Unassigned
   Container Bit Width: 16
   Container Address: 325
   Tag-Along Space
 
-tcp.ackNo[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="909" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 20
-  Unassigned
-  Container Bit Width: 16
-  Container Address: 326
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="909" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 20
-  Unassigned
-  Container Bit Width: 16
-  Container Address: 327
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="927" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 20
-  Unassigned
-  Container Bit Width: 16
-  Container Address: 328
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="927" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 20
-  Unassigned
-  Container Bit Width: 16
-  Container Address: 329
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="927" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 20
-  Unassigned
-  Container Bit Width: 16
-  Container Address: 330
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="927" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 20
-  Unassigned
-  Container Bit Width: 16
-  Container Address: 331
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="927" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 20
+<rect x="909" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 20
   Assigned to Egress
   Container Bit Width: 16
-  Container Address: 332
+  Container Address: 326
   Tag-Along Space
 
 ipv4.totalLen[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="927" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 20
+<rect x="909" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 20
   Assigned to Egress
   Container Bit Width: 16
-  Container Address: 333
+  Container Address: 327
   Tag-Along Space
 
 ipv4.identification[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="927" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 20
+<rect x="927" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 20
   Assigned to Egress
   Container Bit Width: 16
-  Container Address: 334
+  Container Address: 328
   Tag-Along Space
 
 ipv4.flags[2:0] in container bits [15:13]
 ipv4.fragOffset[12:0] in container bits [12:0]
 
 </title></rect>
-<rect x="927" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 20
+<rect x="927" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 20
   Assigned to Egress
   Container Bit Width: 16
-  Container Address: 335
+  Container Address: 329
   Tag-Along Space
 
 tcp.dstPort[15:0] in container bits [15:0]
-
-</title></rect>
-<text x="920" y="178" textLength="16" lengthAdjust="spacingAndGlyphs" textHeight="16" heightAdjust="spacingAndGlyphs" style="fill:black;">16</text>
-<rect x="954" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 21
-  Assigned to Egress
-  Container Bit Width: 16
-  Container Address: 336
-  Tag-Along Space
-
-tcp.seqNo[31:16] in container bits [15:0]
 udp.dstPort[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="954" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 21
+<rect x="927" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 20
   Assigned to Egress
   Container Bit Width: 16
-  Container Address: 337
+  Container Address: 330
+  Tag-Along Space
+
+tcp.seqNo[31:16] in container bits [15:0]
+
+</title></rect>
+<rect x="927" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 20
+  Assigned to Egress
+  Container Bit Width: 16
+  Container Address: 331
   Tag-Along Space
 
 tcp.seqNo[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="954" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 21
+<rect x="927" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 20
   Assigned to Egress
   Container Bit Width: 16
-  Container Address: 338
+  Container Address: 332
   Tag-Along Space
 
 ethernet.dstAddr[7:0] in container bits [15:8]
 ethernet.srcAddr[47:40] in container bits [7:0]
 
 </title></rect>
-<rect x="954" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 21
+<rect x="927" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 20
   Assigned to Egress
   Container Bit Width: 16
-  Container Address: 339
+  Container Address: 333
   Tag-Along Space
 
 ethernet.etherType[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="954" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:gold""><title>PHV Group: 21
+<rect x="927" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:gold""><title>PHV Group: 20
   Assigned to Egress
   Container Bit Width: 16
-  Container Address: 340
+  Container Address: 334
   Tag-Along Space
 
 packet_out_hdr.egress_port[8:0] in container bits [15:7]
@@ -5229,6 +5202,55 @@
 packet_in_hdr._padding[6:0] in container bits [6:0]
 
 </title></rect>
+<rect x="927" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 20
+  Unassigned
+  Container Bit Width: 16
+  Container Address: 335
+  Tag-Along Space
+
+
+</title></rect>
+<text x="920" y="178" textLength="16" lengthAdjust="spacingAndGlyphs" textHeight="16" heightAdjust="spacingAndGlyphs" style="fill:black;">16</text>
+<rect x="954" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 21
+  Unassigned
+  Container Bit Width: 16
+  Container Address: 336
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="954" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 21
+  Unassigned
+  Container Bit Width: 16
+  Container Address: 337
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="954" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 21
+  Unassigned
+  Container Bit Width: 16
+  Container Address: 338
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="954" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 21
+  Unassigned
+  Container Bit Width: 16
+  Container Address: 339
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="954" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 21
+  Unassigned
+  Container Bit Width: 16
+  Container Address: 340
+  Tag-Along Space
+
+
+</title></rect>
 <rect x="954" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 21
   Unassigned
   Container Bit Width: 16
@@ -5482,15 +5504,16 @@
   Container Bit Width: 32
   Container Address: 3
 
-ethernet.dstAddr[39:8] in container bits [31:0]
+tcp.dstPort[7:0] in container bits [31:24]
+tcp.seqNo[31:8] in container bits [23:0]
 
 </title></rect>
-<rect x="9" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 0
+<rect x="9" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 0
   Assigned to Ingress
   Container Bit Width: 32
   Container Address: 4
 
-ethernet.srcAddr[31:0] in container bits [31:0]
+ethernet.dstAddr[39:8] in container bits [31:0]
 
 </title></rect>
 <rect x="9" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 0
@@ -5498,8 +5521,7 @@
   Container Bit Width: 32
   Container Address: 5
 
-udp.srcPort[15:0] in container bits [31:16]
-udp.dstPort[15:0] in container bits [15:0]
+ethernet.srcAddr[31:0] in container bits [31:0]
 
 </title></rect>
 <rect x="9" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 0
@@ -5925,38 +5947,40 @@
   Container Bit Width: 8
   Container Address: 65
 
-ethernet.dstAddr[47:40] in container bits [7:0]
+tcp.srcPort[15:8] in container bits [7:0]
+udp.srcPort[7:0] in container bits [7:0]
 
 </title></rect>
-<rect x="189" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 4
+<rect x="189" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 4
   Assigned to Ingress
   Container Bit Width: 8
   Container Address: 66
 
-ethernet.srcAddr[39:32] in container bits [7:0]
+ethernet.dstAddr[47:40] in container bits [7:0]
 
 </title></rect>
-<rect x="189" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkred""><title>PHV Group: 4
+<rect x="189" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 4
   Assigned to Ingress
   Container Bit Width: 8
   Container Address: 67
 
-POV.POV[39:32] in container bits [7:0]
+ethernet.srcAddr[39:32] in container bits [7:0]
 
 </title></rect>
-<rect x="189" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:beige""><title>PHV Group: 4
+<rect x="189" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkred""><title>PHV Group: 4
   Assigned to Ingress
   Container Bit Width: 8
   Container Address: 68
 
-ig_intr_md_for_tm.drop_ctl[2:0] in container bits [7:5]
+POV.POV[39:32] in container bits [7:0]
 
 </title></rect>
-<rect x="189" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 4
-  Unassigned
+<rect x="189" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:beige""><title>PHV Group: 4
+  Assigned to Ingress
   Container Bit Width: 8
   Container Address: 69
 
+ig_intr_md_for_tm.drop_ctl[2:0] in container bits [7:5]
 
 </title></rect>
 <rect x="189" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 4
@@ -6383,6 +6407,8 @@
 ig_intr_md._pad3[2:0] in container bits [11:9]
 ig_intr_md.ingress_port[8:0] in container bits [8:0]
 
+Field ig_intr_md.ingress_port read by table ingress_port_count_table for Statistics Address.
+Field unused read by table ingress_port_count_table for Statistics Address.
 Field ig_intr_md.ingress_port read by table ingress_port_count_table's action count_ingress
 </title></rect>
 <text x="371" y="25" textLength="11" lengthAdjust="spacingAndGlyphs" textHeight="11" heightAdjust="spacingAndGlyphs" style="fill:black;">R<title>PHV Group: 8
@@ -6396,6 +6422,8 @@
 ig_intr_md._pad3[2:0] in container bits [11:9]
 ig_intr_md.ingress_port[8:0] in container bits [8:0]
 
+Field ig_intr_md.ingress_port read by table ingress_port_count_table for Statistics Address.
+Field unused read by table ingress_port_count_table for Statistics Address.
 Field ig_intr_md.ingress_port read by table ingress_port_count_table's action count_ingress
 </title></text>
 <rect x="369" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:gold""><title>PHV Group: 8
@@ -6417,6 +6445,8 @@
 ig_intr_md_for_tm.ucast_egress_port[8:0] in container bits [8:0]
 
 Field ig_intr_md_for_tm.ucast_egress_port read by table ingress_port_count_table for a gateway expression
+Field ig_intr_md_for_tm.ucast_egress_port read by table egress_port_count_table for Statistics Address.
+Field unused read by table egress_port_count_table for Statistics Address.
 Field ig_intr_md_for_tm.ucast_egress_port read by table egress_port_count_table's action count_egress
 </title></rect>
 <text x="371" y="61" textLength="11" lengthAdjust="spacingAndGlyphs" textHeight="11" heightAdjust="spacingAndGlyphs" style="fill:black;">R<title>PHV Group: 8
@@ -6427,6 +6457,8 @@
 ig_intr_md_for_tm.ucast_egress_port[8:0] in container bits [8:0]
 
 Field ig_intr_md_for_tm.ucast_egress_port read by table ingress_port_count_table for a gateway expression
+Field ig_intr_md_for_tm.ucast_egress_port read by table egress_port_count_table for Statistics Address.
+Field unused read by table egress_port_count_table for Statistics Address.
 Field ig_intr_md_for_tm.ucast_egress_port read by table egress_port_count_table's action count_egress
 </title></text>
 <rect x="369" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 8
@@ -6442,24 +6474,25 @@
   Container Bit Width: 16
   Container Address: 132
 
-ethernet.dstAddr[7:0] in container bits [15:8]
-ethernet.srcAddr[47:40] in container bits [7:0]
+tcp.srcPort[7:0] in container bits [15:8]
+tcp.dstPort[15:8] in container bits [7:0]
 
 </title></rect>
-<rect x="369" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 8
+<rect x="369" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 8
   Assigned to Ingress
   Container Bit Width: 16
   Container Address: 133
 
-ethernet.etherType[15:0] in container bits [15:0]
+ethernet.dstAddr[7:0] in container bits [15:8]
+ethernet.srcAddr[47:40] in container bits [7:0]
 
 </title></rect>
-<rect x="369" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:goldenrod""><title>PHV Group: 8
+<rect x="369" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 8
   Assigned to Ingress
   Container Bit Width: 16
   Container Address: 134
 
-ecmp_metadata.group_id[15:0] in container bits [15:0]
+ethernet.etherType[15:0] in container bits [15:0]
 
 </title></rect>
 <rect x="369" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:goldenrod""><title>PHV Group: 8
@@ -6467,14 +6500,15 @@
   Container Bit Width: 16
   Container Address: 135
 
-ecmp_metadata.selector[15:0] in container bits [15:0]
+ecmp_metadata.group_id[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="387" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 8
-  Unassigned
+<rect x="387" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:goldenrod""><title>PHV Group: 8
+  Assigned to Ingress
   Container Bit Width: 16
   Container Address: 136
 
+ecmp_metadata.selector[15:0] in container bits [15:0]
 
 </title></rect>
 <rect x="387" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 8
@@ -7106,7 +7140,7 @@
 ipv4.ttl[7:0] in container bits [7:0]
 
 </title></rect>
-<rect x="729" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 16
+<rect x="729" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 16
   Assigned to Ingress
   Container Bit Width: 32
   Container Address: 257
@@ -7116,10 +7150,12 @@
 tcp.res[2:0] in container bits [27:25]
 tcp.ecn[2:0] in container bits [24:22]
 tcp.ctrl[5:0] in container bits [21:16]
+udp.length_[15:0] in container bits [31:16]
 tcp.window[15:0] in container bits [15:0]
+udp.checksum[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="729" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 16
+<rect x="729" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 16
   Assigned to Ingress
   Container Bit Width: 32
   Container Address: 258
@@ -7137,42 +7173,10 @@
 
 
 </title></rect>
-<rect x="729" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 16
-  Unassigned
-  Container Bit Width: 32
-  Container Address: 260
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="729" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 16
-  Unassigned
-  Container Bit Width: 32
-  Container Address: 261
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="729" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 16
-  Unassigned
-  Container Bit Width: 32
-  Container Address: 262
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="729" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 16
-  Unassigned
-  Container Bit Width: 32
-  Container Address: 263
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="747" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 16
+<rect x="729" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 16
   Assigned to Egress
   Container Bit Width: 32
-  Container Address: 264
+  Container Address: 260
   Tag-Along Space
 
 ipv4.ttl[7:0] in container bits [31:24]
@@ -7180,28 +7184,28 @@
 ipv4.hdrChecksum[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="747" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 16
+<rect x="729" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 16
   Assigned to Egress
   Container Bit Width: 32
-  Container Address: 265
+  Container Address: 261
   Tag-Along Space
 
 ipv4.srcAddr[31:0] in container bits [31:0]
 
 </title></rect>
-<rect x="747" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 16
+<rect x="729" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 16
   Assigned to Egress
   Container Bit Width: 32
-  Container Address: 266
+  Container Address: 262
   Tag-Along Space
 
 ipv4.dstAddr[31:0] in container bits [31:0]
 
 </title></rect>
-<rect x="747" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 16
+<rect x="729" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 16
   Assigned to Egress
   Container Bit Width: 32
-  Container Address: 267
+  Container Address: 263
   Tag-Along Space
 
 udp.length_[15:0] in container bits [31:16]
@@ -7209,10 +7213,10 @@
 udp.checksum[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="747" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 16
+<rect x="747" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 16
   Assigned to Egress
   Container Bit Width: 32
-  Container Address: 268
+  Container Address: 264
   Tag-Along Space
 
 tcp.dataOffset[3:0] in container bits [31:28]
@@ -7222,32 +7226,64 @@
 tcp.window[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="747" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 16
+<rect x="747" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 16
   Assigned to Egress
   Container Bit Width: 32
-  Container Address: 269
+  Container Address: 265
   Tag-Along Space
 
 tcp.checksum[15:0] in container bits [31:16]
 tcp.urgentPtr[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="747" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 16
+<rect x="747" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 16
   Assigned to Egress
   Container Bit Width: 32
-  Container Address: 270
+  Container Address: 266
   Tag-Along Space
 
 ethernet.dstAddr[39:8] in container bits [31:0]
 
 </title></rect>
-<rect x="747" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 16
+<rect x="747" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 16
   Assigned to Egress
   Container Bit Width: 32
+  Container Address: 267
+  Tag-Along Space
+
+ethernet.srcAddr[31:0] in container bits [31:0]
+
+</title></rect>
+<rect x="747" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 16
+  Unassigned
+  Container Bit Width: 32
+  Container Address: 268
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="747" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 16
+  Unassigned
+  Container Bit Width: 32
+  Container Address: 269
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="747" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 16
+  Unassigned
+  Container Bit Width: 32
+  Container Address: 270
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="747" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 16
+  Unassigned
+  Container Bit Width: 32
   Container Address: 271
   Tag-Along Space
 
-ethernet.srcAddr[31:0] in container bits [31:0]
 
 </title></rect>
 <text x="740" y="178" textLength="16" lengthAdjust="spacingAndGlyphs" textHeight="16" heightAdjust="spacingAndGlyphs" style="fill:black;">32</text>
@@ -7390,123 +7426,119 @@
 ipv4.ihl[3:0] in container bits [3:0]
 
 </title></rect>
-<rect x="819" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 18
+<rect x="819" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 18
   Assigned to Ingress
   Container Bit Width: 8
   Container Address: 289
   Tag-Along Space
 
-tcp.srcPort[15:8] in container bits [7:0]
-udp.length_[15:8] in container bits [7:0]
+tcp.seqNo[7:0] in container bits [7:0]
+udp.srcPort[15:8] in container bits [7:0]
 
 </title></rect>
-<rect x="819" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 18
-  Assigned to Ingress
+<rect x="819" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
+  Unassigned
   Container Bit Width: 8
   Container Address: 290
   Tag-Along Space
 
-tcp.srcPort[7:0] in container bits [7:0]
-udp.length_[7:0] in container bits [7:0]
 
 </title></rect>
-<rect x="819" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 18
-  Assigned to Ingress
+<rect x="819" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
+  Unassigned
   Container Bit Width: 8
   Container Address: 291
   Tag-Along Space
 
-tcp.dstPort[15:8] in container bits [7:0]
 
 </title></rect>
-<rect x="819" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 18
-  Assigned to Ingress
-  Container Bit Width: 8
-  Container Address: 292
-  Tag-Along Space
-
-tcp.dstPort[7:0] in container bits [7:0]
-
-</title></rect>
-<rect x="819" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
-  Unassigned
-  Container Bit Width: 8
-  Container Address: 293
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="819" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
-  Unassigned
-  Container Bit Width: 8
-  Container Address: 294
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="819" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
-  Unassigned
-  Container Bit Width: 8
-  Container Address: 295
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="837" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 18
+<rect x="819" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 18
   Assigned to Egress
   Container Bit Width: 8
-  Container Address: 296
+  Container Address: 292
   Tag-Along Space
 
 ipv4.version[3:0] in container bits [7:4]
 ipv4.ihl[3:0] in container bits [3:0]
 
 </title></rect>
-<rect x="837" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 18
+<rect x="819" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 18
   Assigned to Egress
   Container Bit Width: 8
-  Container Address: 297
+  Container Address: 293
   Tag-Along Space
 
 ipv4.diffserv[7:0] in container bits [7:0]
 
 </title></rect>
-<rect x="837" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 18
+<rect x="819" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 18
   Assigned to Egress
   Container Bit Width: 8
-  Container Address: 298
+  Container Address: 294
   Tag-Along Space
 
 tcp.srcPort[15:8] in container bits [7:0]
 udp.srcPort[15:8] in container bits [7:0]
 
 </title></rect>
-<rect x="837" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 18
+<rect x="819" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 18
   Assigned to Egress
   Container Bit Width: 8
-  Container Address: 299
+  Container Address: 295
   Tag-Along Space
 
 tcp.srcPort[7:0] in container bits [7:0]
 udp.srcPort[7:0] in container bits [7:0]
 
 </title></rect>
-<rect x="837" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 18
+<rect x="837" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 18
   Assigned to Egress
   Container Bit Width: 8
-  Container Address: 300
+  Container Address: 296
   Tag-Along Space
 
 ethernet.dstAddr[47:40] in container bits [7:0]
 
 </title></rect>
-<rect x="837" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 18
+<rect x="837" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 18
   Assigned to Egress
   Container Bit Width: 8
+  Container Address: 297
+  Tag-Along Space
+
+ethernet.srcAddr[39:32] in container bits [7:0]
+
+</title></rect>
+<rect x="837" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
+  Unassigned
+  Container Bit Width: 8
+  Container Address: 298
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="837" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
+  Unassigned
+  Container Bit Width: 8
+  Container Address: 299
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="837" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
+  Unassigned
+  Container Bit Width: 8
+  Container Address: 300
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="837" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
+  Unassigned
+  Container Bit Width: 8
   Container Address: 301
   Tag-Along Space
 
-ethernet.srcAddr[39:32] in container bits [7:0]
 
 </title></rect>
 <rect x="837" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
@@ -7675,171 +7707,120 @@
 ipv4.identification[15:8] in container bits [7:0]
 
 </title></rect>
-<rect x="909" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 20
+<rect x="909" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 20
   Assigned to Ingress
   Container Bit Width: 16
   Container Address: 322
   Tag-Along Space
 
-tcp.seqNo[31:16] in container bits [15:0]
-udp.checksum[15:0] in container bits [15:0]
+tcp.ackNo[31:16] in container bits [15:0]
+udp.dstPort[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="909" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 20
+<rect x="909" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 20
   Assigned to Ingress
   Container Bit Width: 16
   Container Address: 323
   Tag-Along Space
 
-tcp.seqNo[15:0] in container bits [15:0]
+tcp.ackNo[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="909" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 20
-  Assigned to Ingress
+<rect x="909" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 20
+  Unassigned
   Container Bit Width: 16
   Container Address: 324
   Tag-Along Space
 
-tcp.ackNo[31:16] in container bits [15:0]
 
 </title></rect>
-<rect x="909" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 20
-  Assigned to Ingress
+<rect x="909" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 20
+  Unassigned
   Container Bit Width: 16
   Container Address: 325
   Tag-Along Space
 
-tcp.ackNo[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="909" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 20
-  Unassigned
-  Container Bit Width: 16
-  Container Address: 326
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="909" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 20
-  Unassigned
-  Container Bit Width: 16
-  Container Address: 327
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="927" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 20
-  Unassigned
-  Container Bit Width: 16
-  Container Address: 328
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="927" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 20
-  Unassigned
-  Container Bit Width: 16
-  Container Address: 329
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="927" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 20
-  Unassigned
-  Container Bit Width: 16
-  Container Address: 330
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="927" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 20
-  Unassigned
-  Container Bit Width: 16
-  Container Address: 331
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="927" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 20
+<rect x="909" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 20
   Assigned to Egress
   Container Bit Width: 16
-  Container Address: 332
+  Container Address: 326
   Tag-Along Space
 
 ipv4.totalLen[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="927" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 20
+<rect x="909" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 20
   Assigned to Egress
   Container Bit Width: 16
-  Container Address: 333
+  Container Address: 327
   Tag-Along Space
 
 ipv4.identification[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="927" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 20
+<rect x="927" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 20
   Assigned to Egress
   Container Bit Width: 16
-  Container Address: 334
+  Container Address: 328
   Tag-Along Space
 
 ipv4.flags[2:0] in container bits [15:13]
 ipv4.fragOffset[12:0] in container bits [12:0]
 
 </title></rect>
-<rect x="927" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 20
+<rect x="927" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 20
   Assigned to Egress
   Container Bit Width: 16
-  Container Address: 335
+  Container Address: 329
   Tag-Along Space
 
 tcp.dstPort[15:0] in container bits [15:0]
-
-</title></rect>
-<text x="920" y="178" textLength="16" lengthAdjust="spacingAndGlyphs" textHeight="16" heightAdjust="spacingAndGlyphs" style="fill:black;">16</text>
-<rect x="954" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 21
-  Assigned to Egress
-  Container Bit Width: 16
-  Container Address: 336
-  Tag-Along Space
-
-tcp.seqNo[31:16] in container bits [15:0]
 udp.dstPort[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="954" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 21
+<rect x="927" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 20
   Assigned to Egress
   Container Bit Width: 16
-  Container Address: 337
+  Container Address: 330
+  Tag-Along Space
+
+tcp.seqNo[31:16] in container bits [15:0]
+
+</title></rect>
+<rect x="927" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 20
+  Assigned to Egress
+  Container Bit Width: 16
+  Container Address: 331
   Tag-Along Space
 
 tcp.seqNo[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="954" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 21
+<rect x="927" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 20
   Assigned to Egress
   Container Bit Width: 16
-  Container Address: 338
+  Container Address: 332
   Tag-Along Space
 
 ethernet.dstAddr[7:0] in container bits [15:8]
 ethernet.srcAddr[47:40] in container bits [7:0]
 
 </title></rect>
-<rect x="954" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 21
+<rect x="927" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 20
   Assigned to Egress
   Container Bit Width: 16
-  Container Address: 339
+  Container Address: 333
   Tag-Along Space
 
 ethernet.etherType[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="954" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:gold""><title>PHV Group: 21
+<rect x="927" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:gold""><title>PHV Group: 20
   Assigned to Egress
   Container Bit Width: 16
-  Container Address: 340
+  Container Address: 334
   Tag-Along Space
 
 packet_out_hdr.egress_port[8:0] in container bits [15:7]
@@ -7848,6 +7829,55 @@
 packet_in_hdr._padding[6:0] in container bits [6:0]
 
 </title></rect>
+<rect x="927" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 20
+  Unassigned
+  Container Bit Width: 16
+  Container Address: 335
+  Tag-Along Space
+
+
+</title></rect>
+<text x="920" y="178" textLength="16" lengthAdjust="spacingAndGlyphs" textHeight="16" heightAdjust="spacingAndGlyphs" style="fill:black;">16</text>
+<rect x="954" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 21
+  Unassigned
+  Container Bit Width: 16
+  Container Address: 336
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="954" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 21
+  Unassigned
+  Container Bit Width: 16
+  Container Address: 337
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="954" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 21
+  Unassigned
+  Container Bit Width: 16
+  Container Address: 338
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="954" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 21
+  Unassigned
+  Container Bit Width: 16
+  Container Address: 339
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="954" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 21
+  Unassigned
+  Container Bit Width: 16
+  Container Address: 340
+  Tag-Along Space
+
+
+</title></rect>
 <rect x="954" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 21
   Unassigned
   Container Bit Width: 16
@@ -8101,15 +8131,16 @@
   Container Bit Width: 32
   Container Address: 3
 
-ethernet.dstAddr[39:8] in container bits [31:0]
+tcp.dstPort[7:0] in container bits [31:24]
+tcp.seqNo[31:8] in container bits [23:0]
 
 </title></rect>
-<rect x="9" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 0
+<rect x="9" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 0
   Assigned to Ingress
   Container Bit Width: 32
   Container Address: 4
 
-ethernet.srcAddr[31:0] in container bits [31:0]
+ethernet.dstAddr[39:8] in container bits [31:0]
 
 </title></rect>
 <rect x="9" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 0
@@ -8117,8 +8148,7 @@
   Container Bit Width: 32
   Container Address: 5
 
-udp.srcPort[15:0] in container bits [31:16]
-udp.dstPort[15:0] in container bits [15:0]
+ethernet.srcAddr[31:0] in container bits [31:0]
 
 </title></rect>
 <rect x="9" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 0
@@ -8544,38 +8574,40 @@
   Container Bit Width: 8
   Container Address: 65
 
-ethernet.dstAddr[47:40] in container bits [7:0]
+tcp.srcPort[15:8] in container bits [7:0]
+udp.srcPort[7:0] in container bits [7:0]
 
 </title></rect>
-<rect x="189" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 4
+<rect x="189" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 4
   Assigned to Ingress
   Container Bit Width: 8
   Container Address: 66
 
-ethernet.srcAddr[39:32] in container bits [7:0]
+ethernet.dstAddr[47:40] in container bits [7:0]
 
 </title></rect>
-<rect x="189" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkred""><title>PHV Group: 4
+<rect x="189" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 4
   Assigned to Ingress
   Container Bit Width: 8
   Container Address: 67
 
-POV.POV[39:32] in container bits [7:0]
+ethernet.srcAddr[39:32] in container bits [7:0]
 
 </title></rect>
-<rect x="189" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:beige""><title>PHV Group: 4
+<rect x="189" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkred""><title>PHV Group: 4
   Assigned to Ingress
   Container Bit Width: 8
   Container Address: 68
 
-ig_intr_md_for_tm.drop_ctl[2:0] in container bits [7:5]
+POV.POV[39:32] in container bits [7:0]
 
 </title></rect>
-<rect x="189" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 4
-  Unassigned
+<rect x="189" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:beige""><title>PHV Group: 4
+  Assigned to Ingress
   Container Bit Width: 8
   Container Address: 69
 
+ig_intr_md_for_tm.drop_ctl[2:0] in container bits [7:5]
 
 </title></rect>
 <rect x="189" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 4
@@ -9035,24 +9067,25 @@
   Container Bit Width: 16
   Container Address: 132
 
-ethernet.dstAddr[7:0] in container bits [15:8]
-ethernet.srcAddr[47:40] in container bits [7:0]
+tcp.srcPort[7:0] in container bits [15:8]
+tcp.dstPort[15:8] in container bits [7:0]
 
 </title></rect>
-<rect x="369" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 8
+<rect x="369" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 8
   Assigned to Ingress
   Container Bit Width: 16
   Container Address: 133
 
-ethernet.etherType[15:0] in container bits [15:0]
+ethernet.dstAddr[7:0] in container bits [15:8]
+ethernet.srcAddr[47:40] in container bits [7:0]
 
 </title></rect>
-<rect x="369" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:goldenrod""><title>PHV Group: 8
+<rect x="369" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 8
   Assigned to Ingress
   Container Bit Width: 16
   Container Address: 134
 
-ecmp_metadata.group_id[15:0] in container bits [15:0]
+ethernet.etherType[15:0] in container bits [15:0]
 
 </title></rect>
 <rect x="369" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:goldenrod""><title>PHV Group: 8
@@ -9060,14 +9093,15 @@
   Container Bit Width: 16
   Container Address: 135
 
-ecmp_metadata.selector[15:0] in container bits [15:0]
+ecmp_metadata.group_id[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="387" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 8
-  Unassigned
+<rect x="387" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:goldenrod""><title>PHV Group: 8
+  Assigned to Ingress
   Container Bit Width: 16
   Container Address: 136
 
+ecmp_metadata.selector[15:0] in container bits [15:0]
 
 </title></rect>
 <rect x="387" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 8
@@ -9699,7 +9733,7 @@
 ipv4.ttl[7:0] in container bits [7:0]
 
 </title></rect>
-<rect x="729" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 16
+<rect x="729" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 16
   Assigned to Ingress
   Container Bit Width: 32
   Container Address: 257
@@ -9709,10 +9743,12 @@
 tcp.res[2:0] in container bits [27:25]
 tcp.ecn[2:0] in container bits [24:22]
 tcp.ctrl[5:0] in container bits [21:16]
+udp.length_[15:0] in container bits [31:16]
 tcp.window[15:0] in container bits [15:0]
+udp.checksum[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="729" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 16
+<rect x="729" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 16
   Assigned to Ingress
   Container Bit Width: 32
   Container Address: 258
@@ -9730,42 +9766,10 @@
 
 
 </title></rect>
-<rect x="729" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 16
-  Unassigned
-  Container Bit Width: 32
-  Container Address: 260
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="729" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 16
-  Unassigned
-  Container Bit Width: 32
-  Container Address: 261
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="729" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 16
-  Unassigned
-  Container Bit Width: 32
-  Container Address: 262
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="729" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 16
-  Unassigned
-  Container Bit Width: 32
-  Container Address: 263
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="747" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 16
+<rect x="729" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 16
   Assigned to Egress
   Container Bit Width: 32
-  Container Address: 264
+  Container Address: 260
   Tag-Along Space
 
 ipv4.ttl[7:0] in container bits [31:24]
@@ -9773,28 +9777,28 @@
 ipv4.hdrChecksum[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="747" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 16
+<rect x="729" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 16
   Assigned to Egress
   Container Bit Width: 32
-  Container Address: 265
+  Container Address: 261
   Tag-Along Space
 
 ipv4.srcAddr[31:0] in container bits [31:0]
 
 </title></rect>
-<rect x="747" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 16
+<rect x="729" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 16
   Assigned to Egress
   Container Bit Width: 32
-  Container Address: 266
+  Container Address: 262
   Tag-Along Space
 
 ipv4.dstAddr[31:0] in container bits [31:0]
 
 </title></rect>
-<rect x="747" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 16
+<rect x="729" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 16
   Assigned to Egress
   Container Bit Width: 32
-  Container Address: 267
+  Container Address: 263
   Tag-Along Space
 
 udp.length_[15:0] in container bits [31:16]
@@ -9802,10 +9806,10 @@
 udp.checksum[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="747" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 16
+<rect x="747" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 16
   Assigned to Egress
   Container Bit Width: 32
-  Container Address: 268
+  Container Address: 264
   Tag-Along Space
 
 tcp.dataOffset[3:0] in container bits [31:28]
@@ -9815,32 +9819,64 @@
 tcp.window[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="747" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 16
+<rect x="747" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 16
   Assigned to Egress
   Container Bit Width: 32
-  Container Address: 269
+  Container Address: 265
   Tag-Along Space
 
 tcp.checksum[15:0] in container bits [31:16]
 tcp.urgentPtr[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="747" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 16
+<rect x="747" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 16
   Assigned to Egress
   Container Bit Width: 32
-  Container Address: 270
+  Container Address: 266
   Tag-Along Space
 
 ethernet.dstAddr[39:8] in container bits [31:0]
 
 </title></rect>
-<rect x="747" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 16
+<rect x="747" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 16
   Assigned to Egress
   Container Bit Width: 32
+  Container Address: 267
+  Tag-Along Space
+
+ethernet.srcAddr[31:0] in container bits [31:0]
+
+</title></rect>
+<rect x="747" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 16
+  Unassigned
+  Container Bit Width: 32
+  Container Address: 268
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="747" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 16
+  Unassigned
+  Container Bit Width: 32
+  Container Address: 269
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="747" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 16
+  Unassigned
+  Container Bit Width: 32
+  Container Address: 270
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="747" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 16
+  Unassigned
+  Container Bit Width: 32
   Container Address: 271
   Tag-Along Space
 
-ethernet.srcAddr[31:0] in container bits [31:0]
 
 </title></rect>
 <text x="740" y="178" textLength="16" lengthAdjust="spacingAndGlyphs" textHeight="16" heightAdjust="spacingAndGlyphs" style="fill:black;">32</text>
@@ -9983,123 +10019,119 @@
 ipv4.ihl[3:0] in container bits [3:0]
 
 </title></rect>
-<rect x="819" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 18
+<rect x="819" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 18
   Assigned to Ingress
   Container Bit Width: 8
   Container Address: 289
   Tag-Along Space
 
-tcp.srcPort[15:8] in container bits [7:0]
-udp.length_[15:8] in container bits [7:0]
+tcp.seqNo[7:0] in container bits [7:0]
+udp.srcPort[15:8] in container bits [7:0]
 
 </title></rect>
-<rect x="819" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 18
-  Assigned to Ingress
+<rect x="819" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
+  Unassigned
   Container Bit Width: 8
   Container Address: 290
   Tag-Along Space
 
-tcp.srcPort[7:0] in container bits [7:0]
-udp.length_[7:0] in container bits [7:0]
 
 </title></rect>
-<rect x="819" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 18
-  Assigned to Ingress
+<rect x="819" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
+  Unassigned
   Container Bit Width: 8
   Container Address: 291
   Tag-Along Space
 
-tcp.dstPort[15:8] in container bits [7:0]
 
 </title></rect>
-<rect x="819" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 18
-  Assigned to Ingress
-  Container Bit Width: 8
-  Container Address: 292
-  Tag-Along Space
-
-tcp.dstPort[7:0] in container bits [7:0]
-
-</title></rect>
-<rect x="819" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
-  Unassigned
-  Container Bit Width: 8
-  Container Address: 293
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="819" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
-  Unassigned
-  Container Bit Width: 8
-  Container Address: 294
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="819" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
-  Unassigned
-  Container Bit Width: 8
-  Container Address: 295
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="837" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 18
+<rect x="819" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 18
   Assigned to Egress
   Container Bit Width: 8
-  Container Address: 296
+  Container Address: 292
   Tag-Along Space
 
 ipv4.version[3:0] in container bits [7:4]
 ipv4.ihl[3:0] in container bits [3:0]
 
 </title></rect>
-<rect x="837" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 18
+<rect x="819" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 18
   Assigned to Egress
   Container Bit Width: 8
-  Container Address: 297
+  Container Address: 293
   Tag-Along Space
 
 ipv4.diffserv[7:0] in container bits [7:0]
 
 </title></rect>
-<rect x="837" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 18
+<rect x="819" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 18
   Assigned to Egress
   Container Bit Width: 8
-  Container Address: 298
+  Container Address: 294
   Tag-Along Space
 
 tcp.srcPort[15:8] in container bits [7:0]
 udp.srcPort[15:8] in container bits [7:0]
 
 </title></rect>
-<rect x="837" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 18
+<rect x="819" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 18
   Assigned to Egress
   Container Bit Width: 8
-  Container Address: 299
+  Container Address: 295
   Tag-Along Space
 
 tcp.srcPort[7:0] in container bits [7:0]
 udp.srcPort[7:0] in container bits [7:0]
 
 </title></rect>
-<rect x="837" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 18
+<rect x="837" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 18
   Assigned to Egress
   Container Bit Width: 8
-  Container Address: 300
+  Container Address: 296
   Tag-Along Space
 
 ethernet.dstAddr[47:40] in container bits [7:0]
 
 </title></rect>
-<rect x="837" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 18
+<rect x="837" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 18
   Assigned to Egress
   Container Bit Width: 8
+  Container Address: 297
+  Tag-Along Space
+
+ethernet.srcAddr[39:32] in container bits [7:0]
+
+</title></rect>
+<rect x="837" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
+  Unassigned
+  Container Bit Width: 8
+  Container Address: 298
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="837" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
+  Unassigned
+  Container Bit Width: 8
+  Container Address: 299
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="837" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
+  Unassigned
+  Container Bit Width: 8
+  Container Address: 300
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="837" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
+  Unassigned
+  Container Bit Width: 8
   Container Address: 301
   Tag-Along Space
 
-ethernet.srcAddr[39:32] in container bits [7:0]
 
 </title></rect>
 <rect x="837" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
@@ -10268,171 +10300,120 @@
 ipv4.identification[15:8] in container bits [7:0]
 
 </title></rect>
-<rect x="909" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 20
+<rect x="909" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 20
   Assigned to Ingress
   Container Bit Width: 16
   Container Address: 322
   Tag-Along Space
 
-tcp.seqNo[31:16] in container bits [15:0]
-udp.checksum[15:0] in container bits [15:0]
+tcp.ackNo[31:16] in container bits [15:0]
+udp.dstPort[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="909" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 20
+<rect x="909" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 20
   Assigned to Ingress
   Container Bit Width: 16
   Container Address: 323
   Tag-Along Space
 
-tcp.seqNo[15:0] in container bits [15:0]
+tcp.ackNo[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="909" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 20
-  Assigned to Ingress
+<rect x="909" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 20
+  Unassigned
   Container Bit Width: 16
   Container Address: 324
   Tag-Along Space
 
-tcp.ackNo[31:16] in container bits [15:0]
 
 </title></rect>
-<rect x="909" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 20
-  Assigned to Ingress
+<rect x="909" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 20
+  Unassigned
   Container Bit Width: 16
   Container Address: 325
   Tag-Along Space
 
-tcp.ackNo[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="909" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 20
-  Unassigned
-  Container Bit Width: 16
-  Container Address: 326
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="909" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 20
-  Unassigned
-  Container Bit Width: 16
-  Container Address: 327
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="927" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 20
-  Unassigned
-  Container Bit Width: 16
-  Container Address: 328
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="927" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 20
-  Unassigned
-  Container Bit Width: 16
-  Container Address: 329
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="927" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 20
-  Unassigned
-  Container Bit Width: 16
-  Container Address: 330
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="927" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 20
-  Unassigned
-  Container Bit Width: 16
-  Container Address: 331
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="927" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 20
+<rect x="909" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 20
   Assigned to Egress
   Container Bit Width: 16
-  Container Address: 332
+  Container Address: 326
   Tag-Along Space
 
 ipv4.totalLen[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="927" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 20
+<rect x="909" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 20
   Assigned to Egress
   Container Bit Width: 16
-  Container Address: 333
+  Container Address: 327
   Tag-Along Space
 
 ipv4.identification[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="927" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 20
+<rect x="927" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 20
   Assigned to Egress
   Container Bit Width: 16
-  Container Address: 334
+  Container Address: 328
   Tag-Along Space
 
 ipv4.flags[2:0] in container bits [15:13]
 ipv4.fragOffset[12:0] in container bits [12:0]
 
 </title></rect>
-<rect x="927" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 20
+<rect x="927" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 20
   Assigned to Egress
   Container Bit Width: 16
-  Container Address: 335
+  Container Address: 329
   Tag-Along Space
 
 tcp.dstPort[15:0] in container bits [15:0]
-
-</title></rect>
-<text x="920" y="178" textLength="16" lengthAdjust="spacingAndGlyphs" textHeight="16" heightAdjust="spacingAndGlyphs" style="fill:black;">16</text>
-<rect x="954" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 21
-  Assigned to Egress
-  Container Bit Width: 16
-  Container Address: 336
-  Tag-Along Space
-
-tcp.seqNo[31:16] in container bits [15:0]
 udp.dstPort[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="954" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 21
+<rect x="927" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 20
   Assigned to Egress
   Container Bit Width: 16
-  Container Address: 337
+  Container Address: 330
+  Tag-Along Space
+
+tcp.seqNo[31:16] in container bits [15:0]
+
+</title></rect>
+<rect x="927" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 20
+  Assigned to Egress
+  Container Bit Width: 16
+  Container Address: 331
   Tag-Along Space
 
 tcp.seqNo[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="954" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 21
+<rect x="927" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 20
   Assigned to Egress
   Container Bit Width: 16
-  Container Address: 338
+  Container Address: 332
   Tag-Along Space
 
 ethernet.dstAddr[7:0] in container bits [15:8]
 ethernet.srcAddr[47:40] in container bits [7:0]
 
 </title></rect>
-<rect x="954" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 21
+<rect x="927" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 20
   Assigned to Egress
   Container Bit Width: 16
-  Container Address: 339
+  Container Address: 333
   Tag-Along Space
 
 ethernet.etherType[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="954" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:gold""><title>PHV Group: 21
+<rect x="927" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:gold""><title>PHV Group: 20
   Assigned to Egress
   Container Bit Width: 16
-  Container Address: 340
+  Container Address: 334
   Tag-Along Space
 
 packet_out_hdr.egress_port[8:0] in container bits [15:7]
@@ -10441,6 +10422,55 @@
 packet_in_hdr._padding[6:0] in container bits [6:0]
 
 </title></rect>
+<rect x="927" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 20
+  Unassigned
+  Container Bit Width: 16
+  Container Address: 335
+  Tag-Along Space
+
+
+</title></rect>
+<text x="920" y="178" textLength="16" lengthAdjust="spacingAndGlyphs" textHeight="16" heightAdjust="spacingAndGlyphs" style="fill:black;">16</text>
+<rect x="954" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 21
+  Unassigned
+  Container Bit Width: 16
+  Container Address: 336
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="954" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 21
+  Unassigned
+  Container Bit Width: 16
+  Container Address: 337
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="954" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 21
+  Unassigned
+  Container Bit Width: 16
+  Container Address: 338
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="954" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 21
+  Unassigned
+  Container Bit Width: 16
+  Container Address: 339
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="954" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 21
+  Unassigned
+  Container Bit Width: 16
+  Container Address: 340
+  Tag-Along Space
+
+
+</title></rect>
 <rect x="954" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 21
   Unassigned
   Container Bit Width: 16
@@ -10694,15 +10724,16 @@
   Container Bit Width: 32
   Container Address: 3
 
-ethernet.dstAddr[39:8] in container bits [31:0]
+tcp.dstPort[7:0] in container bits [31:24]
+tcp.seqNo[31:8] in container bits [23:0]
 
 </title></rect>
-<rect x="9" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 0
+<rect x="9" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 0
   Assigned to Ingress
   Container Bit Width: 32
   Container Address: 4
 
-ethernet.srcAddr[31:0] in container bits [31:0]
+ethernet.dstAddr[39:8] in container bits [31:0]
 
 </title></rect>
 <rect x="9" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 0
@@ -10710,8 +10741,7 @@
   Container Bit Width: 32
   Container Address: 5
 
-udp.srcPort[15:0] in container bits [31:16]
-udp.dstPort[15:0] in container bits [15:0]
+ethernet.srcAddr[31:0] in container bits [31:0]
 
 </title></rect>
 <rect x="9" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 0
@@ -11137,38 +11167,40 @@
   Container Bit Width: 8
   Container Address: 65
 
-ethernet.dstAddr[47:40] in container bits [7:0]
+tcp.srcPort[15:8] in container bits [7:0]
+udp.srcPort[7:0] in container bits [7:0]
 
 </title></rect>
-<rect x="189" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 4
+<rect x="189" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 4
   Assigned to Ingress
   Container Bit Width: 8
   Container Address: 66
 
-ethernet.srcAddr[39:32] in container bits [7:0]
+ethernet.dstAddr[47:40] in container bits [7:0]
 
 </title></rect>
-<rect x="189" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkred""><title>PHV Group: 4
+<rect x="189" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 4
   Assigned to Ingress
   Container Bit Width: 8
   Container Address: 67
 
-POV.POV[39:32] in container bits [7:0]
+ethernet.srcAddr[39:32] in container bits [7:0]
 
 </title></rect>
-<rect x="189" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:beige""><title>PHV Group: 4
+<rect x="189" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkred""><title>PHV Group: 4
   Assigned to Ingress
   Container Bit Width: 8
   Container Address: 68
 
-ig_intr_md_for_tm.drop_ctl[2:0] in container bits [7:5]
+POV.POV[39:32] in container bits [7:0]
 
 </title></rect>
-<rect x="189" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 4
-  Unassigned
+<rect x="189" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:beige""><title>PHV Group: 4
+  Assigned to Ingress
   Container Bit Width: 8
   Container Address: 69
 
+ig_intr_md_for_tm.drop_ctl[2:0] in container bits [7:5]
 
 </title></rect>
 <rect x="189" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 4
@@ -11628,24 +11660,25 @@
   Container Bit Width: 16
   Container Address: 132
 
-ethernet.dstAddr[7:0] in container bits [15:8]
-ethernet.srcAddr[47:40] in container bits [7:0]
+tcp.srcPort[7:0] in container bits [15:8]
+tcp.dstPort[15:8] in container bits [7:0]
 
 </title></rect>
-<rect x="369" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 8
+<rect x="369" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 8
   Assigned to Ingress
   Container Bit Width: 16
   Container Address: 133
 
-ethernet.etherType[15:0] in container bits [15:0]
+ethernet.dstAddr[7:0] in container bits [15:8]
+ethernet.srcAddr[47:40] in container bits [7:0]
 
 </title></rect>
-<rect x="369" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:goldenrod""><title>PHV Group: 8
+<rect x="369" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 8
   Assigned to Ingress
   Container Bit Width: 16
   Container Address: 134
 
-ecmp_metadata.group_id[15:0] in container bits [15:0]
+ethernet.etherType[15:0] in container bits [15:0]
 
 </title></rect>
 <rect x="369" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:goldenrod""><title>PHV Group: 8
@@ -11653,14 +11686,15 @@
   Container Bit Width: 16
   Container Address: 135
 
-ecmp_metadata.selector[15:0] in container bits [15:0]
+ecmp_metadata.group_id[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="387" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 8
-  Unassigned
+<rect x="387" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:goldenrod""><title>PHV Group: 8
+  Assigned to Ingress
   Container Bit Width: 16
   Container Address: 136
 
+ecmp_metadata.selector[15:0] in container bits [15:0]
 
 </title></rect>
 <rect x="387" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 8
@@ -12292,7 +12326,7 @@
 ipv4.ttl[7:0] in container bits [7:0]
 
 </title></rect>
-<rect x="729" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 16
+<rect x="729" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 16
   Assigned to Ingress
   Container Bit Width: 32
   Container Address: 257
@@ -12302,10 +12336,12 @@
 tcp.res[2:0] in container bits [27:25]
 tcp.ecn[2:0] in container bits [24:22]
 tcp.ctrl[5:0] in container bits [21:16]
+udp.length_[15:0] in container bits [31:16]
 tcp.window[15:0] in container bits [15:0]
+udp.checksum[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="729" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 16
+<rect x="729" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 16
   Assigned to Ingress
   Container Bit Width: 32
   Container Address: 258
@@ -12323,42 +12359,10 @@
 
 
 </title></rect>
-<rect x="729" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 16
-  Unassigned
-  Container Bit Width: 32
-  Container Address: 260
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="729" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 16
-  Unassigned
-  Container Bit Width: 32
-  Container Address: 261
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="729" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 16
-  Unassigned
-  Container Bit Width: 32
-  Container Address: 262
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="729" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 16
-  Unassigned
-  Container Bit Width: 32
-  Container Address: 263
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="747" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 16
+<rect x="729" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 16
   Assigned to Egress
   Container Bit Width: 32
-  Container Address: 264
+  Container Address: 260
   Tag-Along Space
 
 ipv4.ttl[7:0] in container bits [31:24]
@@ -12366,28 +12370,28 @@
 ipv4.hdrChecksum[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="747" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 16
+<rect x="729" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 16
   Assigned to Egress
   Container Bit Width: 32
-  Container Address: 265
+  Container Address: 261
   Tag-Along Space
 
 ipv4.srcAddr[31:0] in container bits [31:0]
 
 </title></rect>
-<rect x="747" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 16
+<rect x="729" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 16
   Assigned to Egress
   Container Bit Width: 32
-  Container Address: 266
+  Container Address: 262
   Tag-Along Space
 
 ipv4.dstAddr[31:0] in container bits [31:0]
 
 </title></rect>
-<rect x="747" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 16
+<rect x="729" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 16
   Assigned to Egress
   Container Bit Width: 32
-  Container Address: 267
+  Container Address: 263
   Tag-Along Space
 
 udp.length_[15:0] in container bits [31:16]
@@ -12395,10 +12399,10 @@
 udp.checksum[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="747" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 16
+<rect x="747" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 16
   Assigned to Egress
   Container Bit Width: 32
-  Container Address: 268
+  Container Address: 264
   Tag-Along Space
 
 tcp.dataOffset[3:0] in container bits [31:28]
@@ -12408,32 +12412,64 @@
 tcp.window[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="747" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 16
+<rect x="747" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 16
   Assigned to Egress
   Container Bit Width: 32
-  Container Address: 269
+  Container Address: 265
   Tag-Along Space
 
 tcp.checksum[15:0] in container bits [31:16]
 tcp.urgentPtr[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="747" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 16
+<rect x="747" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 16
   Assigned to Egress
   Container Bit Width: 32
-  Container Address: 270
+  Container Address: 266
   Tag-Along Space
 
 ethernet.dstAddr[39:8] in container bits [31:0]
 
 </title></rect>
-<rect x="747" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 16
+<rect x="747" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 16
   Assigned to Egress
   Container Bit Width: 32
+  Container Address: 267
+  Tag-Along Space
+
+ethernet.srcAddr[31:0] in container bits [31:0]
+
+</title></rect>
+<rect x="747" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 16
+  Unassigned
+  Container Bit Width: 32
+  Container Address: 268
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="747" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 16
+  Unassigned
+  Container Bit Width: 32
+  Container Address: 269
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="747" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 16
+  Unassigned
+  Container Bit Width: 32
+  Container Address: 270
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="747" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 16
+  Unassigned
+  Container Bit Width: 32
   Container Address: 271
   Tag-Along Space
 
-ethernet.srcAddr[31:0] in container bits [31:0]
 
 </title></rect>
 <text x="740" y="178" textLength="16" lengthAdjust="spacingAndGlyphs" textHeight="16" heightAdjust="spacingAndGlyphs" style="fill:black;">32</text>
@@ -12576,123 +12612,119 @@
 ipv4.ihl[3:0] in container bits [3:0]
 
 </title></rect>
-<rect x="819" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 18
+<rect x="819" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 18
   Assigned to Ingress
   Container Bit Width: 8
   Container Address: 289
   Tag-Along Space
 
-tcp.srcPort[15:8] in container bits [7:0]
-udp.length_[15:8] in container bits [7:0]
+tcp.seqNo[7:0] in container bits [7:0]
+udp.srcPort[15:8] in container bits [7:0]
 
 </title></rect>
-<rect x="819" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 18
-  Assigned to Ingress
+<rect x="819" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
+  Unassigned
   Container Bit Width: 8
   Container Address: 290
   Tag-Along Space
 
-tcp.srcPort[7:0] in container bits [7:0]
-udp.length_[7:0] in container bits [7:0]
 
 </title></rect>
-<rect x="819" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 18
-  Assigned to Ingress
+<rect x="819" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
+  Unassigned
   Container Bit Width: 8
   Container Address: 291
   Tag-Along Space
 
-tcp.dstPort[15:8] in container bits [7:0]
 
 </title></rect>
-<rect x="819" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 18
-  Assigned to Ingress
-  Container Bit Width: 8
-  Container Address: 292
-  Tag-Along Space
-
-tcp.dstPort[7:0] in container bits [7:0]
-
-</title></rect>
-<rect x="819" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
-  Unassigned
-  Container Bit Width: 8
-  Container Address: 293
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="819" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
-  Unassigned
-  Container Bit Width: 8
-  Container Address: 294
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="819" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
-  Unassigned
-  Container Bit Width: 8
-  Container Address: 295
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="837" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 18
+<rect x="819" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 18
   Assigned to Egress
   Container Bit Width: 8
-  Container Address: 296
+  Container Address: 292
   Tag-Along Space
 
 ipv4.version[3:0] in container bits [7:4]
 ipv4.ihl[3:0] in container bits [3:0]
 
 </title></rect>
-<rect x="837" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 18
+<rect x="819" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 18
   Assigned to Egress
   Container Bit Width: 8
-  Container Address: 297
+  Container Address: 293
   Tag-Along Space
 
 ipv4.diffserv[7:0] in container bits [7:0]
 
 </title></rect>
-<rect x="837" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 18
+<rect x="819" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 18
   Assigned to Egress
   Container Bit Width: 8
-  Container Address: 298
+  Container Address: 294
   Tag-Along Space
 
 tcp.srcPort[15:8] in container bits [7:0]
 udp.srcPort[15:8] in container bits [7:0]
 
 </title></rect>
-<rect x="837" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 18
+<rect x="819" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 18
   Assigned to Egress
   Container Bit Width: 8
-  Container Address: 299
+  Container Address: 295
   Tag-Along Space
 
 tcp.srcPort[7:0] in container bits [7:0]
 udp.srcPort[7:0] in container bits [7:0]
 
 </title></rect>
-<rect x="837" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 18
+<rect x="837" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 18
   Assigned to Egress
   Container Bit Width: 8
-  Container Address: 300
+  Container Address: 296
   Tag-Along Space
 
 ethernet.dstAddr[47:40] in container bits [7:0]
 
 </title></rect>
-<rect x="837" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 18
+<rect x="837" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 18
   Assigned to Egress
   Container Bit Width: 8
+  Container Address: 297
+  Tag-Along Space
+
+ethernet.srcAddr[39:32] in container bits [7:0]
+
+</title></rect>
+<rect x="837" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
+  Unassigned
+  Container Bit Width: 8
+  Container Address: 298
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="837" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
+  Unassigned
+  Container Bit Width: 8
+  Container Address: 299
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="837" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
+  Unassigned
+  Container Bit Width: 8
+  Container Address: 300
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="837" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
+  Unassigned
+  Container Bit Width: 8
   Container Address: 301
   Tag-Along Space
 
-ethernet.srcAddr[39:32] in container bits [7:0]
 
 </title></rect>
 <rect x="837" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
@@ -12861,171 +12893,120 @@
 ipv4.identification[15:8] in container bits [7:0]
 
 </title></rect>
-<rect x="909" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 20
+<rect x="909" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 20
   Assigned to Ingress
   Container Bit Width: 16
   Container Address: 322
   Tag-Along Space
 
-tcp.seqNo[31:16] in container bits [15:0]
-udp.checksum[15:0] in container bits [15:0]
+tcp.ackNo[31:16] in container bits [15:0]
+udp.dstPort[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="909" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 20
+<rect x="909" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 20
   Assigned to Ingress
   Container Bit Width: 16
   Container Address: 323
   Tag-Along Space
 
-tcp.seqNo[15:0] in container bits [15:0]
+tcp.ackNo[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="909" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 20
-  Assigned to Ingress
+<rect x="909" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 20
+  Unassigned
   Container Bit Width: 16
   Container Address: 324
   Tag-Along Space
 
-tcp.ackNo[31:16] in container bits [15:0]
 
 </title></rect>
-<rect x="909" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 20
-  Assigned to Ingress
+<rect x="909" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 20
+  Unassigned
   Container Bit Width: 16
   Container Address: 325
   Tag-Along Space
 
-tcp.ackNo[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="909" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 20
-  Unassigned
-  Container Bit Width: 16
-  Container Address: 326
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="909" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 20
-  Unassigned
-  Container Bit Width: 16
-  Container Address: 327
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="927" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 20
-  Unassigned
-  Container Bit Width: 16
-  Container Address: 328
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="927" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 20
-  Unassigned
-  Container Bit Width: 16
-  Container Address: 329
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="927" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 20
-  Unassigned
-  Container Bit Width: 16
-  Container Address: 330
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="927" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 20
-  Unassigned
-  Container Bit Width: 16
-  Container Address: 331
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="927" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 20
+<rect x="909" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 20
   Assigned to Egress
   Container Bit Width: 16
-  Container Address: 332
+  Container Address: 326
   Tag-Along Space
 
 ipv4.totalLen[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="927" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 20
+<rect x="909" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 20
   Assigned to Egress
   Container Bit Width: 16
-  Container Address: 333
+  Container Address: 327
   Tag-Along Space
 
 ipv4.identification[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="927" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 20
+<rect x="927" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 20
   Assigned to Egress
   Container Bit Width: 16
-  Container Address: 334
+  Container Address: 328
   Tag-Along Space
 
 ipv4.flags[2:0] in container bits [15:13]
 ipv4.fragOffset[12:0] in container bits [12:0]
 
 </title></rect>
-<rect x="927" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 20
+<rect x="927" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 20
   Assigned to Egress
   Container Bit Width: 16
-  Container Address: 335
+  Container Address: 329
   Tag-Along Space
 
 tcp.dstPort[15:0] in container bits [15:0]
-
-</title></rect>
-<text x="920" y="178" textLength="16" lengthAdjust="spacingAndGlyphs" textHeight="16" heightAdjust="spacingAndGlyphs" style="fill:black;">16</text>
-<rect x="954" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 21
-  Assigned to Egress
-  Container Bit Width: 16
-  Container Address: 336
-  Tag-Along Space
-
-tcp.seqNo[31:16] in container bits [15:0]
 udp.dstPort[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="954" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 21
+<rect x="927" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 20
   Assigned to Egress
   Container Bit Width: 16
-  Container Address: 337
+  Container Address: 330
+  Tag-Along Space
+
+tcp.seqNo[31:16] in container bits [15:0]
+
+</title></rect>
+<rect x="927" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 20
+  Assigned to Egress
+  Container Bit Width: 16
+  Container Address: 331
   Tag-Along Space
 
 tcp.seqNo[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="954" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 21
+<rect x="927" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 20
   Assigned to Egress
   Container Bit Width: 16
-  Container Address: 338
+  Container Address: 332
   Tag-Along Space
 
 ethernet.dstAddr[7:0] in container bits [15:8]
 ethernet.srcAddr[47:40] in container bits [7:0]
 
 </title></rect>
-<rect x="954" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 21
+<rect x="927" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 20
   Assigned to Egress
   Container Bit Width: 16
-  Container Address: 339
+  Container Address: 333
   Tag-Along Space
 
 ethernet.etherType[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="954" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:gold""><title>PHV Group: 21
+<rect x="927" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:gold""><title>PHV Group: 20
   Assigned to Egress
   Container Bit Width: 16
-  Container Address: 340
+  Container Address: 334
   Tag-Along Space
 
 packet_out_hdr.egress_port[8:0] in container bits [15:7]
@@ -13034,6 +13015,55 @@
 packet_in_hdr._padding[6:0] in container bits [6:0]
 
 </title></rect>
+<rect x="927" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 20
+  Unassigned
+  Container Bit Width: 16
+  Container Address: 335
+  Tag-Along Space
+
+
+</title></rect>
+<text x="920" y="178" textLength="16" lengthAdjust="spacingAndGlyphs" textHeight="16" heightAdjust="spacingAndGlyphs" style="fill:black;">16</text>
+<rect x="954" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 21
+  Unassigned
+  Container Bit Width: 16
+  Container Address: 336
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="954" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 21
+  Unassigned
+  Container Bit Width: 16
+  Container Address: 337
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="954" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 21
+  Unassigned
+  Container Bit Width: 16
+  Container Address: 338
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="954" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 21
+  Unassigned
+  Container Bit Width: 16
+  Container Address: 339
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="954" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 21
+  Unassigned
+  Container Bit Width: 16
+  Container Address: 340
+  Tag-Along Space
+
+
+</title></rect>
 <rect x="954" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 21
   Unassigned
   Container Bit Width: 16
@@ -13287,15 +13317,16 @@
   Container Bit Width: 32
   Container Address: 3
 
-ethernet.dstAddr[39:8] in container bits [31:0]
+tcp.dstPort[7:0] in container bits [31:24]
+tcp.seqNo[31:8] in container bits [23:0]
 
 </title></rect>
-<rect x="9" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 0
+<rect x="9" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 0
   Assigned to Ingress
   Container Bit Width: 32
   Container Address: 4
 
-ethernet.srcAddr[31:0] in container bits [31:0]
+ethernet.dstAddr[39:8] in container bits [31:0]
 
 </title></rect>
 <rect x="9" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 0
@@ -13303,8 +13334,7 @@
   Container Bit Width: 32
   Container Address: 5
 
-udp.srcPort[15:0] in container bits [31:16]
-udp.dstPort[15:0] in container bits [15:0]
+ethernet.srcAddr[31:0] in container bits [31:0]
 
 </title></rect>
 <rect x="9" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 0
@@ -13730,38 +13760,40 @@
   Container Bit Width: 8
   Container Address: 65
 
-ethernet.dstAddr[47:40] in container bits [7:0]
+tcp.srcPort[15:8] in container bits [7:0]
+udp.srcPort[7:0] in container bits [7:0]
 
 </title></rect>
-<rect x="189" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 4
+<rect x="189" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 4
   Assigned to Ingress
   Container Bit Width: 8
   Container Address: 66
 
-ethernet.srcAddr[39:32] in container bits [7:0]
+ethernet.dstAddr[47:40] in container bits [7:0]
 
 </title></rect>
-<rect x="189" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkred""><title>PHV Group: 4
+<rect x="189" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 4
   Assigned to Ingress
   Container Bit Width: 8
   Container Address: 67
 
-POV.POV[39:32] in container bits [7:0]
+ethernet.srcAddr[39:32] in container bits [7:0]
 
 </title></rect>
-<rect x="189" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:beige""><title>PHV Group: 4
+<rect x="189" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkred""><title>PHV Group: 4
   Assigned to Ingress
   Container Bit Width: 8
   Container Address: 68
 
-ig_intr_md_for_tm.drop_ctl[2:0] in container bits [7:5]
+POV.POV[39:32] in container bits [7:0]
 
 </title></rect>
-<rect x="189" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 4
-  Unassigned
+<rect x="189" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:beige""><title>PHV Group: 4
+  Assigned to Ingress
   Container Bit Width: 8
   Container Address: 69
 
+ig_intr_md_for_tm.drop_ctl[2:0] in container bits [7:5]
 
 </title></rect>
 <rect x="189" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 4
@@ -14221,24 +14253,25 @@
   Container Bit Width: 16
   Container Address: 132
 
-ethernet.dstAddr[7:0] in container bits [15:8]
-ethernet.srcAddr[47:40] in container bits [7:0]
+tcp.srcPort[7:0] in container bits [15:8]
+tcp.dstPort[15:8] in container bits [7:0]
 
 </title></rect>
-<rect x="369" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 8
+<rect x="369" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 8
   Assigned to Ingress
   Container Bit Width: 16
   Container Address: 133
 
-ethernet.etherType[15:0] in container bits [15:0]
+ethernet.dstAddr[7:0] in container bits [15:8]
+ethernet.srcAddr[47:40] in container bits [7:0]
 
 </title></rect>
-<rect x="369" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:goldenrod""><title>PHV Group: 8
+<rect x="369" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 8
   Assigned to Ingress
   Container Bit Width: 16
   Container Address: 134
 
-ecmp_metadata.group_id[15:0] in container bits [15:0]
+ethernet.etherType[15:0] in container bits [15:0]
 
 </title></rect>
 <rect x="369" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:goldenrod""><title>PHV Group: 8
@@ -14246,14 +14279,15 @@
   Container Bit Width: 16
   Container Address: 135
 
-ecmp_metadata.selector[15:0] in container bits [15:0]
+ecmp_metadata.group_id[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="387" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 8
-  Unassigned
+<rect x="387" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:goldenrod""><title>PHV Group: 8
+  Assigned to Ingress
   Container Bit Width: 16
   Container Address: 136
 
+ecmp_metadata.selector[15:0] in container bits [15:0]
 
 </title></rect>
 <rect x="387" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 8
@@ -14885,7 +14919,7 @@
 ipv4.ttl[7:0] in container bits [7:0]
 
 </title></rect>
-<rect x="729" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 16
+<rect x="729" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 16
   Assigned to Ingress
   Container Bit Width: 32
   Container Address: 257
@@ -14895,10 +14929,12 @@
 tcp.res[2:0] in container bits [27:25]
 tcp.ecn[2:0] in container bits [24:22]
 tcp.ctrl[5:0] in container bits [21:16]
+udp.length_[15:0] in container bits [31:16]
 tcp.window[15:0] in container bits [15:0]
+udp.checksum[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="729" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 16
+<rect x="729" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 16
   Assigned to Ingress
   Container Bit Width: 32
   Container Address: 258
@@ -14916,42 +14952,10 @@
 
 
 </title></rect>
-<rect x="729" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 16
-  Unassigned
-  Container Bit Width: 32
-  Container Address: 260
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="729" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 16
-  Unassigned
-  Container Bit Width: 32
-  Container Address: 261
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="729" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 16
-  Unassigned
-  Container Bit Width: 32
-  Container Address: 262
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="729" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 16
-  Unassigned
-  Container Bit Width: 32
-  Container Address: 263
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="747" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 16
+<rect x="729" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 16
   Assigned to Egress
   Container Bit Width: 32
-  Container Address: 264
+  Container Address: 260
   Tag-Along Space
 
 ipv4.ttl[7:0] in container bits [31:24]
@@ -14959,28 +14963,28 @@
 ipv4.hdrChecksum[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="747" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 16
+<rect x="729" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 16
   Assigned to Egress
   Container Bit Width: 32
-  Container Address: 265
+  Container Address: 261
   Tag-Along Space
 
 ipv4.srcAddr[31:0] in container bits [31:0]
 
 </title></rect>
-<rect x="747" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 16
+<rect x="729" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 16
   Assigned to Egress
   Container Bit Width: 32
-  Container Address: 266
+  Container Address: 262
   Tag-Along Space
 
 ipv4.dstAddr[31:0] in container bits [31:0]
 
 </title></rect>
-<rect x="747" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 16
+<rect x="729" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 16
   Assigned to Egress
   Container Bit Width: 32
-  Container Address: 267
+  Container Address: 263
   Tag-Along Space
 
 udp.length_[15:0] in container bits [31:16]
@@ -14988,10 +14992,10 @@
 udp.checksum[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="747" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 16
+<rect x="747" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 16
   Assigned to Egress
   Container Bit Width: 32
-  Container Address: 268
+  Container Address: 264
   Tag-Along Space
 
 tcp.dataOffset[3:0] in container bits [31:28]
@@ -15001,32 +15005,64 @@
 tcp.window[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="747" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 16
+<rect x="747" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 16
   Assigned to Egress
   Container Bit Width: 32
-  Container Address: 269
+  Container Address: 265
   Tag-Along Space
 
 tcp.checksum[15:0] in container bits [31:16]
 tcp.urgentPtr[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="747" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 16
+<rect x="747" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 16
   Assigned to Egress
   Container Bit Width: 32
-  Container Address: 270
+  Container Address: 266
   Tag-Along Space
 
 ethernet.dstAddr[39:8] in container bits [31:0]
 
 </title></rect>
-<rect x="747" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 16
+<rect x="747" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 16
   Assigned to Egress
   Container Bit Width: 32
+  Container Address: 267
+  Tag-Along Space
+
+ethernet.srcAddr[31:0] in container bits [31:0]
+
+</title></rect>
+<rect x="747" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 16
+  Unassigned
+  Container Bit Width: 32
+  Container Address: 268
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="747" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 16
+  Unassigned
+  Container Bit Width: 32
+  Container Address: 269
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="747" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 16
+  Unassigned
+  Container Bit Width: 32
+  Container Address: 270
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="747" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 16
+  Unassigned
+  Container Bit Width: 32
   Container Address: 271
   Tag-Along Space
 
-ethernet.srcAddr[31:0] in container bits [31:0]
 
 </title></rect>
 <text x="740" y="178" textLength="16" lengthAdjust="spacingAndGlyphs" textHeight="16" heightAdjust="spacingAndGlyphs" style="fill:black;">32</text>
@@ -15169,123 +15205,119 @@
 ipv4.ihl[3:0] in container bits [3:0]
 
 </title></rect>
-<rect x="819" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 18
+<rect x="819" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 18
   Assigned to Ingress
   Container Bit Width: 8
   Container Address: 289
   Tag-Along Space
 
-tcp.srcPort[15:8] in container bits [7:0]
-udp.length_[15:8] in container bits [7:0]
+tcp.seqNo[7:0] in container bits [7:0]
+udp.srcPort[15:8] in container bits [7:0]
 
 </title></rect>
-<rect x="819" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 18
-  Assigned to Ingress
+<rect x="819" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
+  Unassigned
   Container Bit Width: 8
   Container Address: 290
   Tag-Along Space
 
-tcp.srcPort[7:0] in container bits [7:0]
-udp.length_[7:0] in container bits [7:0]
 
 </title></rect>
-<rect x="819" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 18
-  Assigned to Ingress
+<rect x="819" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
+  Unassigned
   Container Bit Width: 8
   Container Address: 291
   Tag-Along Space
 
-tcp.dstPort[15:8] in container bits [7:0]
 
 </title></rect>
-<rect x="819" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 18
-  Assigned to Ingress
-  Container Bit Width: 8
-  Container Address: 292
-  Tag-Along Space
-
-tcp.dstPort[7:0] in container bits [7:0]
-
-</title></rect>
-<rect x="819" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
-  Unassigned
-  Container Bit Width: 8
-  Container Address: 293
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="819" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
-  Unassigned
-  Container Bit Width: 8
-  Container Address: 294
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="819" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
-  Unassigned
-  Container Bit Width: 8
-  Container Address: 295
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="837" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 18
+<rect x="819" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 18
   Assigned to Egress
   Container Bit Width: 8
-  Container Address: 296
+  Container Address: 292
   Tag-Along Space
 
 ipv4.version[3:0] in container bits [7:4]
 ipv4.ihl[3:0] in container bits [3:0]
 
 </title></rect>
-<rect x="837" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 18
+<rect x="819" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 18
   Assigned to Egress
   Container Bit Width: 8
-  Container Address: 297
+  Container Address: 293
   Tag-Along Space
 
 ipv4.diffserv[7:0] in container bits [7:0]
 
 </title></rect>
-<rect x="837" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 18
+<rect x="819" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 18
   Assigned to Egress
   Container Bit Width: 8
-  Container Address: 298
+  Container Address: 294
   Tag-Along Space
 
 tcp.srcPort[15:8] in container bits [7:0]
 udp.srcPort[15:8] in container bits [7:0]
 
 </title></rect>
-<rect x="837" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 18
+<rect x="819" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 18
   Assigned to Egress
   Container Bit Width: 8
-  Container Address: 299
+  Container Address: 295
   Tag-Along Space
 
 tcp.srcPort[7:0] in container bits [7:0]
 udp.srcPort[7:0] in container bits [7:0]
 
 </title></rect>
-<rect x="837" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 18
+<rect x="837" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 18
   Assigned to Egress
   Container Bit Width: 8
-  Container Address: 300
+  Container Address: 296
   Tag-Along Space
 
 ethernet.dstAddr[47:40] in container bits [7:0]
 
 </title></rect>
-<rect x="837" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 18
+<rect x="837" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 18
   Assigned to Egress
   Container Bit Width: 8
+  Container Address: 297
+  Tag-Along Space
+
+ethernet.srcAddr[39:32] in container bits [7:0]
+
+</title></rect>
+<rect x="837" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
+  Unassigned
+  Container Bit Width: 8
+  Container Address: 298
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="837" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
+  Unassigned
+  Container Bit Width: 8
+  Container Address: 299
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="837" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
+  Unassigned
+  Container Bit Width: 8
+  Container Address: 300
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="837" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
+  Unassigned
+  Container Bit Width: 8
   Container Address: 301
   Tag-Along Space
 
-ethernet.srcAddr[39:32] in container bits [7:0]
 
 </title></rect>
 <rect x="837" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
@@ -15454,171 +15486,120 @@
 ipv4.identification[15:8] in container bits [7:0]
 
 </title></rect>
-<rect x="909" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 20
+<rect x="909" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 20
   Assigned to Ingress
   Container Bit Width: 16
   Container Address: 322
   Tag-Along Space
 
-tcp.seqNo[31:16] in container bits [15:0]
-udp.checksum[15:0] in container bits [15:0]
+tcp.ackNo[31:16] in container bits [15:0]
+udp.dstPort[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="909" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 20
+<rect x="909" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 20
   Assigned to Ingress
   Container Bit Width: 16
   Container Address: 323
   Tag-Along Space
 
-tcp.seqNo[15:0] in container bits [15:0]
+tcp.ackNo[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="909" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 20
-  Assigned to Ingress
+<rect x="909" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 20
+  Unassigned
   Container Bit Width: 16
   Container Address: 324
   Tag-Along Space
 
-tcp.ackNo[31:16] in container bits [15:0]
 
 </title></rect>
-<rect x="909" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 20
-  Assigned to Ingress
+<rect x="909" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 20
+  Unassigned
   Container Bit Width: 16
   Container Address: 325
   Tag-Along Space
 
-tcp.ackNo[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="909" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 20
-  Unassigned
-  Container Bit Width: 16
-  Container Address: 326
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="909" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 20
-  Unassigned
-  Container Bit Width: 16
-  Container Address: 327
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="927" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 20
-  Unassigned
-  Container Bit Width: 16
-  Container Address: 328
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="927" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 20
-  Unassigned
-  Container Bit Width: 16
-  Container Address: 329
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="927" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 20
-  Unassigned
-  Container Bit Width: 16
-  Container Address: 330
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="927" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 20
-  Unassigned
-  Container Bit Width: 16
-  Container Address: 331
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="927" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 20
+<rect x="909" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 20
   Assigned to Egress
   Container Bit Width: 16
-  Container Address: 332
+  Container Address: 326
   Tag-Along Space
 
 ipv4.totalLen[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="927" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 20
+<rect x="909" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 20
   Assigned to Egress
   Container Bit Width: 16
-  Container Address: 333
+  Container Address: 327
   Tag-Along Space
 
 ipv4.identification[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="927" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 20
+<rect x="927" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 20
   Assigned to Egress
   Container Bit Width: 16
-  Container Address: 334
+  Container Address: 328
   Tag-Along Space
 
 ipv4.flags[2:0] in container bits [15:13]
 ipv4.fragOffset[12:0] in container bits [12:0]
 
 </title></rect>
-<rect x="927" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 20
+<rect x="927" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 20
   Assigned to Egress
   Container Bit Width: 16
-  Container Address: 335
+  Container Address: 329
   Tag-Along Space
 
 tcp.dstPort[15:0] in container bits [15:0]
-
-</title></rect>
-<text x="920" y="178" textLength="16" lengthAdjust="spacingAndGlyphs" textHeight="16" heightAdjust="spacingAndGlyphs" style="fill:black;">16</text>
-<rect x="954" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 21
-  Assigned to Egress
-  Container Bit Width: 16
-  Container Address: 336
-  Tag-Along Space
-
-tcp.seqNo[31:16] in container bits [15:0]
 udp.dstPort[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="954" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 21
+<rect x="927" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 20
   Assigned to Egress
   Container Bit Width: 16
-  Container Address: 337
+  Container Address: 330
+  Tag-Along Space
+
+tcp.seqNo[31:16] in container bits [15:0]
+
+</title></rect>
+<rect x="927" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 20
+  Assigned to Egress
+  Container Bit Width: 16
+  Container Address: 331
   Tag-Along Space
 
 tcp.seqNo[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="954" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 21
+<rect x="927" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 20
   Assigned to Egress
   Container Bit Width: 16
-  Container Address: 338
+  Container Address: 332
   Tag-Along Space
 
 ethernet.dstAddr[7:0] in container bits [15:8]
 ethernet.srcAddr[47:40] in container bits [7:0]
 
 </title></rect>
-<rect x="954" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 21
+<rect x="927" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 20
   Assigned to Egress
   Container Bit Width: 16
-  Container Address: 339
+  Container Address: 333
   Tag-Along Space
 
 ethernet.etherType[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="954" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:gold""><title>PHV Group: 21
+<rect x="927" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:gold""><title>PHV Group: 20
   Assigned to Egress
   Container Bit Width: 16
-  Container Address: 340
+  Container Address: 334
   Tag-Along Space
 
 packet_out_hdr.egress_port[8:0] in container bits [15:7]
@@ -15627,6 +15608,55 @@
 packet_in_hdr._padding[6:0] in container bits [6:0]
 
 </title></rect>
+<rect x="927" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 20
+  Unassigned
+  Container Bit Width: 16
+  Container Address: 335
+  Tag-Along Space
+
+
+</title></rect>
+<text x="920" y="178" textLength="16" lengthAdjust="spacingAndGlyphs" textHeight="16" heightAdjust="spacingAndGlyphs" style="fill:black;">16</text>
+<rect x="954" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 21
+  Unassigned
+  Container Bit Width: 16
+  Container Address: 336
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="954" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 21
+  Unassigned
+  Container Bit Width: 16
+  Container Address: 337
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="954" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 21
+  Unassigned
+  Container Bit Width: 16
+  Container Address: 338
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="954" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 21
+  Unassigned
+  Container Bit Width: 16
+  Container Address: 339
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="954" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 21
+  Unassigned
+  Container Bit Width: 16
+  Container Address: 340
+  Tag-Along Space
+
+
+</title></rect>
 <rect x="954" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 21
   Unassigned
   Container Bit Width: 16
@@ -15880,15 +15910,16 @@
   Container Bit Width: 32
   Container Address: 3
 
-ethernet.dstAddr[39:8] in container bits [31:0]
+tcp.dstPort[7:0] in container bits [31:24]
+tcp.seqNo[31:8] in container bits [23:0]
 
 </title></rect>
-<rect x="9" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 0
+<rect x="9" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 0
   Assigned to Ingress
   Container Bit Width: 32
   Container Address: 4
 
-ethernet.srcAddr[31:0] in container bits [31:0]
+ethernet.dstAddr[39:8] in container bits [31:0]
 
 </title></rect>
 <rect x="9" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 0
@@ -15896,8 +15927,7 @@
   Container Bit Width: 32
   Container Address: 5
 
-udp.srcPort[15:0] in container bits [31:16]
-udp.dstPort[15:0] in container bits [15:0]
+ethernet.srcAddr[31:0] in container bits [31:0]
 
 </title></rect>
 <rect x="9" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 0
@@ -16323,38 +16353,40 @@
   Container Bit Width: 8
   Container Address: 65
 
-ethernet.dstAddr[47:40] in container bits [7:0]
+tcp.srcPort[15:8] in container bits [7:0]
+udp.srcPort[7:0] in container bits [7:0]
 
 </title></rect>
-<rect x="189" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 4
+<rect x="189" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 4
   Assigned to Ingress
   Container Bit Width: 8
   Container Address: 66
 
-ethernet.srcAddr[39:32] in container bits [7:0]
+ethernet.dstAddr[47:40] in container bits [7:0]
 
 </title></rect>
-<rect x="189" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkred""><title>PHV Group: 4
+<rect x="189" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 4
   Assigned to Ingress
   Container Bit Width: 8
   Container Address: 67
 
-POV.POV[39:32] in container bits [7:0]
+ethernet.srcAddr[39:32] in container bits [7:0]
 
 </title></rect>
-<rect x="189" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:beige""><title>PHV Group: 4
+<rect x="189" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkred""><title>PHV Group: 4
   Assigned to Ingress
   Container Bit Width: 8
   Container Address: 68
 
-ig_intr_md_for_tm.drop_ctl[2:0] in container bits [7:5]
+POV.POV[39:32] in container bits [7:0]
 
 </title></rect>
-<rect x="189" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 4
-  Unassigned
+<rect x="189" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:beige""><title>PHV Group: 4
+  Assigned to Ingress
   Container Bit Width: 8
   Container Address: 69
 
+ig_intr_md_for_tm.drop_ctl[2:0] in container bits [7:5]
 
 </title></rect>
 <rect x="189" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 4
@@ -16814,24 +16846,25 @@
   Container Bit Width: 16
   Container Address: 132
 
-ethernet.dstAddr[7:0] in container bits [15:8]
-ethernet.srcAddr[47:40] in container bits [7:0]
+tcp.srcPort[7:0] in container bits [15:8]
+tcp.dstPort[15:8] in container bits [7:0]
 
 </title></rect>
-<rect x="369" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 8
+<rect x="369" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 8
   Assigned to Ingress
   Container Bit Width: 16
   Container Address: 133
 
-ethernet.etherType[15:0] in container bits [15:0]
+ethernet.dstAddr[7:0] in container bits [15:8]
+ethernet.srcAddr[47:40] in container bits [7:0]
 
 </title></rect>
-<rect x="369" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:goldenrod""><title>PHV Group: 8
+<rect x="369" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 8
   Assigned to Ingress
   Container Bit Width: 16
   Container Address: 134
 
-ecmp_metadata.group_id[15:0] in container bits [15:0]
+ethernet.etherType[15:0] in container bits [15:0]
 
 </title></rect>
 <rect x="369" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:goldenrod""><title>PHV Group: 8
@@ -16839,14 +16872,15 @@
   Container Bit Width: 16
   Container Address: 135
 
-ecmp_metadata.selector[15:0] in container bits [15:0]
+ecmp_metadata.group_id[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="387" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 8
-  Unassigned
+<rect x="387" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:goldenrod""><title>PHV Group: 8
+  Assigned to Ingress
   Container Bit Width: 16
   Container Address: 136
 
+ecmp_metadata.selector[15:0] in container bits [15:0]
 
 </title></rect>
 <rect x="387" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 8
@@ -17478,7 +17512,7 @@
 ipv4.ttl[7:0] in container bits [7:0]
 
 </title></rect>
-<rect x="729" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 16
+<rect x="729" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 16
   Assigned to Ingress
   Container Bit Width: 32
   Container Address: 257
@@ -17488,10 +17522,12 @@
 tcp.res[2:0] in container bits [27:25]
 tcp.ecn[2:0] in container bits [24:22]
 tcp.ctrl[5:0] in container bits [21:16]
+udp.length_[15:0] in container bits [31:16]
 tcp.window[15:0] in container bits [15:0]
+udp.checksum[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="729" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 16
+<rect x="729" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 16
   Assigned to Ingress
   Container Bit Width: 32
   Container Address: 258
@@ -17509,42 +17545,10 @@
 
 
 </title></rect>
-<rect x="729" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 16
-  Unassigned
-  Container Bit Width: 32
-  Container Address: 260
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="729" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 16
-  Unassigned
-  Container Bit Width: 32
-  Container Address: 261
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="729" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 16
-  Unassigned
-  Container Bit Width: 32
-  Container Address: 262
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="729" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 16
-  Unassigned
-  Container Bit Width: 32
-  Container Address: 263
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="747" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 16
+<rect x="729" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 16
   Assigned to Egress
   Container Bit Width: 32
-  Container Address: 264
+  Container Address: 260
   Tag-Along Space
 
 ipv4.ttl[7:0] in container bits [31:24]
@@ -17552,28 +17556,28 @@
 ipv4.hdrChecksum[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="747" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 16
+<rect x="729" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 16
   Assigned to Egress
   Container Bit Width: 32
-  Container Address: 265
+  Container Address: 261
   Tag-Along Space
 
 ipv4.srcAddr[31:0] in container bits [31:0]
 
 </title></rect>
-<rect x="747" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 16
+<rect x="729" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 16
   Assigned to Egress
   Container Bit Width: 32
-  Container Address: 266
+  Container Address: 262
   Tag-Along Space
 
 ipv4.dstAddr[31:0] in container bits [31:0]
 
 </title></rect>
-<rect x="747" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 16
+<rect x="729" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 16
   Assigned to Egress
   Container Bit Width: 32
-  Container Address: 267
+  Container Address: 263
   Tag-Along Space
 
 udp.length_[15:0] in container bits [31:16]
@@ -17581,10 +17585,10 @@
 udp.checksum[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="747" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 16
+<rect x="747" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 16
   Assigned to Egress
   Container Bit Width: 32
-  Container Address: 268
+  Container Address: 264
   Tag-Along Space
 
 tcp.dataOffset[3:0] in container bits [31:28]
@@ -17594,32 +17598,64 @@
 tcp.window[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="747" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 16
+<rect x="747" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 16
   Assigned to Egress
   Container Bit Width: 32
-  Container Address: 269
+  Container Address: 265
   Tag-Along Space
 
 tcp.checksum[15:0] in container bits [31:16]
 tcp.urgentPtr[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="747" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 16
+<rect x="747" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 16
   Assigned to Egress
   Container Bit Width: 32
-  Container Address: 270
+  Container Address: 266
   Tag-Along Space
 
 ethernet.dstAddr[39:8] in container bits [31:0]
 
 </title></rect>
-<rect x="747" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 16
+<rect x="747" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 16
   Assigned to Egress
   Container Bit Width: 32
+  Container Address: 267
+  Tag-Along Space
+
+ethernet.srcAddr[31:0] in container bits [31:0]
+
+</title></rect>
+<rect x="747" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 16
+  Unassigned
+  Container Bit Width: 32
+  Container Address: 268
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="747" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 16
+  Unassigned
+  Container Bit Width: 32
+  Container Address: 269
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="747" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 16
+  Unassigned
+  Container Bit Width: 32
+  Container Address: 270
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="747" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 16
+  Unassigned
+  Container Bit Width: 32
   Container Address: 271
   Tag-Along Space
 
-ethernet.srcAddr[31:0] in container bits [31:0]
 
 </title></rect>
 <text x="740" y="178" textLength="16" lengthAdjust="spacingAndGlyphs" textHeight="16" heightAdjust="spacingAndGlyphs" style="fill:black;">32</text>
@@ -17762,123 +17798,119 @@
 ipv4.ihl[3:0] in container bits [3:0]
 
 </title></rect>
-<rect x="819" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 18
+<rect x="819" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 18
   Assigned to Ingress
   Container Bit Width: 8
   Container Address: 289
   Tag-Along Space
 
-tcp.srcPort[15:8] in container bits [7:0]
-udp.length_[15:8] in container bits [7:0]
+tcp.seqNo[7:0] in container bits [7:0]
+udp.srcPort[15:8] in container bits [7:0]
 
 </title></rect>
-<rect x="819" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 18
-  Assigned to Ingress
+<rect x="819" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
+  Unassigned
   Container Bit Width: 8
   Container Address: 290
   Tag-Along Space
 
-tcp.srcPort[7:0] in container bits [7:0]
-udp.length_[7:0] in container bits [7:0]
 
 </title></rect>
-<rect x="819" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 18
-  Assigned to Ingress
+<rect x="819" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
+  Unassigned
   Container Bit Width: 8
   Container Address: 291
   Tag-Along Space
 
-tcp.dstPort[15:8] in container bits [7:0]
 
 </title></rect>
-<rect x="819" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 18
-  Assigned to Ingress
-  Container Bit Width: 8
-  Container Address: 292
-  Tag-Along Space
-
-tcp.dstPort[7:0] in container bits [7:0]
-
-</title></rect>
-<rect x="819" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
-  Unassigned
-  Container Bit Width: 8
-  Container Address: 293
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="819" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
-  Unassigned
-  Container Bit Width: 8
-  Container Address: 294
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="819" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
-  Unassigned
-  Container Bit Width: 8
-  Container Address: 295
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="837" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 18
+<rect x="819" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 18
   Assigned to Egress
   Container Bit Width: 8
-  Container Address: 296
+  Container Address: 292
   Tag-Along Space
 
 ipv4.version[3:0] in container bits [7:4]
 ipv4.ihl[3:0] in container bits [3:0]
 
 </title></rect>
-<rect x="837" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 18
+<rect x="819" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 18
   Assigned to Egress
   Container Bit Width: 8
-  Container Address: 297
+  Container Address: 293
   Tag-Along Space
 
 ipv4.diffserv[7:0] in container bits [7:0]
 
 </title></rect>
-<rect x="837" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 18
+<rect x="819" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 18
   Assigned to Egress
   Container Bit Width: 8
-  Container Address: 298
+  Container Address: 294
   Tag-Along Space
 
 tcp.srcPort[15:8] in container bits [7:0]
 udp.srcPort[15:8] in container bits [7:0]
 
 </title></rect>
-<rect x="837" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 18
+<rect x="819" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 18
   Assigned to Egress
   Container Bit Width: 8
-  Container Address: 299
+  Container Address: 295
   Tag-Along Space
 
 tcp.srcPort[7:0] in container bits [7:0]
 udp.srcPort[7:0] in container bits [7:0]
 
 </title></rect>
-<rect x="837" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 18
+<rect x="837" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 18
   Assigned to Egress
   Container Bit Width: 8
-  Container Address: 300
+  Container Address: 296
   Tag-Along Space
 
 ethernet.dstAddr[47:40] in container bits [7:0]
 
 </title></rect>
-<rect x="837" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 18
+<rect x="837" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 18
   Assigned to Egress
   Container Bit Width: 8
+  Container Address: 297
+  Tag-Along Space
+
+ethernet.srcAddr[39:32] in container bits [7:0]
+
+</title></rect>
+<rect x="837" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
+  Unassigned
+  Container Bit Width: 8
+  Container Address: 298
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="837" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
+  Unassigned
+  Container Bit Width: 8
+  Container Address: 299
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="837" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
+  Unassigned
+  Container Bit Width: 8
+  Container Address: 300
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="837" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
+  Unassigned
+  Container Bit Width: 8
   Container Address: 301
   Tag-Along Space
 
-ethernet.srcAddr[39:32] in container bits [7:0]
 
 </title></rect>
 <rect x="837" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
@@ -18047,171 +18079,120 @@
 ipv4.identification[15:8] in container bits [7:0]
 
 </title></rect>
-<rect x="909" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 20
+<rect x="909" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 20
   Assigned to Ingress
   Container Bit Width: 16
   Container Address: 322
   Tag-Along Space
 
-tcp.seqNo[31:16] in container bits [15:0]
-udp.checksum[15:0] in container bits [15:0]
+tcp.ackNo[31:16] in container bits [15:0]
+udp.dstPort[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="909" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 20
+<rect x="909" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 20
   Assigned to Ingress
   Container Bit Width: 16
   Container Address: 323
   Tag-Along Space
 
-tcp.seqNo[15:0] in container bits [15:0]
+tcp.ackNo[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="909" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 20
-  Assigned to Ingress
+<rect x="909" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 20
+  Unassigned
   Container Bit Width: 16
   Container Address: 324
   Tag-Along Space
 
-tcp.ackNo[31:16] in container bits [15:0]
 
 </title></rect>
-<rect x="909" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 20
-  Assigned to Ingress
+<rect x="909" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 20
+  Unassigned
   Container Bit Width: 16
   Container Address: 325
   Tag-Along Space
 
-tcp.ackNo[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="909" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 20
-  Unassigned
-  Container Bit Width: 16
-  Container Address: 326
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="909" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 20
-  Unassigned
-  Container Bit Width: 16
-  Container Address: 327
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="927" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 20
-  Unassigned
-  Container Bit Width: 16
-  Container Address: 328
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="927" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 20
-  Unassigned
-  Container Bit Width: 16
-  Container Address: 329
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="927" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 20
-  Unassigned
-  Container Bit Width: 16
-  Container Address: 330
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="927" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 20
-  Unassigned
-  Container Bit Width: 16
-  Container Address: 331
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="927" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 20
+<rect x="909" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 20
   Assigned to Egress
   Container Bit Width: 16
-  Container Address: 332
+  Container Address: 326
   Tag-Along Space
 
 ipv4.totalLen[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="927" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 20
+<rect x="909" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 20
   Assigned to Egress
   Container Bit Width: 16
-  Container Address: 333
+  Container Address: 327
   Tag-Along Space
 
 ipv4.identification[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="927" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 20
+<rect x="927" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 20
   Assigned to Egress
   Container Bit Width: 16
-  Container Address: 334
+  Container Address: 328
   Tag-Along Space
 
 ipv4.flags[2:0] in container bits [15:13]
 ipv4.fragOffset[12:0] in container bits [12:0]
 
 </title></rect>
-<rect x="927" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 20
+<rect x="927" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 20
   Assigned to Egress
   Container Bit Width: 16
-  Container Address: 335
+  Container Address: 329
   Tag-Along Space
 
 tcp.dstPort[15:0] in container bits [15:0]
-
-</title></rect>
-<text x="920" y="178" textLength="16" lengthAdjust="spacingAndGlyphs" textHeight="16" heightAdjust="spacingAndGlyphs" style="fill:black;">16</text>
-<rect x="954" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 21
-  Assigned to Egress
-  Container Bit Width: 16
-  Container Address: 336
-  Tag-Along Space
-
-tcp.seqNo[31:16] in container bits [15:0]
 udp.dstPort[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="954" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 21
+<rect x="927" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 20
   Assigned to Egress
   Container Bit Width: 16
-  Container Address: 337
+  Container Address: 330
+  Tag-Along Space
+
+tcp.seqNo[31:16] in container bits [15:0]
+
+</title></rect>
+<rect x="927" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 20
+  Assigned to Egress
+  Container Bit Width: 16
+  Container Address: 331
   Tag-Along Space
 
 tcp.seqNo[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="954" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 21
+<rect x="927" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 20
   Assigned to Egress
   Container Bit Width: 16
-  Container Address: 338
+  Container Address: 332
   Tag-Along Space
 
 ethernet.dstAddr[7:0] in container bits [15:8]
 ethernet.srcAddr[47:40] in container bits [7:0]
 
 </title></rect>
-<rect x="954" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 21
+<rect x="927" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 20
   Assigned to Egress
   Container Bit Width: 16
-  Container Address: 339
+  Container Address: 333
   Tag-Along Space
 
 ethernet.etherType[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="954" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:gold""><title>PHV Group: 21
+<rect x="927" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:gold""><title>PHV Group: 20
   Assigned to Egress
   Container Bit Width: 16
-  Container Address: 340
+  Container Address: 334
   Tag-Along Space
 
 packet_out_hdr.egress_port[8:0] in container bits [15:7]
@@ -18220,6 +18201,55 @@
 packet_in_hdr._padding[6:0] in container bits [6:0]
 
 </title></rect>
+<rect x="927" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 20
+  Unassigned
+  Container Bit Width: 16
+  Container Address: 335
+  Tag-Along Space
+
+
+</title></rect>
+<text x="920" y="178" textLength="16" lengthAdjust="spacingAndGlyphs" textHeight="16" heightAdjust="spacingAndGlyphs" style="fill:black;">16</text>
+<rect x="954" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 21
+  Unassigned
+  Container Bit Width: 16
+  Container Address: 336
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="954" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 21
+  Unassigned
+  Container Bit Width: 16
+  Container Address: 337
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="954" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 21
+  Unassigned
+  Container Bit Width: 16
+  Container Address: 338
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="954" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 21
+  Unassigned
+  Container Bit Width: 16
+  Container Address: 339
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="954" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 21
+  Unassigned
+  Container Bit Width: 16
+  Container Address: 340
+  Tag-Along Space
+
+
+</title></rect>
 <rect x="954" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 21
   Unassigned
   Container Bit Width: 16
@@ -18473,15 +18503,16 @@
   Container Bit Width: 32
   Container Address: 3
 
-ethernet.dstAddr[39:8] in container bits [31:0]
+tcp.dstPort[7:0] in container bits [31:24]
+tcp.seqNo[31:8] in container bits [23:0]
 
 </title></rect>
-<rect x="9" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 0
+<rect x="9" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 0
   Assigned to Ingress
   Container Bit Width: 32
   Container Address: 4
 
-ethernet.srcAddr[31:0] in container bits [31:0]
+ethernet.dstAddr[39:8] in container bits [31:0]
 
 </title></rect>
 <rect x="9" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 0
@@ -18489,8 +18520,7 @@
   Container Bit Width: 32
   Container Address: 5
 
-udp.srcPort[15:0] in container bits [31:16]
-udp.dstPort[15:0] in container bits [15:0]
+ethernet.srcAddr[31:0] in container bits [31:0]
 
 </title></rect>
 <rect x="9" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 0
@@ -18916,38 +18946,40 @@
   Container Bit Width: 8
   Container Address: 65
 
-ethernet.dstAddr[47:40] in container bits [7:0]
+tcp.srcPort[15:8] in container bits [7:0]
+udp.srcPort[7:0] in container bits [7:0]
 
 </title></rect>
-<rect x="189" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 4
+<rect x="189" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 4
   Assigned to Ingress
   Container Bit Width: 8
   Container Address: 66
 
-ethernet.srcAddr[39:32] in container bits [7:0]
+ethernet.dstAddr[47:40] in container bits [7:0]
 
 </title></rect>
-<rect x="189" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkred""><title>PHV Group: 4
+<rect x="189" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 4
   Assigned to Ingress
   Container Bit Width: 8
   Container Address: 67
 
-POV.POV[39:32] in container bits [7:0]
+ethernet.srcAddr[39:32] in container bits [7:0]
 
 </title></rect>
-<rect x="189" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:beige""><title>PHV Group: 4
+<rect x="189" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkred""><title>PHV Group: 4
   Assigned to Ingress
   Container Bit Width: 8
   Container Address: 68
 
-ig_intr_md_for_tm.drop_ctl[2:0] in container bits [7:5]
+POV.POV[39:32] in container bits [7:0]
 
 </title></rect>
-<rect x="189" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 4
-  Unassigned
+<rect x="189" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:beige""><title>PHV Group: 4
+  Assigned to Ingress
   Container Bit Width: 8
   Container Address: 69
 
+ig_intr_md_for_tm.drop_ctl[2:0] in container bits [7:5]
 
 </title></rect>
 <rect x="189" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 4
@@ -19407,24 +19439,25 @@
   Container Bit Width: 16
   Container Address: 132
 
-ethernet.dstAddr[7:0] in container bits [15:8]
-ethernet.srcAddr[47:40] in container bits [7:0]
+tcp.srcPort[7:0] in container bits [15:8]
+tcp.dstPort[15:8] in container bits [7:0]
 
 </title></rect>
-<rect x="369" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 8
+<rect x="369" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 8
   Assigned to Ingress
   Container Bit Width: 16
   Container Address: 133
 
-ethernet.etherType[15:0] in container bits [15:0]
+ethernet.dstAddr[7:0] in container bits [15:8]
+ethernet.srcAddr[47:40] in container bits [7:0]
 
 </title></rect>
-<rect x="369" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:goldenrod""><title>PHV Group: 8
+<rect x="369" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 8
   Assigned to Ingress
   Container Bit Width: 16
   Container Address: 134
 
-ecmp_metadata.group_id[15:0] in container bits [15:0]
+ethernet.etherType[15:0] in container bits [15:0]
 
 </title></rect>
 <rect x="369" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:goldenrod""><title>PHV Group: 8
@@ -19432,14 +19465,15 @@
   Container Bit Width: 16
   Container Address: 135
 
-ecmp_metadata.selector[15:0] in container bits [15:0]
+ecmp_metadata.group_id[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="387" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 8
-  Unassigned
+<rect x="387" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:goldenrod""><title>PHV Group: 8
+  Assigned to Ingress
   Container Bit Width: 16
   Container Address: 136
 
+ecmp_metadata.selector[15:0] in container bits [15:0]
 
 </title></rect>
 <rect x="387" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 8
@@ -20071,7 +20105,7 @@
 ipv4.ttl[7:0] in container bits [7:0]
 
 </title></rect>
-<rect x="729" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 16
+<rect x="729" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 16
   Assigned to Ingress
   Container Bit Width: 32
   Container Address: 257
@@ -20081,10 +20115,12 @@
 tcp.res[2:0] in container bits [27:25]
 tcp.ecn[2:0] in container bits [24:22]
 tcp.ctrl[5:0] in container bits [21:16]
+udp.length_[15:0] in container bits [31:16]
 tcp.window[15:0] in container bits [15:0]
+udp.checksum[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="729" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 16
+<rect x="729" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 16
   Assigned to Ingress
   Container Bit Width: 32
   Container Address: 258
@@ -20102,42 +20138,10 @@
 
 
 </title></rect>
-<rect x="729" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 16
-  Unassigned
-  Container Bit Width: 32
-  Container Address: 260
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="729" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 16
-  Unassigned
-  Container Bit Width: 32
-  Container Address: 261
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="729" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 16
-  Unassigned
-  Container Bit Width: 32
-  Container Address: 262
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="729" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 16
-  Unassigned
-  Container Bit Width: 32
-  Container Address: 263
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="747" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 16
+<rect x="729" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 16
   Assigned to Egress
   Container Bit Width: 32
-  Container Address: 264
+  Container Address: 260
   Tag-Along Space
 
 ipv4.ttl[7:0] in container bits [31:24]
@@ -20145,28 +20149,28 @@
 ipv4.hdrChecksum[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="747" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 16
+<rect x="729" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 16
   Assigned to Egress
   Container Bit Width: 32
-  Container Address: 265
+  Container Address: 261
   Tag-Along Space
 
 ipv4.srcAddr[31:0] in container bits [31:0]
 
 </title></rect>
-<rect x="747" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 16
+<rect x="729" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 16
   Assigned to Egress
   Container Bit Width: 32
-  Container Address: 266
+  Container Address: 262
   Tag-Along Space
 
 ipv4.dstAddr[31:0] in container bits [31:0]
 
 </title></rect>
-<rect x="747" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 16
+<rect x="729" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 16
   Assigned to Egress
   Container Bit Width: 32
-  Container Address: 267
+  Container Address: 263
   Tag-Along Space
 
 udp.length_[15:0] in container bits [31:16]
@@ -20174,10 +20178,10 @@
 udp.checksum[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="747" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 16
+<rect x="747" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 16
   Assigned to Egress
   Container Bit Width: 32
-  Container Address: 268
+  Container Address: 264
   Tag-Along Space
 
 tcp.dataOffset[3:0] in container bits [31:28]
@@ -20187,32 +20191,64 @@
 tcp.window[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="747" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 16
+<rect x="747" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 16
   Assigned to Egress
   Container Bit Width: 32
-  Container Address: 269
+  Container Address: 265
   Tag-Along Space
 
 tcp.checksum[15:0] in container bits [31:16]
 tcp.urgentPtr[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="747" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 16
+<rect x="747" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 16
   Assigned to Egress
   Container Bit Width: 32
-  Container Address: 270
+  Container Address: 266
   Tag-Along Space
 
 ethernet.dstAddr[39:8] in container bits [31:0]
 
 </title></rect>
-<rect x="747" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 16
+<rect x="747" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 16
   Assigned to Egress
   Container Bit Width: 32
+  Container Address: 267
+  Tag-Along Space
+
+ethernet.srcAddr[31:0] in container bits [31:0]
+
+</title></rect>
+<rect x="747" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 16
+  Unassigned
+  Container Bit Width: 32
+  Container Address: 268
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="747" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 16
+  Unassigned
+  Container Bit Width: 32
+  Container Address: 269
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="747" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 16
+  Unassigned
+  Container Bit Width: 32
+  Container Address: 270
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="747" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 16
+  Unassigned
+  Container Bit Width: 32
   Container Address: 271
   Tag-Along Space
 
-ethernet.srcAddr[31:0] in container bits [31:0]
 
 </title></rect>
 <text x="740" y="178" textLength="16" lengthAdjust="spacingAndGlyphs" textHeight="16" heightAdjust="spacingAndGlyphs" style="fill:black;">32</text>
@@ -20355,123 +20391,119 @@
 ipv4.ihl[3:0] in container bits [3:0]
 
 </title></rect>
-<rect x="819" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 18
+<rect x="819" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 18
   Assigned to Ingress
   Container Bit Width: 8
   Container Address: 289
   Tag-Along Space
 
-tcp.srcPort[15:8] in container bits [7:0]
-udp.length_[15:8] in container bits [7:0]
+tcp.seqNo[7:0] in container bits [7:0]
+udp.srcPort[15:8] in container bits [7:0]
 
 </title></rect>
-<rect x="819" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 18
-  Assigned to Ingress
+<rect x="819" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
+  Unassigned
   Container Bit Width: 8
   Container Address: 290
   Tag-Along Space
 
-tcp.srcPort[7:0] in container bits [7:0]
-udp.length_[7:0] in container bits [7:0]
 
 </title></rect>
-<rect x="819" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 18
-  Assigned to Ingress
+<rect x="819" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
+  Unassigned
   Container Bit Width: 8
   Container Address: 291
   Tag-Along Space
 
-tcp.dstPort[15:8] in container bits [7:0]
 
 </title></rect>
-<rect x="819" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 18
-  Assigned to Ingress
-  Container Bit Width: 8
-  Container Address: 292
-  Tag-Along Space
-
-tcp.dstPort[7:0] in container bits [7:0]
-
-</title></rect>
-<rect x="819" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
-  Unassigned
-  Container Bit Width: 8
-  Container Address: 293
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="819" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
-  Unassigned
-  Container Bit Width: 8
-  Container Address: 294
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="819" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
-  Unassigned
-  Container Bit Width: 8
-  Container Address: 295
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="837" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 18
+<rect x="819" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 18
   Assigned to Egress
   Container Bit Width: 8
-  Container Address: 296
+  Container Address: 292
   Tag-Along Space
 
 ipv4.version[3:0] in container bits [7:4]
 ipv4.ihl[3:0] in container bits [3:0]
 
 </title></rect>
-<rect x="837" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 18
+<rect x="819" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 18
   Assigned to Egress
   Container Bit Width: 8
-  Container Address: 297
+  Container Address: 293
   Tag-Along Space
 
 ipv4.diffserv[7:0] in container bits [7:0]
 
 </title></rect>
-<rect x="837" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 18
+<rect x="819" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 18
   Assigned to Egress
   Container Bit Width: 8
-  Container Address: 298
+  Container Address: 294
   Tag-Along Space
 
 tcp.srcPort[15:8] in container bits [7:0]
 udp.srcPort[15:8] in container bits [7:0]
 
 </title></rect>
-<rect x="837" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 18
+<rect x="819" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 18
   Assigned to Egress
   Container Bit Width: 8
-  Container Address: 299
+  Container Address: 295
   Tag-Along Space
 
 tcp.srcPort[7:0] in container bits [7:0]
 udp.srcPort[7:0] in container bits [7:0]
 
 </title></rect>
-<rect x="837" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 18
+<rect x="837" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 18
   Assigned to Egress
   Container Bit Width: 8
-  Container Address: 300
+  Container Address: 296
   Tag-Along Space
 
 ethernet.dstAddr[47:40] in container bits [7:0]
 
 </title></rect>
-<rect x="837" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 18
+<rect x="837" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 18
   Assigned to Egress
   Container Bit Width: 8
+  Container Address: 297
+  Tag-Along Space
+
+ethernet.srcAddr[39:32] in container bits [7:0]
+
+</title></rect>
+<rect x="837" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
+  Unassigned
+  Container Bit Width: 8
+  Container Address: 298
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="837" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
+  Unassigned
+  Container Bit Width: 8
+  Container Address: 299
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="837" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
+  Unassigned
+  Container Bit Width: 8
+  Container Address: 300
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="837" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
+  Unassigned
+  Container Bit Width: 8
   Container Address: 301
   Tag-Along Space
 
-ethernet.srcAddr[39:32] in container bits [7:0]
 
 </title></rect>
 <rect x="837" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
@@ -20640,171 +20672,120 @@
 ipv4.identification[15:8] in container bits [7:0]
 
 </title></rect>
-<rect x="909" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 20
+<rect x="909" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 20
   Assigned to Ingress
   Container Bit Width: 16
   Container Address: 322
   Tag-Along Space
 
-tcp.seqNo[31:16] in container bits [15:0]
-udp.checksum[15:0] in container bits [15:0]
+tcp.ackNo[31:16] in container bits [15:0]
+udp.dstPort[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="909" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 20
+<rect x="909" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 20
   Assigned to Ingress
   Container Bit Width: 16
   Container Address: 323
   Tag-Along Space
 
-tcp.seqNo[15:0] in container bits [15:0]
+tcp.ackNo[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="909" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 20
-  Assigned to Ingress
+<rect x="909" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 20
+  Unassigned
   Container Bit Width: 16
   Container Address: 324
   Tag-Along Space
 
-tcp.ackNo[31:16] in container bits [15:0]
 
 </title></rect>
-<rect x="909" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 20
-  Assigned to Ingress
+<rect x="909" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 20
+  Unassigned
   Container Bit Width: 16
   Container Address: 325
   Tag-Along Space
 
-tcp.ackNo[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="909" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 20
-  Unassigned
-  Container Bit Width: 16
-  Container Address: 326
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="909" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 20
-  Unassigned
-  Container Bit Width: 16
-  Container Address: 327
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="927" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 20
-  Unassigned
-  Container Bit Width: 16
-  Container Address: 328
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="927" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 20
-  Unassigned
-  Container Bit Width: 16
-  Container Address: 329
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="927" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 20
-  Unassigned
-  Container Bit Width: 16
-  Container Address: 330
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="927" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 20
-  Unassigned
-  Container Bit Width: 16
-  Container Address: 331
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="927" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 20
+<rect x="909" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 20
   Assigned to Egress
   Container Bit Width: 16
-  Container Address: 332
+  Container Address: 326
   Tag-Along Space
 
 ipv4.totalLen[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="927" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 20
+<rect x="909" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 20
   Assigned to Egress
   Container Bit Width: 16
-  Container Address: 333
+  Container Address: 327
   Tag-Along Space
 
 ipv4.identification[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="927" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 20
+<rect x="927" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 20
   Assigned to Egress
   Container Bit Width: 16
-  Container Address: 334
+  Container Address: 328
   Tag-Along Space
 
 ipv4.flags[2:0] in container bits [15:13]
 ipv4.fragOffset[12:0] in container bits [12:0]
 
 </title></rect>
-<rect x="927" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 20
+<rect x="927" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 20
   Assigned to Egress
   Container Bit Width: 16
-  Container Address: 335
+  Container Address: 329
   Tag-Along Space
 
 tcp.dstPort[15:0] in container bits [15:0]
-
-</title></rect>
-<text x="920" y="178" textLength="16" lengthAdjust="spacingAndGlyphs" textHeight="16" heightAdjust="spacingAndGlyphs" style="fill:black;">16</text>
-<rect x="954" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 21
-  Assigned to Egress
-  Container Bit Width: 16
-  Container Address: 336
-  Tag-Along Space
-
-tcp.seqNo[31:16] in container bits [15:0]
 udp.dstPort[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="954" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 21
+<rect x="927" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 20
   Assigned to Egress
   Container Bit Width: 16
-  Container Address: 337
+  Container Address: 330
+  Tag-Along Space
+
+tcp.seqNo[31:16] in container bits [15:0]
+
+</title></rect>
+<rect x="927" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 20
+  Assigned to Egress
+  Container Bit Width: 16
+  Container Address: 331
   Tag-Along Space
 
 tcp.seqNo[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="954" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 21
+<rect x="927" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 20
   Assigned to Egress
   Container Bit Width: 16
-  Container Address: 338
+  Container Address: 332
   Tag-Along Space
 
 ethernet.dstAddr[7:0] in container bits [15:8]
 ethernet.srcAddr[47:40] in container bits [7:0]
 
 </title></rect>
-<rect x="954" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 21
+<rect x="927" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 20
   Assigned to Egress
   Container Bit Width: 16
-  Container Address: 339
+  Container Address: 333
   Tag-Along Space
 
 ethernet.etherType[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="954" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:gold""><title>PHV Group: 21
+<rect x="927" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:gold""><title>PHV Group: 20
   Assigned to Egress
   Container Bit Width: 16
-  Container Address: 340
+  Container Address: 334
   Tag-Along Space
 
 packet_out_hdr.egress_port[8:0] in container bits [15:7]
@@ -20813,6 +20794,55 @@
 packet_in_hdr._padding[6:0] in container bits [6:0]
 
 </title></rect>
+<rect x="927" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 20
+  Unassigned
+  Container Bit Width: 16
+  Container Address: 335
+  Tag-Along Space
+
+
+</title></rect>
+<text x="920" y="178" textLength="16" lengthAdjust="spacingAndGlyphs" textHeight="16" heightAdjust="spacingAndGlyphs" style="fill:black;">16</text>
+<rect x="954" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 21
+  Unassigned
+  Container Bit Width: 16
+  Container Address: 336
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="954" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 21
+  Unassigned
+  Container Bit Width: 16
+  Container Address: 337
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="954" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 21
+  Unassigned
+  Container Bit Width: 16
+  Container Address: 338
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="954" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 21
+  Unassigned
+  Container Bit Width: 16
+  Container Address: 339
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="954" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 21
+  Unassigned
+  Container Bit Width: 16
+  Container Address: 340
+  Tag-Along Space
+
+
+</title></rect>
 <rect x="954" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 21
   Unassigned
   Container Bit Width: 16
@@ -21066,15 +21096,16 @@
   Container Bit Width: 32
   Container Address: 3
 
-ethernet.dstAddr[39:8] in container bits [31:0]
+tcp.dstPort[7:0] in container bits [31:24]
+tcp.seqNo[31:8] in container bits [23:0]
 
 </title></rect>
-<rect x="9" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 0
+<rect x="9" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 0
   Assigned to Ingress
   Container Bit Width: 32
   Container Address: 4
 
-ethernet.srcAddr[31:0] in container bits [31:0]
+ethernet.dstAddr[39:8] in container bits [31:0]
 
 </title></rect>
 <rect x="9" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 0
@@ -21082,8 +21113,7 @@
   Container Bit Width: 32
   Container Address: 5
 
-udp.srcPort[15:0] in container bits [31:16]
-udp.dstPort[15:0] in container bits [15:0]
+ethernet.srcAddr[31:0] in container bits [31:0]
 
 </title></rect>
 <rect x="9" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 0
@@ -21509,38 +21539,40 @@
   Container Bit Width: 8
   Container Address: 65
 
-ethernet.dstAddr[47:40] in container bits [7:0]
+tcp.srcPort[15:8] in container bits [7:0]
+udp.srcPort[7:0] in container bits [7:0]
 
 </title></rect>
-<rect x="189" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 4
+<rect x="189" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 4
   Assigned to Ingress
   Container Bit Width: 8
   Container Address: 66
 
-ethernet.srcAddr[39:32] in container bits [7:0]
+ethernet.dstAddr[47:40] in container bits [7:0]
 
 </title></rect>
-<rect x="189" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkred""><title>PHV Group: 4
+<rect x="189" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 4
   Assigned to Ingress
   Container Bit Width: 8
   Container Address: 67
 
-POV.POV[39:32] in container bits [7:0]
+ethernet.srcAddr[39:32] in container bits [7:0]
 
 </title></rect>
-<rect x="189" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:beige""><title>PHV Group: 4
+<rect x="189" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkred""><title>PHV Group: 4
   Assigned to Ingress
   Container Bit Width: 8
   Container Address: 68
 
-ig_intr_md_for_tm.drop_ctl[2:0] in container bits [7:5]
+POV.POV[39:32] in container bits [7:0]
 
 </title></rect>
-<rect x="189" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 4
-  Unassigned
+<rect x="189" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:beige""><title>PHV Group: 4
+  Assigned to Ingress
   Container Bit Width: 8
   Container Address: 69
 
+ig_intr_md_for_tm.drop_ctl[2:0] in container bits [7:5]
 
 </title></rect>
 <rect x="189" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 4
@@ -22000,24 +22032,25 @@
   Container Bit Width: 16
   Container Address: 132
 
-ethernet.dstAddr[7:0] in container bits [15:8]
-ethernet.srcAddr[47:40] in container bits [7:0]
+tcp.srcPort[7:0] in container bits [15:8]
+tcp.dstPort[15:8] in container bits [7:0]
 
 </title></rect>
-<rect x="369" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 8
+<rect x="369" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 8
   Assigned to Ingress
   Container Bit Width: 16
   Container Address: 133
 
-ethernet.etherType[15:0] in container bits [15:0]
+ethernet.dstAddr[7:0] in container bits [15:8]
+ethernet.srcAddr[47:40] in container bits [7:0]
 
 </title></rect>
-<rect x="369" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:goldenrod""><title>PHV Group: 8
+<rect x="369" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 8
   Assigned to Ingress
   Container Bit Width: 16
   Container Address: 134
 
-ecmp_metadata.group_id[15:0] in container bits [15:0]
+ethernet.etherType[15:0] in container bits [15:0]
 
 </title></rect>
 <rect x="369" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:goldenrod""><title>PHV Group: 8
@@ -22025,14 +22058,15 @@
   Container Bit Width: 16
   Container Address: 135
 
-ecmp_metadata.selector[15:0] in container bits [15:0]
+ecmp_metadata.group_id[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="387" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 8
-  Unassigned
+<rect x="387" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:goldenrod""><title>PHV Group: 8
+  Assigned to Ingress
   Container Bit Width: 16
   Container Address: 136
 
+ecmp_metadata.selector[15:0] in container bits [15:0]
 
 </title></rect>
 <rect x="387" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 8
@@ -22664,7 +22698,7 @@
 ipv4.ttl[7:0] in container bits [7:0]
 
 </title></rect>
-<rect x="729" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 16
+<rect x="729" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 16
   Assigned to Ingress
   Container Bit Width: 32
   Container Address: 257
@@ -22674,10 +22708,12 @@
 tcp.res[2:0] in container bits [27:25]
 tcp.ecn[2:0] in container bits [24:22]
 tcp.ctrl[5:0] in container bits [21:16]
+udp.length_[15:0] in container bits [31:16]
 tcp.window[15:0] in container bits [15:0]
+udp.checksum[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="729" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 16
+<rect x="729" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 16
   Assigned to Ingress
   Container Bit Width: 32
   Container Address: 258
@@ -22695,42 +22731,10 @@
 
 
 </title></rect>
-<rect x="729" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 16
-  Unassigned
-  Container Bit Width: 32
-  Container Address: 260
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="729" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 16
-  Unassigned
-  Container Bit Width: 32
-  Container Address: 261
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="729" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 16
-  Unassigned
-  Container Bit Width: 32
-  Container Address: 262
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="729" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 16
-  Unassigned
-  Container Bit Width: 32
-  Container Address: 263
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="747" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 16
+<rect x="729" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 16
   Assigned to Egress
   Container Bit Width: 32
-  Container Address: 264
+  Container Address: 260
   Tag-Along Space
 
 ipv4.ttl[7:0] in container bits [31:24]
@@ -22738,28 +22742,28 @@
 ipv4.hdrChecksum[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="747" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 16
+<rect x="729" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 16
   Assigned to Egress
   Container Bit Width: 32
-  Container Address: 265
+  Container Address: 261
   Tag-Along Space
 
 ipv4.srcAddr[31:0] in container bits [31:0]
 
 </title></rect>
-<rect x="747" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 16
+<rect x="729" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 16
   Assigned to Egress
   Container Bit Width: 32
-  Container Address: 266
+  Container Address: 262
   Tag-Along Space
 
 ipv4.dstAddr[31:0] in container bits [31:0]
 
 </title></rect>
-<rect x="747" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 16
+<rect x="729" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 16
   Assigned to Egress
   Container Bit Width: 32
-  Container Address: 267
+  Container Address: 263
   Tag-Along Space
 
 udp.length_[15:0] in container bits [31:16]
@@ -22767,10 +22771,10 @@
 udp.checksum[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="747" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 16
+<rect x="747" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 16
   Assigned to Egress
   Container Bit Width: 32
-  Container Address: 268
+  Container Address: 264
   Tag-Along Space
 
 tcp.dataOffset[3:0] in container bits [31:28]
@@ -22780,32 +22784,64 @@
 tcp.window[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="747" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 16
+<rect x="747" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 16
   Assigned to Egress
   Container Bit Width: 32
-  Container Address: 269
+  Container Address: 265
   Tag-Along Space
 
 tcp.checksum[15:0] in container bits [31:16]
 tcp.urgentPtr[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="747" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 16
+<rect x="747" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 16
   Assigned to Egress
   Container Bit Width: 32
-  Container Address: 270
+  Container Address: 266
   Tag-Along Space
 
 ethernet.dstAddr[39:8] in container bits [31:0]
 
 </title></rect>
-<rect x="747" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 16
+<rect x="747" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 16
   Assigned to Egress
   Container Bit Width: 32
+  Container Address: 267
+  Tag-Along Space
+
+ethernet.srcAddr[31:0] in container bits [31:0]
+
+</title></rect>
+<rect x="747" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 16
+  Unassigned
+  Container Bit Width: 32
+  Container Address: 268
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="747" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 16
+  Unassigned
+  Container Bit Width: 32
+  Container Address: 269
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="747" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 16
+  Unassigned
+  Container Bit Width: 32
+  Container Address: 270
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="747" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 16
+  Unassigned
+  Container Bit Width: 32
   Container Address: 271
   Tag-Along Space
 
-ethernet.srcAddr[31:0] in container bits [31:0]
 
 </title></rect>
 <text x="740" y="178" textLength="16" lengthAdjust="spacingAndGlyphs" textHeight="16" heightAdjust="spacingAndGlyphs" style="fill:black;">32</text>
@@ -22948,123 +22984,119 @@
 ipv4.ihl[3:0] in container bits [3:0]
 
 </title></rect>
-<rect x="819" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 18
+<rect x="819" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 18
   Assigned to Ingress
   Container Bit Width: 8
   Container Address: 289
   Tag-Along Space
 
-tcp.srcPort[15:8] in container bits [7:0]
-udp.length_[15:8] in container bits [7:0]
+tcp.seqNo[7:0] in container bits [7:0]
+udp.srcPort[15:8] in container bits [7:0]
 
 </title></rect>
-<rect x="819" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 18
-  Assigned to Ingress
+<rect x="819" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
+  Unassigned
   Container Bit Width: 8
   Container Address: 290
   Tag-Along Space
 
-tcp.srcPort[7:0] in container bits [7:0]
-udp.length_[7:0] in container bits [7:0]
 
 </title></rect>
-<rect x="819" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 18
-  Assigned to Ingress
+<rect x="819" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
+  Unassigned
   Container Bit Width: 8
   Container Address: 291
   Tag-Along Space
 
-tcp.dstPort[15:8] in container bits [7:0]
 
 </title></rect>
-<rect x="819" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 18
-  Assigned to Ingress
-  Container Bit Width: 8
-  Container Address: 292
-  Tag-Along Space
-
-tcp.dstPort[7:0] in container bits [7:0]
-
-</title></rect>
-<rect x="819" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
-  Unassigned
-  Container Bit Width: 8
-  Container Address: 293
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="819" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
-  Unassigned
-  Container Bit Width: 8
-  Container Address: 294
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="819" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
-  Unassigned
-  Container Bit Width: 8
-  Container Address: 295
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="837" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 18
+<rect x="819" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 18
   Assigned to Egress
   Container Bit Width: 8
-  Container Address: 296
+  Container Address: 292
   Tag-Along Space
 
 ipv4.version[3:0] in container bits [7:4]
 ipv4.ihl[3:0] in container bits [3:0]
 
 </title></rect>
-<rect x="837" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 18
+<rect x="819" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 18
   Assigned to Egress
   Container Bit Width: 8
-  Container Address: 297
+  Container Address: 293
   Tag-Along Space
 
 ipv4.diffserv[7:0] in container bits [7:0]
 
 </title></rect>
-<rect x="837" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 18
+<rect x="819" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 18
   Assigned to Egress
   Container Bit Width: 8
-  Container Address: 298
+  Container Address: 294
   Tag-Along Space
 
 tcp.srcPort[15:8] in container bits [7:0]
 udp.srcPort[15:8] in container bits [7:0]
 
 </title></rect>
-<rect x="837" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 18
+<rect x="819" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 18
   Assigned to Egress
   Container Bit Width: 8
-  Container Address: 299
+  Container Address: 295
   Tag-Along Space
 
 tcp.srcPort[7:0] in container bits [7:0]
 udp.srcPort[7:0] in container bits [7:0]
 
 </title></rect>
-<rect x="837" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 18
+<rect x="837" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 18
   Assigned to Egress
   Container Bit Width: 8
-  Container Address: 300
+  Container Address: 296
   Tag-Along Space
 
 ethernet.dstAddr[47:40] in container bits [7:0]
 
 </title></rect>
-<rect x="837" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 18
+<rect x="837" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 18
   Assigned to Egress
   Container Bit Width: 8
+  Container Address: 297
+  Tag-Along Space
+
+ethernet.srcAddr[39:32] in container bits [7:0]
+
+</title></rect>
+<rect x="837" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
+  Unassigned
+  Container Bit Width: 8
+  Container Address: 298
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="837" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
+  Unassigned
+  Container Bit Width: 8
+  Container Address: 299
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="837" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
+  Unassigned
+  Container Bit Width: 8
+  Container Address: 300
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="837" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
+  Unassigned
+  Container Bit Width: 8
   Container Address: 301
   Tag-Along Space
 
-ethernet.srcAddr[39:32] in container bits [7:0]
 
 </title></rect>
 <rect x="837" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
@@ -23233,171 +23265,120 @@
 ipv4.identification[15:8] in container bits [7:0]
 
 </title></rect>
-<rect x="909" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 20
+<rect x="909" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 20
   Assigned to Ingress
   Container Bit Width: 16
   Container Address: 322
   Tag-Along Space
 
-tcp.seqNo[31:16] in container bits [15:0]
-udp.checksum[15:0] in container bits [15:0]
+tcp.ackNo[31:16] in container bits [15:0]
+udp.dstPort[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="909" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 20
+<rect x="909" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 20
   Assigned to Ingress
   Container Bit Width: 16
   Container Address: 323
   Tag-Along Space
 
-tcp.seqNo[15:0] in container bits [15:0]
+tcp.ackNo[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="909" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 20
-  Assigned to Ingress
+<rect x="909" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 20
+  Unassigned
   Container Bit Width: 16
   Container Address: 324
   Tag-Along Space
 
-tcp.ackNo[31:16] in container bits [15:0]
 
 </title></rect>
-<rect x="909" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 20
-  Assigned to Ingress
+<rect x="909" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 20
+  Unassigned
   Container Bit Width: 16
   Container Address: 325
   Tag-Along Space
 
-tcp.ackNo[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="909" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 20
-  Unassigned
-  Container Bit Width: 16
-  Container Address: 326
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="909" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 20
-  Unassigned
-  Container Bit Width: 16
-  Container Address: 327
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="927" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 20
-  Unassigned
-  Container Bit Width: 16
-  Container Address: 328
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="927" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 20
-  Unassigned
-  Container Bit Width: 16
-  Container Address: 329
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="927" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 20
-  Unassigned
-  Container Bit Width: 16
-  Container Address: 330
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="927" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 20
-  Unassigned
-  Container Bit Width: 16
-  Container Address: 331
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="927" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 20
+<rect x="909" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 20
   Assigned to Egress
   Container Bit Width: 16
-  Container Address: 332
+  Container Address: 326
   Tag-Along Space
 
 ipv4.totalLen[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="927" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 20
+<rect x="909" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 20
   Assigned to Egress
   Container Bit Width: 16
-  Container Address: 333
+  Container Address: 327
   Tag-Along Space
 
 ipv4.identification[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="927" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 20
+<rect x="927" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 20
   Assigned to Egress
   Container Bit Width: 16
-  Container Address: 334
+  Container Address: 328
   Tag-Along Space
 
 ipv4.flags[2:0] in container bits [15:13]
 ipv4.fragOffset[12:0] in container bits [12:0]
 
 </title></rect>
-<rect x="927" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 20
+<rect x="927" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 20
   Assigned to Egress
   Container Bit Width: 16
-  Container Address: 335
+  Container Address: 329
   Tag-Along Space
 
 tcp.dstPort[15:0] in container bits [15:0]
-
-</title></rect>
-<text x="920" y="178" textLength="16" lengthAdjust="spacingAndGlyphs" textHeight="16" heightAdjust="spacingAndGlyphs" style="fill:black;">16</text>
-<rect x="954" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 21
-  Assigned to Egress
-  Container Bit Width: 16
-  Container Address: 336
-  Tag-Along Space
-
-tcp.seqNo[31:16] in container bits [15:0]
 udp.dstPort[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="954" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 21
+<rect x="927" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 20
   Assigned to Egress
   Container Bit Width: 16
-  Container Address: 337
+  Container Address: 330
+  Tag-Along Space
+
+tcp.seqNo[31:16] in container bits [15:0]
+
+</title></rect>
+<rect x="927" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 20
+  Assigned to Egress
+  Container Bit Width: 16
+  Container Address: 331
   Tag-Along Space
 
 tcp.seqNo[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="954" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 21
+<rect x="927" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 20
   Assigned to Egress
   Container Bit Width: 16
-  Container Address: 338
+  Container Address: 332
   Tag-Along Space
 
 ethernet.dstAddr[7:0] in container bits [15:8]
 ethernet.srcAddr[47:40] in container bits [7:0]
 
 </title></rect>
-<rect x="954" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 21
+<rect x="927" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 20
   Assigned to Egress
   Container Bit Width: 16
-  Container Address: 339
+  Container Address: 333
   Tag-Along Space
 
 ethernet.etherType[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="954" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:gold""><title>PHV Group: 21
+<rect x="927" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:gold""><title>PHV Group: 20
   Assigned to Egress
   Container Bit Width: 16
-  Container Address: 340
+  Container Address: 334
   Tag-Along Space
 
 packet_out_hdr.egress_port[8:0] in container bits [15:7]
@@ -23406,6 +23387,55 @@
 packet_in_hdr._padding[6:0] in container bits [6:0]
 
 </title></rect>
+<rect x="927" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 20
+  Unassigned
+  Container Bit Width: 16
+  Container Address: 335
+  Tag-Along Space
+
+
+</title></rect>
+<text x="920" y="178" textLength="16" lengthAdjust="spacingAndGlyphs" textHeight="16" heightAdjust="spacingAndGlyphs" style="fill:black;">16</text>
+<rect x="954" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 21
+  Unassigned
+  Container Bit Width: 16
+  Container Address: 336
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="954" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 21
+  Unassigned
+  Container Bit Width: 16
+  Container Address: 337
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="954" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 21
+  Unassigned
+  Container Bit Width: 16
+  Container Address: 338
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="954" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 21
+  Unassigned
+  Container Bit Width: 16
+  Container Address: 339
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="954" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 21
+  Unassigned
+  Container Bit Width: 16
+  Container Address: 340
+  Tag-Along Space
+
+
+</title></rect>
 <rect x="954" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 21
   Unassigned
   Container Bit Width: 16
@@ -23659,15 +23689,16 @@
   Container Bit Width: 32
   Container Address: 3
 
-ethernet.dstAddr[39:8] in container bits [31:0]
+tcp.dstPort[7:0] in container bits [31:24]
+tcp.seqNo[31:8] in container bits [23:0]
 
 </title></rect>
-<rect x="9" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 0
+<rect x="9" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 0
   Assigned to Ingress
   Container Bit Width: 32
   Container Address: 4
 
-ethernet.srcAddr[31:0] in container bits [31:0]
+ethernet.dstAddr[39:8] in container bits [31:0]
 
 </title></rect>
 <rect x="9" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 0
@@ -23675,8 +23706,7 @@
   Container Bit Width: 32
   Container Address: 5
 
-udp.srcPort[15:0] in container bits [31:16]
-udp.dstPort[15:0] in container bits [15:0]
+ethernet.srcAddr[31:0] in container bits [31:0]
 
 </title></rect>
 <rect x="9" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 0
@@ -24102,38 +24132,40 @@
   Container Bit Width: 8
   Container Address: 65
 
-ethernet.dstAddr[47:40] in container bits [7:0]
+tcp.srcPort[15:8] in container bits [7:0]
+udp.srcPort[7:0] in container bits [7:0]
 
 </title></rect>
-<rect x="189" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 4
+<rect x="189" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 4
   Assigned to Ingress
   Container Bit Width: 8
   Container Address: 66
 
-ethernet.srcAddr[39:32] in container bits [7:0]
+ethernet.dstAddr[47:40] in container bits [7:0]
 
 </title></rect>
-<rect x="189" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkred""><title>PHV Group: 4
+<rect x="189" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 4
   Assigned to Ingress
   Container Bit Width: 8
   Container Address: 67
 
-POV.POV[39:32] in container bits [7:0]
+ethernet.srcAddr[39:32] in container bits [7:0]
 
 </title></rect>
-<rect x="189" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:beige""><title>PHV Group: 4
+<rect x="189" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkred""><title>PHV Group: 4
   Assigned to Ingress
   Container Bit Width: 8
   Container Address: 68
 
-ig_intr_md_for_tm.drop_ctl[2:0] in container bits [7:5]
+POV.POV[39:32] in container bits [7:0]
 
 </title></rect>
-<rect x="189" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 4
-  Unassigned
+<rect x="189" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:beige""><title>PHV Group: 4
+  Assigned to Ingress
   Container Bit Width: 8
   Container Address: 69
 
+ig_intr_md_for_tm.drop_ctl[2:0] in container bits [7:5]
 
 </title></rect>
 <rect x="189" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 4
@@ -24593,24 +24625,25 @@
   Container Bit Width: 16
   Container Address: 132
 
-ethernet.dstAddr[7:0] in container bits [15:8]
-ethernet.srcAddr[47:40] in container bits [7:0]
+tcp.srcPort[7:0] in container bits [15:8]
+tcp.dstPort[15:8] in container bits [7:0]
 
 </title></rect>
-<rect x="369" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 8
+<rect x="369" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 8
   Assigned to Ingress
   Container Bit Width: 16
   Container Address: 133
 
-ethernet.etherType[15:0] in container bits [15:0]
+ethernet.dstAddr[7:0] in container bits [15:8]
+ethernet.srcAddr[47:40] in container bits [7:0]
 
 </title></rect>
-<rect x="369" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:goldenrod""><title>PHV Group: 8
+<rect x="369" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 8
   Assigned to Ingress
   Container Bit Width: 16
   Container Address: 134
 
-ecmp_metadata.group_id[15:0] in container bits [15:0]
+ethernet.etherType[15:0] in container bits [15:0]
 
 </title></rect>
 <rect x="369" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:goldenrod""><title>PHV Group: 8
@@ -24618,14 +24651,15 @@
   Container Bit Width: 16
   Container Address: 135
 
-ecmp_metadata.selector[15:0] in container bits [15:0]
+ecmp_metadata.group_id[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="387" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 8
-  Unassigned
+<rect x="387" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:goldenrod""><title>PHV Group: 8
+  Assigned to Ingress
   Container Bit Width: 16
   Container Address: 136
 
+ecmp_metadata.selector[15:0] in container bits [15:0]
 
 </title></rect>
 <rect x="387" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 8
@@ -25257,7 +25291,7 @@
 ipv4.ttl[7:0] in container bits [7:0]
 
 </title></rect>
-<rect x="729" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 16
+<rect x="729" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 16
   Assigned to Ingress
   Container Bit Width: 32
   Container Address: 257
@@ -25267,10 +25301,12 @@
 tcp.res[2:0] in container bits [27:25]
 tcp.ecn[2:0] in container bits [24:22]
 tcp.ctrl[5:0] in container bits [21:16]
+udp.length_[15:0] in container bits [31:16]
 tcp.window[15:0] in container bits [15:0]
+udp.checksum[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="729" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 16
+<rect x="729" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 16
   Assigned to Ingress
   Container Bit Width: 32
   Container Address: 258
@@ -25288,42 +25324,10 @@
 
 
 </title></rect>
-<rect x="729" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 16
-  Unassigned
-  Container Bit Width: 32
-  Container Address: 260
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="729" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 16
-  Unassigned
-  Container Bit Width: 32
-  Container Address: 261
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="729" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 16
-  Unassigned
-  Container Bit Width: 32
-  Container Address: 262
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="729" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 16
-  Unassigned
-  Container Bit Width: 32
-  Container Address: 263
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="747" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 16
+<rect x="729" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 16
   Assigned to Egress
   Container Bit Width: 32
-  Container Address: 264
+  Container Address: 260
   Tag-Along Space
 
 ipv4.ttl[7:0] in container bits [31:24]
@@ -25331,28 +25335,28 @@
 ipv4.hdrChecksum[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="747" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 16
+<rect x="729" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 16
   Assigned to Egress
   Container Bit Width: 32
-  Container Address: 265
+  Container Address: 261
   Tag-Along Space
 
 ipv4.srcAddr[31:0] in container bits [31:0]
 
 </title></rect>
-<rect x="747" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 16
+<rect x="729" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 16
   Assigned to Egress
   Container Bit Width: 32
-  Container Address: 266
+  Container Address: 262
   Tag-Along Space
 
 ipv4.dstAddr[31:0] in container bits [31:0]
 
 </title></rect>
-<rect x="747" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 16
+<rect x="729" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 16
   Assigned to Egress
   Container Bit Width: 32
-  Container Address: 267
+  Container Address: 263
   Tag-Along Space
 
 udp.length_[15:0] in container bits [31:16]
@@ -25360,10 +25364,10 @@
 udp.checksum[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="747" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 16
+<rect x="747" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 16
   Assigned to Egress
   Container Bit Width: 32
-  Container Address: 268
+  Container Address: 264
   Tag-Along Space
 
 tcp.dataOffset[3:0] in container bits [31:28]
@@ -25373,32 +25377,64 @@
 tcp.window[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="747" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 16
+<rect x="747" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 16
   Assigned to Egress
   Container Bit Width: 32
-  Container Address: 269
+  Container Address: 265
   Tag-Along Space
 
 tcp.checksum[15:0] in container bits [31:16]
 tcp.urgentPtr[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="747" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 16
+<rect x="747" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 16
   Assigned to Egress
   Container Bit Width: 32
-  Container Address: 270
+  Container Address: 266
   Tag-Along Space
 
 ethernet.dstAddr[39:8] in container bits [31:0]
 
 </title></rect>
-<rect x="747" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 16
+<rect x="747" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 16
   Assigned to Egress
   Container Bit Width: 32
+  Container Address: 267
+  Tag-Along Space
+
+ethernet.srcAddr[31:0] in container bits [31:0]
+
+</title></rect>
+<rect x="747" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 16
+  Unassigned
+  Container Bit Width: 32
+  Container Address: 268
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="747" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 16
+  Unassigned
+  Container Bit Width: 32
+  Container Address: 269
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="747" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 16
+  Unassigned
+  Container Bit Width: 32
+  Container Address: 270
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="747" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 16
+  Unassigned
+  Container Bit Width: 32
   Container Address: 271
   Tag-Along Space
 
-ethernet.srcAddr[31:0] in container bits [31:0]
 
 </title></rect>
 <text x="740" y="178" textLength="16" lengthAdjust="spacingAndGlyphs" textHeight="16" heightAdjust="spacingAndGlyphs" style="fill:black;">32</text>
@@ -25541,123 +25577,119 @@
 ipv4.ihl[3:0] in container bits [3:0]
 
 </title></rect>
-<rect x="819" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 18
+<rect x="819" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 18
   Assigned to Ingress
   Container Bit Width: 8
   Container Address: 289
   Tag-Along Space
 
-tcp.srcPort[15:8] in container bits [7:0]
-udp.length_[15:8] in container bits [7:0]
+tcp.seqNo[7:0] in container bits [7:0]
+udp.srcPort[15:8] in container bits [7:0]
 
 </title></rect>
-<rect x="819" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 18
-  Assigned to Ingress
+<rect x="819" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
+  Unassigned
   Container Bit Width: 8
   Container Address: 290
   Tag-Along Space
 
-tcp.srcPort[7:0] in container bits [7:0]
-udp.length_[7:0] in container bits [7:0]
 
 </title></rect>
-<rect x="819" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 18
-  Assigned to Ingress
+<rect x="819" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
+  Unassigned
   Container Bit Width: 8
   Container Address: 291
   Tag-Along Space
 
-tcp.dstPort[15:8] in container bits [7:0]
 
 </title></rect>
-<rect x="819" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 18
-  Assigned to Ingress
-  Container Bit Width: 8
-  Container Address: 292
-  Tag-Along Space
-
-tcp.dstPort[7:0] in container bits [7:0]
-
-</title></rect>
-<rect x="819" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
-  Unassigned
-  Container Bit Width: 8
-  Container Address: 293
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="819" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
-  Unassigned
-  Container Bit Width: 8
-  Container Address: 294
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="819" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
-  Unassigned
-  Container Bit Width: 8
-  Container Address: 295
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="837" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 18
+<rect x="819" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 18
   Assigned to Egress
   Container Bit Width: 8
-  Container Address: 296
+  Container Address: 292
   Tag-Along Space
 
 ipv4.version[3:0] in container bits [7:4]
 ipv4.ihl[3:0] in container bits [3:0]
 
 </title></rect>
-<rect x="837" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 18
+<rect x="819" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 18
   Assigned to Egress
   Container Bit Width: 8
-  Container Address: 297
+  Container Address: 293
   Tag-Along Space
 
 ipv4.diffserv[7:0] in container bits [7:0]
 
 </title></rect>
-<rect x="837" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 18
+<rect x="819" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 18
   Assigned to Egress
   Container Bit Width: 8
-  Container Address: 298
+  Container Address: 294
   Tag-Along Space
 
 tcp.srcPort[15:8] in container bits [7:0]
 udp.srcPort[15:8] in container bits [7:0]
 
 </title></rect>
-<rect x="837" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 18
+<rect x="819" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 18
   Assigned to Egress
   Container Bit Width: 8
-  Container Address: 299
+  Container Address: 295
   Tag-Along Space
 
 tcp.srcPort[7:0] in container bits [7:0]
 udp.srcPort[7:0] in container bits [7:0]
 
 </title></rect>
-<rect x="837" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 18
+<rect x="837" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 18
   Assigned to Egress
   Container Bit Width: 8
-  Container Address: 300
+  Container Address: 296
   Tag-Along Space
 
 ethernet.dstAddr[47:40] in container bits [7:0]
 
 </title></rect>
-<rect x="837" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 18
+<rect x="837" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 18
   Assigned to Egress
   Container Bit Width: 8
+  Container Address: 297
+  Tag-Along Space
+
+ethernet.srcAddr[39:32] in container bits [7:0]
+
+</title></rect>
+<rect x="837" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
+  Unassigned
+  Container Bit Width: 8
+  Container Address: 298
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="837" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
+  Unassigned
+  Container Bit Width: 8
+  Container Address: 299
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="837" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
+  Unassigned
+  Container Bit Width: 8
+  Container Address: 300
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="837" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
+  Unassigned
+  Container Bit Width: 8
   Container Address: 301
   Tag-Along Space
 
-ethernet.srcAddr[39:32] in container bits [7:0]
 
 </title></rect>
 <rect x="837" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
@@ -25826,171 +25858,120 @@
 ipv4.identification[15:8] in container bits [7:0]
 
 </title></rect>
-<rect x="909" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 20
+<rect x="909" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 20
   Assigned to Ingress
   Container Bit Width: 16
   Container Address: 322
   Tag-Along Space
 
-tcp.seqNo[31:16] in container bits [15:0]
-udp.checksum[15:0] in container bits [15:0]
+tcp.ackNo[31:16] in container bits [15:0]
+udp.dstPort[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="909" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 20
+<rect x="909" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 20
   Assigned to Ingress
   Container Bit Width: 16
   Container Address: 323
   Tag-Along Space
 
-tcp.seqNo[15:0] in container bits [15:0]
+tcp.ackNo[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="909" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 20
-  Assigned to Ingress
+<rect x="909" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 20
+  Unassigned
   Container Bit Width: 16
   Container Address: 324
   Tag-Along Space
 
-tcp.ackNo[31:16] in container bits [15:0]
 
 </title></rect>
-<rect x="909" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 20
-  Assigned to Ingress
+<rect x="909" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 20
+  Unassigned
   Container Bit Width: 16
   Container Address: 325
   Tag-Along Space
 
-tcp.ackNo[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="909" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 20
-  Unassigned
-  Container Bit Width: 16
-  Container Address: 326
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="909" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 20
-  Unassigned
-  Container Bit Width: 16
-  Container Address: 327
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="927" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 20
-  Unassigned
-  Container Bit Width: 16
-  Container Address: 328
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="927" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 20
-  Unassigned
-  Container Bit Width: 16
-  Container Address: 329
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="927" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 20
-  Unassigned
-  Container Bit Width: 16
-  Container Address: 330
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="927" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 20
-  Unassigned
-  Container Bit Width: 16
-  Container Address: 331
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="927" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 20
+<rect x="909" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 20
   Assigned to Egress
   Container Bit Width: 16
-  Container Address: 332
+  Container Address: 326
   Tag-Along Space
 
 ipv4.totalLen[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="927" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 20
+<rect x="909" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 20
   Assigned to Egress
   Container Bit Width: 16
-  Container Address: 333
+  Container Address: 327
   Tag-Along Space
 
 ipv4.identification[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="927" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 20
+<rect x="927" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 20
   Assigned to Egress
   Container Bit Width: 16
-  Container Address: 334
+  Container Address: 328
   Tag-Along Space
 
 ipv4.flags[2:0] in container bits [15:13]
 ipv4.fragOffset[12:0] in container bits [12:0]
 
 </title></rect>
-<rect x="927" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 20
+<rect x="927" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 20
   Assigned to Egress
   Container Bit Width: 16
-  Container Address: 335
+  Container Address: 329
   Tag-Along Space
 
 tcp.dstPort[15:0] in container bits [15:0]
-
-</title></rect>
-<text x="920" y="178" textLength="16" lengthAdjust="spacingAndGlyphs" textHeight="16" heightAdjust="spacingAndGlyphs" style="fill:black;">16</text>
-<rect x="954" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 21
-  Assigned to Egress
-  Container Bit Width: 16
-  Container Address: 336
-  Tag-Along Space
-
-tcp.seqNo[31:16] in container bits [15:0]
 udp.dstPort[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="954" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 21
+<rect x="927" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 20
   Assigned to Egress
   Container Bit Width: 16
-  Container Address: 337
+  Container Address: 330
+  Tag-Along Space
+
+tcp.seqNo[31:16] in container bits [15:0]
+
+</title></rect>
+<rect x="927" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 20
+  Assigned to Egress
+  Container Bit Width: 16
+  Container Address: 331
   Tag-Along Space
 
 tcp.seqNo[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="954" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 21
+<rect x="927" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 20
   Assigned to Egress
   Container Bit Width: 16
-  Container Address: 338
+  Container Address: 332
   Tag-Along Space
 
 ethernet.dstAddr[7:0] in container bits [15:8]
 ethernet.srcAddr[47:40] in container bits [7:0]
 
 </title></rect>
-<rect x="954" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 21
+<rect x="927" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 20
   Assigned to Egress
   Container Bit Width: 16
-  Container Address: 339
+  Container Address: 333
   Tag-Along Space
 
 ethernet.etherType[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="954" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:gold""><title>PHV Group: 21
+<rect x="927" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:gold""><title>PHV Group: 20
   Assigned to Egress
   Container Bit Width: 16
-  Container Address: 340
+  Container Address: 334
   Tag-Along Space
 
 packet_out_hdr.egress_port[8:0] in container bits [15:7]
@@ -25999,6 +25980,55 @@
 packet_in_hdr._padding[6:0] in container bits [6:0]
 
 </title></rect>
+<rect x="927" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 20
+  Unassigned
+  Container Bit Width: 16
+  Container Address: 335
+  Tag-Along Space
+
+
+</title></rect>
+<text x="920" y="178" textLength="16" lengthAdjust="spacingAndGlyphs" textHeight="16" heightAdjust="spacingAndGlyphs" style="fill:black;">16</text>
+<rect x="954" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 21
+  Unassigned
+  Container Bit Width: 16
+  Container Address: 336
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="954" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 21
+  Unassigned
+  Container Bit Width: 16
+  Container Address: 337
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="954" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 21
+  Unassigned
+  Container Bit Width: 16
+  Container Address: 338
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="954" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 21
+  Unassigned
+  Container Bit Width: 16
+  Container Address: 339
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="954" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 21
+  Unassigned
+  Container Bit Width: 16
+  Container Address: 340
+  Tag-Along Space
+
+
+</title></rect>
 <rect x="954" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 21
   Unassigned
   Container Bit Width: 16
@@ -26252,15 +26282,16 @@
   Container Bit Width: 32
   Container Address: 3
 
-ethernet.dstAddr[39:8] in container bits [31:0]
+tcp.dstPort[7:0] in container bits [31:24]
+tcp.seqNo[31:8] in container bits [23:0]
 
 </title></rect>
-<rect x="9" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 0
+<rect x="9" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 0
   Assigned to Ingress
   Container Bit Width: 32
   Container Address: 4
 
-ethernet.srcAddr[31:0] in container bits [31:0]
+ethernet.dstAddr[39:8] in container bits [31:0]
 
 </title></rect>
 <rect x="9" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 0
@@ -26268,8 +26299,7 @@
   Container Bit Width: 32
   Container Address: 5
 
-udp.srcPort[15:0] in container bits [31:16]
-udp.dstPort[15:0] in container bits [15:0]
+ethernet.srcAddr[31:0] in container bits [31:0]
 
 </title></rect>
 <rect x="9" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 0
@@ -26695,38 +26725,40 @@
   Container Bit Width: 8
   Container Address: 65
 
-ethernet.dstAddr[47:40] in container bits [7:0]
+tcp.srcPort[15:8] in container bits [7:0]
+udp.srcPort[7:0] in container bits [7:0]
 
 </title></rect>
-<rect x="189" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 4
+<rect x="189" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 4
   Assigned to Ingress
   Container Bit Width: 8
   Container Address: 66
 
-ethernet.srcAddr[39:32] in container bits [7:0]
+ethernet.dstAddr[47:40] in container bits [7:0]
 
 </title></rect>
-<rect x="189" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkred""><title>PHV Group: 4
+<rect x="189" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 4
   Assigned to Ingress
   Container Bit Width: 8
   Container Address: 67
 
-POV.POV[39:32] in container bits [7:0]
+ethernet.srcAddr[39:32] in container bits [7:0]
 
 </title></rect>
-<rect x="189" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:beige""><title>PHV Group: 4
+<rect x="189" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkred""><title>PHV Group: 4
   Assigned to Ingress
   Container Bit Width: 8
   Container Address: 68
 
-ig_intr_md_for_tm.drop_ctl[2:0] in container bits [7:5]
+POV.POV[39:32] in container bits [7:0]
 
 </title></rect>
-<rect x="189" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 4
-  Unassigned
+<rect x="189" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:beige""><title>PHV Group: 4
+  Assigned to Ingress
   Container Bit Width: 8
   Container Address: 69
 
+ig_intr_md_for_tm.drop_ctl[2:0] in container bits [7:5]
 
 </title></rect>
 <rect x="189" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 4
@@ -27186,24 +27218,25 @@
   Container Bit Width: 16
   Container Address: 132
 
-ethernet.dstAddr[7:0] in container bits [15:8]
-ethernet.srcAddr[47:40] in container bits [7:0]
+tcp.srcPort[7:0] in container bits [15:8]
+tcp.dstPort[15:8] in container bits [7:0]
 
 </title></rect>
-<rect x="369" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 8
+<rect x="369" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 8
   Assigned to Ingress
   Container Bit Width: 16
   Container Address: 133
 
-ethernet.etherType[15:0] in container bits [15:0]
+ethernet.dstAddr[7:0] in container bits [15:8]
+ethernet.srcAddr[47:40] in container bits [7:0]
 
 </title></rect>
-<rect x="369" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:goldenrod""><title>PHV Group: 8
+<rect x="369" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 8
   Assigned to Ingress
   Container Bit Width: 16
   Container Address: 134
 
-ecmp_metadata.group_id[15:0] in container bits [15:0]
+ethernet.etherType[15:0] in container bits [15:0]
 
 </title></rect>
 <rect x="369" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:goldenrod""><title>PHV Group: 8
@@ -27211,14 +27244,15 @@
   Container Bit Width: 16
   Container Address: 135
 
-ecmp_metadata.selector[15:0] in container bits [15:0]
+ecmp_metadata.group_id[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="387" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 8
-  Unassigned
+<rect x="387" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:goldenrod""><title>PHV Group: 8
+  Assigned to Ingress
   Container Bit Width: 16
   Container Address: 136
 
+ecmp_metadata.selector[15:0] in container bits [15:0]
 
 </title></rect>
 <rect x="387" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 8
@@ -27850,7 +27884,7 @@
 ipv4.ttl[7:0] in container bits [7:0]
 
 </title></rect>
-<rect x="729" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 16
+<rect x="729" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 16
   Assigned to Ingress
   Container Bit Width: 32
   Container Address: 257
@@ -27860,10 +27894,12 @@
 tcp.res[2:0] in container bits [27:25]
 tcp.ecn[2:0] in container bits [24:22]
 tcp.ctrl[5:0] in container bits [21:16]
+udp.length_[15:0] in container bits [31:16]
 tcp.window[15:0] in container bits [15:0]
+udp.checksum[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="729" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 16
+<rect x="729" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 16
   Assigned to Ingress
   Container Bit Width: 32
   Container Address: 258
@@ -27881,42 +27917,10 @@
 
 
 </title></rect>
-<rect x="729" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 16
-  Unassigned
-  Container Bit Width: 32
-  Container Address: 260
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="729" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 16
-  Unassigned
-  Container Bit Width: 32
-  Container Address: 261
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="729" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 16
-  Unassigned
-  Container Bit Width: 32
-  Container Address: 262
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="729" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 16
-  Unassigned
-  Container Bit Width: 32
-  Container Address: 263
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="747" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 16
+<rect x="729" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 16
   Assigned to Egress
   Container Bit Width: 32
-  Container Address: 264
+  Container Address: 260
   Tag-Along Space
 
 ipv4.ttl[7:0] in container bits [31:24]
@@ -27924,28 +27928,28 @@
 ipv4.hdrChecksum[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="747" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 16
+<rect x="729" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 16
   Assigned to Egress
   Container Bit Width: 32
-  Container Address: 265
+  Container Address: 261
   Tag-Along Space
 
 ipv4.srcAddr[31:0] in container bits [31:0]
 
 </title></rect>
-<rect x="747" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 16
+<rect x="729" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 16
   Assigned to Egress
   Container Bit Width: 32
-  Container Address: 266
+  Container Address: 262
   Tag-Along Space
 
 ipv4.dstAddr[31:0] in container bits [31:0]
 
 </title></rect>
-<rect x="747" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 16
+<rect x="729" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 16
   Assigned to Egress
   Container Bit Width: 32
-  Container Address: 267
+  Container Address: 263
   Tag-Along Space
 
 udp.length_[15:0] in container bits [31:16]
@@ -27953,10 +27957,10 @@
 udp.checksum[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="747" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 16
+<rect x="747" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 16
   Assigned to Egress
   Container Bit Width: 32
-  Container Address: 268
+  Container Address: 264
   Tag-Along Space
 
 tcp.dataOffset[3:0] in container bits [31:28]
@@ -27966,32 +27970,64 @@
 tcp.window[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="747" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 16
+<rect x="747" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 16
   Assigned to Egress
   Container Bit Width: 32
-  Container Address: 269
+  Container Address: 265
   Tag-Along Space
 
 tcp.checksum[15:0] in container bits [31:16]
 tcp.urgentPtr[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="747" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 16
+<rect x="747" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 16
   Assigned to Egress
   Container Bit Width: 32
-  Container Address: 270
+  Container Address: 266
   Tag-Along Space
 
 ethernet.dstAddr[39:8] in container bits [31:0]
 
 </title></rect>
-<rect x="747" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 16
+<rect x="747" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 16
   Assigned to Egress
   Container Bit Width: 32
+  Container Address: 267
+  Tag-Along Space
+
+ethernet.srcAddr[31:0] in container bits [31:0]
+
+</title></rect>
+<rect x="747" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 16
+  Unassigned
+  Container Bit Width: 32
+  Container Address: 268
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="747" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 16
+  Unassigned
+  Container Bit Width: 32
+  Container Address: 269
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="747" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 16
+  Unassigned
+  Container Bit Width: 32
+  Container Address: 270
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="747" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 16
+  Unassigned
+  Container Bit Width: 32
   Container Address: 271
   Tag-Along Space
 
-ethernet.srcAddr[31:0] in container bits [31:0]
 
 </title></rect>
 <text x="740" y="178" textLength="16" lengthAdjust="spacingAndGlyphs" textHeight="16" heightAdjust="spacingAndGlyphs" style="fill:black;">32</text>
@@ -28134,123 +28170,119 @@
 ipv4.ihl[3:0] in container bits [3:0]
 
 </title></rect>
-<rect x="819" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 18
+<rect x="819" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 18
   Assigned to Ingress
   Container Bit Width: 8
   Container Address: 289
   Tag-Along Space
 
-tcp.srcPort[15:8] in container bits [7:0]
-udp.length_[15:8] in container bits [7:0]
+tcp.seqNo[7:0] in container bits [7:0]
+udp.srcPort[15:8] in container bits [7:0]
 
 </title></rect>
-<rect x="819" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 18
-  Assigned to Ingress
+<rect x="819" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
+  Unassigned
   Container Bit Width: 8
   Container Address: 290
   Tag-Along Space
 
-tcp.srcPort[7:0] in container bits [7:0]
-udp.length_[7:0] in container bits [7:0]
 
 </title></rect>
-<rect x="819" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 18
-  Assigned to Ingress
+<rect x="819" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
+  Unassigned
   Container Bit Width: 8
   Container Address: 291
   Tag-Along Space
 
-tcp.dstPort[15:8] in container bits [7:0]
 
 </title></rect>
-<rect x="819" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 18
-  Assigned to Ingress
-  Container Bit Width: 8
-  Container Address: 292
-  Tag-Along Space
-
-tcp.dstPort[7:0] in container bits [7:0]
-
-</title></rect>
-<rect x="819" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
-  Unassigned
-  Container Bit Width: 8
-  Container Address: 293
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="819" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
-  Unassigned
-  Container Bit Width: 8
-  Container Address: 294
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="819" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
-  Unassigned
-  Container Bit Width: 8
-  Container Address: 295
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="837" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 18
+<rect x="819" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 18
   Assigned to Egress
   Container Bit Width: 8
-  Container Address: 296
+  Container Address: 292
   Tag-Along Space
 
 ipv4.version[3:0] in container bits [7:4]
 ipv4.ihl[3:0] in container bits [3:0]
 
 </title></rect>
-<rect x="837" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 18
+<rect x="819" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 18
   Assigned to Egress
   Container Bit Width: 8
-  Container Address: 297
+  Container Address: 293
   Tag-Along Space
 
 ipv4.diffserv[7:0] in container bits [7:0]
 
 </title></rect>
-<rect x="837" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 18
+<rect x="819" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 18
   Assigned to Egress
   Container Bit Width: 8
-  Container Address: 298
+  Container Address: 294
   Tag-Along Space
 
 tcp.srcPort[15:8] in container bits [7:0]
 udp.srcPort[15:8] in container bits [7:0]
 
 </title></rect>
-<rect x="837" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 18
+<rect x="819" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 18
   Assigned to Egress
   Container Bit Width: 8
-  Container Address: 299
+  Container Address: 295
   Tag-Along Space
 
 tcp.srcPort[7:0] in container bits [7:0]
 udp.srcPort[7:0] in container bits [7:0]
 
 </title></rect>
-<rect x="837" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 18
+<rect x="837" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 18
   Assigned to Egress
   Container Bit Width: 8
-  Container Address: 300
+  Container Address: 296
   Tag-Along Space
 
 ethernet.dstAddr[47:40] in container bits [7:0]
 
 </title></rect>
-<rect x="837" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 18
+<rect x="837" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 18
   Assigned to Egress
   Container Bit Width: 8
+  Container Address: 297
+  Tag-Along Space
+
+ethernet.srcAddr[39:32] in container bits [7:0]
+
+</title></rect>
+<rect x="837" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
+  Unassigned
+  Container Bit Width: 8
+  Container Address: 298
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="837" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
+  Unassigned
+  Container Bit Width: 8
+  Container Address: 299
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="837" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
+  Unassigned
+  Container Bit Width: 8
+  Container Address: 300
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="837" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
+  Unassigned
+  Container Bit Width: 8
   Container Address: 301
   Tag-Along Space
 
-ethernet.srcAddr[39:32] in container bits [7:0]
 
 </title></rect>
 <rect x="837" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
@@ -28419,171 +28451,120 @@
 ipv4.identification[15:8] in container bits [7:0]
 
 </title></rect>
-<rect x="909" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 20
+<rect x="909" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 20
   Assigned to Ingress
   Container Bit Width: 16
   Container Address: 322
   Tag-Along Space
 
-tcp.seqNo[31:16] in container bits [15:0]
-udp.checksum[15:0] in container bits [15:0]
+tcp.ackNo[31:16] in container bits [15:0]
+udp.dstPort[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="909" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 20
+<rect x="909" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 20
   Assigned to Ingress
   Container Bit Width: 16
   Container Address: 323
   Tag-Along Space
 
-tcp.seqNo[15:0] in container bits [15:0]
+tcp.ackNo[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="909" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 20
-  Assigned to Ingress
+<rect x="909" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 20
+  Unassigned
   Container Bit Width: 16
   Container Address: 324
   Tag-Along Space
 
-tcp.ackNo[31:16] in container bits [15:0]
 
 </title></rect>
-<rect x="909" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 20
-  Assigned to Ingress
+<rect x="909" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 20
+  Unassigned
   Container Bit Width: 16
   Container Address: 325
   Tag-Along Space
 
-tcp.ackNo[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="909" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 20
-  Unassigned
-  Container Bit Width: 16
-  Container Address: 326
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="909" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 20
-  Unassigned
-  Container Bit Width: 16
-  Container Address: 327
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="927" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 20
-  Unassigned
-  Container Bit Width: 16
-  Container Address: 328
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="927" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 20
-  Unassigned
-  Container Bit Width: 16
-  Container Address: 329
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="927" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 20
-  Unassigned
-  Container Bit Width: 16
-  Container Address: 330
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="927" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 20
-  Unassigned
-  Container Bit Width: 16
-  Container Address: 331
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="927" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 20
+<rect x="909" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 20
   Assigned to Egress
   Container Bit Width: 16
-  Container Address: 332
+  Container Address: 326
   Tag-Along Space
 
 ipv4.totalLen[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="927" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 20
+<rect x="909" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 20
   Assigned to Egress
   Container Bit Width: 16
-  Container Address: 333
+  Container Address: 327
   Tag-Along Space
 
 ipv4.identification[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="927" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 20
+<rect x="927" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 20
   Assigned to Egress
   Container Bit Width: 16
-  Container Address: 334
+  Container Address: 328
   Tag-Along Space
 
 ipv4.flags[2:0] in container bits [15:13]
 ipv4.fragOffset[12:0] in container bits [12:0]
 
 </title></rect>
-<rect x="927" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 20
+<rect x="927" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 20
   Assigned to Egress
   Container Bit Width: 16
-  Container Address: 335
+  Container Address: 329
   Tag-Along Space
 
 tcp.dstPort[15:0] in container bits [15:0]
-
-</title></rect>
-<text x="920" y="178" textLength="16" lengthAdjust="spacingAndGlyphs" textHeight="16" heightAdjust="spacingAndGlyphs" style="fill:black;">16</text>
-<rect x="954" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 21
-  Assigned to Egress
-  Container Bit Width: 16
-  Container Address: 336
-  Tag-Along Space
-
-tcp.seqNo[31:16] in container bits [15:0]
 udp.dstPort[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="954" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 21
+<rect x="927" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 20
   Assigned to Egress
   Container Bit Width: 16
-  Container Address: 337
+  Container Address: 330
+  Tag-Along Space
+
+tcp.seqNo[31:16] in container bits [15:0]
+
+</title></rect>
+<rect x="927" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 20
+  Assigned to Egress
+  Container Bit Width: 16
+  Container Address: 331
   Tag-Along Space
 
 tcp.seqNo[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="954" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 21
+<rect x="927" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 20
   Assigned to Egress
   Container Bit Width: 16
-  Container Address: 338
+  Container Address: 332
   Tag-Along Space
 
 ethernet.dstAddr[7:0] in container bits [15:8]
 ethernet.srcAddr[47:40] in container bits [7:0]
 
 </title></rect>
-<rect x="954" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 21
+<rect x="927" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 20
   Assigned to Egress
   Container Bit Width: 16
-  Container Address: 339
+  Container Address: 333
   Tag-Along Space
 
 ethernet.etherType[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="954" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:gold""><title>PHV Group: 21
+<rect x="927" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:gold""><title>PHV Group: 20
   Assigned to Egress
   Container Bit Width: 16
-  Container Address: 340
+  Container Address: 334
   Tag-Along Space
 
 packet_out_hdr.egress_port[8:0] in container bits [15:7]
@@ -28592,6 +28573,55 @@
 packet_in_hdr._padding[6:0] in container bits [6:0]
 
 </title></rect>
+<rect x="927" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 20
+  Unassigned
+  Container Bit Width: 16
+  Container Address: 335
+  Tag-Along Space
+
+
+</title></rect>
+<text x="920" y="178" textLength="16" lengthAdjust="spacingAndGlyphs" textHeight="16" heightAdjust="spacingAndGlyphs" style="fill:black;">16</text>
+<rect x="954" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 21
+  Unassigned
+  Container Bit Width: 16
+  Container Address: 336
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="954" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 21
+  Unassigned
+  Container Bit Width: 16
+  Container Address: 337
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="954" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 21
+  Unassigned
+  Container Bit Width: 16
+  Container Address: 338
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="954" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 21
+  Unassigned
+  Container Bit Width: 16
+  Container Address: 339
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="954" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 21
+  Unassigned
+  Container Bit Width: 16
+  Container Address: 340
+  Tag-Along Space
+
+
+</title></rect>
 <rect x="954" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 21
   Unassigned
   Container Bit Width: 16
@@ -28845,15 +28875,16 @@
   Container Bit Width: 32
   Container Address: 3
 
-ethernet.dstAddr[39:8] in container bits [31:0]
+tcp.dstPort[7:0] in container bits [31:24]
+tcp.seqNo[31:8] in container bits [23:0]
 
 </title></rect>
-<rect x="9" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 0
+<rect x="9" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 0
   Assigned to Ingress
   Container Bit Width: 32
   Container Address: 4
 
-ethernet.srcAddr[31:0] in container bits [31:0]
+ethernet.dstAddr[39:8] in container bits [31:0]
 
 </title></rect>
 <rect x="9" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 0
@@ -28861,8 +28892,7 @@
   Container Bit Width: 32
   Container Address: 5
 
-udp.srcPort[15:0] in container bits [31:16]
-udp.dstPort[15:0] in container bits [15:0]
+ethernet.srcAddr[31:0] in container bits [31:0]
 
 </title></rect>
 <rect x="9" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 0
@@ -29288,38 +29318,40 @@
   Container Bit Width: 8
   Container Address: 65
 
-ethernet.dstAddr[47:40] in container bits [7:0]
+tcp.srcPort[15:8] in container bits [7:0]
+udp.srcPort[7:0] in container bits [7:0]
 
 </title></rect>
-<rect x="189" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 4
+<rect x="189" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 4
   Assigned to Ingress
   Container Bit Width: 8
   Container Address: 66
 
-ethernet.srcAddr[39:32] in container bits [7:0]
+ethernet.dstAddr[47:40] in container bits [7:0]
 
 </title></rect>
-<rect x="189" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkred""><title>PHV Group: 4
+<rect x="189" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 4
   Assigned to Ingress
   Container Bit Width: 8
   Container Address: 67
 
-POV.POV[39:32] in container bits [7:0]
+ethernet.srcAddr[39:32] in container bits [7:0]
 
 </title></rect>
-<rect x="189" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:beige""><title>PHV Group: 4
+<rect x="189" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkred""><title>PHV Group: 4
   Assigned to Ingress
   Container Bit Width: 8
   Container Address: 68
 
-ig_intr_md_for_tm.drop_ctl[2:0] in container bits [7:5]
+POV.POV[39:32] in container bits [7:0]
 
 </title></rect>
-<rect x="189" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 4
-  Unassigned
+<rect x="189" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:beige""><title>PHV Group: 4
+  Assigned to Ingress
   Container Bit Width: 8
   Container Address: 69
 
+ig_intr_md_for_tm.drop_ctl[2:0] in container bits [7:5]
 
 </title></rect>
 <rect x="189" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 4
@@ -29779,24 +29811,25 @@
   Container Bit Width: 16
   Container Address: 132
 
-ethernet.dstAddr[7:0] in container bits [15:8]
-ethernet.srcAddr[47:40] in container bits [7:0]
+tcp.srcPort[7:0] in container bits [15:8]
+tcp.dstPort[15:8] in container bits [7:0]
 
 </title></rect>
-<rect x="369" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 8
+<rect x="369" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 8
   Assigned to Ingress
   Container Bit Width: 16
   Container Address: 133
 
-ethernet.etherType[15:0] in container bits [15:0]
+ethernet.dstAddr[7:0] in container bits [15:8]
+ethernet.srcAddr[47:40] in container bits [7:0]
 
 </title></rect>
-<rect x="369" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:goldenrod""><title>PHV Group: 8
+<rect x="369" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 8
   Assigned to Ingress
   Container Bit Width: 16
   Container Address: 134
 
-ecmp_metadata.group_id[15:0] in container bits [15:0]
+ethernet.etherType[15:0] in container bits [15:0]
 
 </title></rect>
 <rect x="369" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:goldenrod""><title>PHV Group: 8
@@ -29804,14 +29837,15 @@
   Container Bit Width: 16
   Container Address: 135
 
-ecmp_metadata.selector[15:0] in container bits [15:0]
+ecmp_metadata.group_id[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="387" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 8
-  Unassigned
+<rect x="387" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:goldenrod""><title>PHV Group: 8
+  Assigned to Ingress
   Container Bit Width: 16
   Container Address: 136
 
+ecmp_metadata.selector[15:0] in container bits [15:0]
 
 </title></rect>
 <rect x="387" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 8
@@ -30443,7 +30477,7 @@
 ipv4.ttl[7:0] in container bits [7:0]
 
 </title></rect>
-<rect x="729" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 16
+<rect x="729" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 16
   Assigned to Ingress
   Container Bit Width: 32
   Container Address: 257
@@ -30453,10 +30487,12 @@
 tcp.res[2:0] in container bits [27:25]
 tcp.ecn[2:0] in container bits [24:22]
 tcp.ctrl[5:0] in container bits [21:16]
+udp.length_[15:0] in container bits [31:16]
 tcp.window[15:0] in container bits [15:0]
+udp.checksum[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="729" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 16
+<rect x="729" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 16
   Assigned to Ingress
   Container Bit Width: 32
   Container Address: 258
@@ -30474,42 +30510,10 @@
 
 
 </title></rect>
-<rect x="729" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 16
-  Unassigned
-  Container Bit Width: 32
-  Container Address: 260
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="729" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 16
-  Unassigned
-  Container Bit Width: 32
-  Container Address: 261
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="729" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 16
-  Unassigned
-  Container Bit Width: 32
-  Container Address: 262
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="729" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 16
-  Unassigned
-  Container Bit Width: 32
-  Container Address: 263
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="747" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 16
+<rect x="729" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 16
   Assigned to Egress
   Container Bit Width: 32
-  Container Address: 264
+  Container Address: 260
   Tag-Along Space
 
 ipv4.ttl[7:0] in container bits [31:24]
@@ -30517,28 +30521,28 @@
 ipv4.hdrChecksum[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="747" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 16
+<rect x="729" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 16
   Assigned to Egress
   Container Bit Width: 32
-  Container Address: 265
+  Container Address: 261
   Tag-Along Space
 
 ipv4.srcAddr[31:0] in container bits [31:0]
 
 </title></rect>
-<rect x="747" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 16
+<rect x="729" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 16
   Assigned to Egress
   Container Bit Width: 32
-  Container Address: 266
+  Container Address: 262
   Tag-Along Space
 
 ipv4.dstAddr[31:0] in container bits [31:0]
 
 </title></rect>
-<rect x="747" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 16
+<rect x="729" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 16
   Assigned to Egress
   Container Bit Width: 32
-  Container Address: 267
+  Container Address: 263
   Tag-Along Space
 
 udp.length_[15:0] in container bits [31:16]
@@ -30546,10 +30550,10 @@
 udp.checksum[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="747" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 16
+<rect x="747" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 16
   Assigned to Egress
   Container Bit Width: 32
-  Container Address: 268
+  Container Address: 264
   Tag-Along Space
 
 tcp.dataOffset[3:0] in container bits [31:28]
@@ -30559,32 +30563,64 @@
 tcp.window[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="747" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 16
+<rect x="747" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 16
   Assigned to Egress
   Container Bit Width: 32
-  Container Address: 269
+  Container Address: 265
   Tag-Along Space
 
 tcp.checksum[15:0] in container bits [31:16]
 tcp.urgentPtr[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="747" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 16
+<rect x="747" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 16
   Assigned to Egress
   Container Bit Width: 32
-  Container Address: 270
+  Container Address: 266
   Tag-Along Space
 
 ethernet.dstAddr[39:8] in container bits [31:0]
 
 </title></rect>
-<rect x="747" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 16
+<rect x="747" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 16
   Assigned to Egress
   Container Bit Width: 32
+  Container Address: 267
+  Tag-Along Space
+
+ethernet.srcAddr[31:0] in container bits [31:0]
+
+</title></rect>
+<rect x="747" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 16
+  Unassigned
+  Container Bit Width: 32
+  Container Address: 268
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="747" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 16
+  Unassigned
+  Container Bit Width: 32
+  Container Address: 269
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="747" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 16
+  Unassigned
+  Container Bit Width: 32
+  Container Address: 270
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="747" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 16
+  Unassigned
+  Container Bit Width: 32
   Container Address: 271
   Tag-Along Space
 
-ethernet.srcAddr[31:0] in container bits [31:0]
 
 </title></rect>
 <text x="740" y="178" textLength="16" lengthAdjust="spacingAndGlyphs" textHeight="16" heightAdjust="spacingAndGlyphs" style="fill:black;">32</text>
@@ -30727,123 +30763,119 @@
 ipv4.ihl[3:0] in container bits [3:0]
 
 </title></rect>
-<rect x="819" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 18
+<rect x="819" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 18
   Assigned to Ingress
   Container Bit Width: 8
   Container Address: 289
   Tag-Along Space
 
-tcp.srcPort[15:8] in container bits [7:0]
-udp.length_[15:8] in container bits [7:0]
+tcp.seqNo[7:0] in container bits [7:0]
+udp.srcPort[15:8] in container bits [7:0]
 
 </title></rect>
-<rect x="819" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 18
-  Assigned to Ingress
+<rect x="819" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
+  Unassigned
   Container Bit Width: 8
   Container Address: 290
   Tag-Along Space
 
-tcp.srcPort[7:0] in container bits [7:0]
-udp.length_[7:0] in container bits [7:0]
 
 </title></rect>
-<rect x="819" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 18
-  Assigned to Ingress
+<rect x="819" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
+  Unassigned
   Container Bit Width: 8
   Container Address: 291
   Tag-Along Space
 
-tcp.dstPort[15:8] in container bits [7:0]
 
 </title></rect>
-<rect x="819" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 18
-  Assigned to Ingress
-  Container Bit Width: 8
-  Container Address: 292
-  Tag-Along Space
-
-tcp.dstPort[7:0] in container bits [7:0]
-
-</title></rect>
-<rect x="819" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
-  Unassigned
-  Container Bit Width: 8
-  Container Address: 293
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="819" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
-  Unassigned
-  Container Bit Width: 8
-  Container Address: 294
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="819" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
-  Unassigned
-  Container Bit Width: 8
-  Container Address: 295
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="837" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 18
+<rect x="819" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 18
   Assigned to Egress
   Container Bit Width: 8
-  Container Address: 296
+  Container Address: 292
   Tag-Along Space
 
 ipv4.version[3:0] in container bits [7:4]
 ipv4.ihl[3:0] in container bits [3:0]
 
 </title></rect>
-<rect x="837" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 18
+<rect x="819" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 18
   Assigned to Egress
   Container Bit Width: 8
-  Container Address: 297
+  Container Address: 293
   Tag-Along Space
 
 ipv4.diffserv[7:0] in container bits [7:0]
 
 </title></rect>
-<rect x="837" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 18
+<rect x="819" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 18
   Assigned to Egress
   Container Bit Width: 8
-  Container Address: 298
+  Container Address: 294
   Tag-Along Space
 
 tcp.srcPort[15:8] in container bits [7:0]
 udp.srcPort[15:8] in container bits [7:0]
 
 </title></rect>
-<rect x="837" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 18
+<rect x="819" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 18
   Assigned to Egress
   Container Bit Width: 8
-  Container Address: 299
+  Container Address: 295
   Tag-Along Space
 
 tcp.srcPort[7:0] in container bits [7:0]
 udp.srcPort[7:0] in container bits [7:0]
 
 </title></rect>
-<rect x="837" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 18
+<rect x="837" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 18
   Assigned to Egress
   Container Bit Width: 8
-  Container Address: 300
+  Container Address: 296
   Tag-Along Space
 
 ethernet.dstAddr[47:40] in container bits [7:0]
 
 </title></rect>
-<rect x="837" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 18
+<rect x="837" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 18
   Assigned to Egress
   Container Bit Width: 8
+  Container Address: 297
+  Tag-Along Space
+
+ethernet.srcAddr[39:32] in container bits [7:0]
+
+</title></rect>
+<rect x="837" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
+  Unassigned
+  Container Bit Width: 8
+  Container Address: 298
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="837" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
+  Unassigned
+  Container Bit Width: 8
+  Container Address: 299
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="837" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
+  Unassigned
+  Container Bit Width: 8
+  Container Address: 300
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="837" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
+  Unassigned
+  Container Bit Width: 8
   Container Address: 301
   Tag-Along Space
 
-ethernet.srcAddr[39:32] in container bits [7:0]
 
 </title></rect>
 <rect x="837" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 18
@@ -31012,171 +31044,120 @@
 ipv4.identification[15:8] in container bits [7:0]
 
 </title></rect>
-<rect x="909" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 20
+<rect x="909" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 20
   Assigned to Ingress
   Container Bit Width: 16
   Container Address: 322
   Tag-Along Space
 
-tcp.seqNo[31:16] in container bits [15:0]
-udp.checksum[15:0] in container bits [15:0]
+tcp.ackNo[31:16] in container bits [15:0]
+udp.dstPort[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="909" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 20
+<rect x="909" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 20
   Assigned to Ingress
   Container Bit Width: 16
   Container Address: 323
   Tag-Along Space
 
-tcp.seqNo[15:0] in container bits [15:0]
+tcp.ackNo[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="909" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 20
-  Assigned to Ingress
+<rect x="909" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 20
+  Unassigned
   Container Bit Width: 16
   Container Address: 324
   Tag-Along Space
 
-tcp.ackNo[31:16] in container bits [15:0]
 
 </title></rect>
-<rect x="909" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 20
-  Assigned to Ingress
+<rect x="909" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 20
+  Unassigned
   Container Bit Width: 16
   Container Address: 325
   Tag-Along Space
 
-tcp.ackNo[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="909" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 20
-  Unassigned
-  Container Bit Width: 16
-  Container Address: 326
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="909" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 20
-  Unassigned
-  Container Bit Width: 16
-  Container Address: 327
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="927" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 20
-  Unassigned
-  Container Bit Width: 16
-  Container Address: 328
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="927" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 20
-  Unassigned
-  Container Bit Width: 16
-  Container Address: 329
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="927" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 20
-  Unassigned
-  Container Bit Width: 16
-  Container Address: 330
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="927" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 20
-  Unassigned
-  Container Bit Width: 16
-  Container Address: 331
-  Tag-Along Space
-
-
-</title></rect>
-<rect x="927" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 20
+<rect x="909" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 20
   Assigned to Egress
   Container Bit Width: 16
-  Container Address: 332
+  Container Address: 326
   Tag-Along Space
 
 ipv4.totalLen[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="927" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 20
+<rect x="909" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 20
   Assigned to Egress
   Container Bit Width: 16
-  Container Address: 333
+  Container Address: 327
   Tag-Along Space
 
 ipv4.identification[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="927" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 20
+<rect x="927" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:darksalmon""><title>PHV Group: 20
   Assigned to Egress
   Container Bit Width: 16
-  Container Address: 334
+  Container Address: 328
   Tag-Along Space
 
 ipv4.flags[2:0] in container bits [15:13]
 ipv4.fragOffset[12:0] in container bits [12:0]
 
 </title></rect>
-<rect x="927" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 20
+<rect x="927" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 20
   Assigned to Egress
   Container Bit Width: 16
-  Container Address: 335
+  Container Address: 329
   Tag-Along Space
 
 tcp.dstPort[15:0] in container bits [15:0]
-
-</title></rect>
-<text x="920" y="178" textLength="16" lengthAdjust="spacingAndGlyphs" textHeight="16" heightAdjust="spacingAndGlyphs" style="fill:black;">16</text>
-<rect x="954" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 21
-  Assigned to Egress
-  Container Bit Width: 16
-  Container Address: 336
-  Tag-Along Space
-
-tcp.seqNo[31:16] in container bits [15:0]
 udp.dstPort[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="954" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:greenyellow""><title>PHV Group: 21
+<rect x="927" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 20
   Assigned to Egress
   Container Bit Width: 16
-  Container Address: 337
+  Container Address: 330
+  Tag-Along Space
+
+tcp.seqNo[31:16] in container bits [15:0]
+
+</title></rect>
+<rect x="927" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 20
+  Assigned to Egress
+  Container Bit Width: 16
+  Container Address: 331
   Tag-Along Space
 
 tcp.seqNo[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="954" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 21
+<rect x="927" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 20
   Assigned to Egress
   Container Bit Width: 16
-  Container Address: 338
+  Container Address: 332
   Tag-Along Space
 
 ethernet.dstAddr[7:0] in container bits [15:8]
 ethernet.srcAddr[47:40] in container bits [7:0]
 
 </title></rect>
-<rect x="954" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkseagreen""><title>PHV Group: 21
+<rect x="927" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:darkturquoise""><title>PHV Group: 20
   Assigned to Egress
   Container Bit Width: 16
-  Container Address: 339
+  Container Address: 333
   Tag-Along Space
 
 ethernet.etherType[15:0] in container bits [15:0]
 
 </title></rect>
-<rect x="954" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:gold""><title>PHV Group: 21
+<rect x="927" y="117" width="18" height="18" style="stroke:black; stroke-width:1; fill:gold""><title>PHV Group: 20
   Assigned to Egress
   Container Bit Width: 16
-  Container Address: 340
+  Container Address: 334
   Tag-Along Space
 
 packet_out_hdr.egress_port[8:0] in container bits [15:7]
@@ -31185,6 +31166,55 @@
 packet_in_hdr._padding[6:0] in container bits [6:0]
 
 </title></rect>
+<rect x="927" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 20
+  Unassigned
+  Container Bit Width: 16
+  Container Address: 335
+  Tag-Along Space
+
+
+</title></rect>
+<text x="920" y="178" textLength="16" lengthAdjust="spacingAndGlyphs" textHeight="16" heightAdjust="spacingAndGlyphs" style="fill:black;">16</text>
+<rect x="954" y="9" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 21
+  Unassigned
+  Container Bit Width: 16
+  Container Address: 336
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="954" y="27" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 21
+  Unassigned
+  Container Bit Width: 16
+  Container Address: 337
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="954" y="45" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 21
+  Unassigned
+  Container Bit Width: 16
+  Container Address: 338
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="954" y="63" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 21
+  Unassigned
+  Container Bit Width: 16
+  Container Address: 339
+  Tag-Along Space
+
+
+</title></rect>
+<rect x="954" y="81" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 21
+  Unassigned
+  Container Bit Width: 16
+  Container Address: 340
+  Tag-Along Space
+
+
+</title></rect>
 <rect x="954" y="99" width="18" height="18" style="stroke:black; stroke-width:1; fill:white""><title>PHV Group: 21
   Unassigned
   Container Bit Width: 16
@@ -31405,7 +31435,7 @@
 <text x="1010" y="178" textLength="16" lengthAdjust="spacingAndGlyphs" textHeight="16" heightAdjust="spacingAndGlyphs" style="fill:black;">16</text>
 <rect x="0" y="0" width="1053" height="198" style="stroke:black; stroke-width:2; fill:none""></rect>
 </svg><br>
-<br><i>Created on Tue Sep 12 11:16:59 2017</i>
+<br><i>Created on Wed Sep 13 01:00:41 2017</i>
 <br><i>Compiler version: 5.1.0 (fca32d1)</i>
 </body>
 </html>
\ No newline at end of file
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/visualization/table_placement.html b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/visualization/table_placement.html
index 003fc71..79cd7cb 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/visualization/table_placement.html
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/visualization/table_placement.html
@@ -216,10 +216,10 @@
 <rect x="208" y="195" width="13" height="13" style="stroke:black; stroke-width:1; fill:white""><title>TCAM</title></rect>
 <rect x="117" y="26" width="104" height="182" style="stroke:black; stroke-width:2; fill:none""></rect>
 <text x="158" y="245" textLength="24" lengthAdjust="spacingAndGlyphs" textHeight="24" heightAdjust="spacingAndGlyphs" style="fill:black;">1</text>
-<rect x="234" y="26" width="13" height="13" style="stroke:black; stroke-width:1; fill:crimson""><title>SRAM for ingress_port_counter</title></rect>
-<rect x="247" y="26" width="13" height="13" style="stroke:black; stroke-width:1; fill:crimson""><title>SRAM for ingress_port_counter</title></rect>
-<rect x="260" y="26" width="13" height="13" style="stroke:black; stroke-width:1; fill:cyan""><title>SRAM for egress_port_counter</title></rect>
-<rect x="273" y="26" width="13" height="13" style="stroke:black; stroke-width:1; fill:cyan""><title>SRAM for egress_port_counter</title></rect>
+<rect x="234" y="26" width="13" height="13" style="stroke:black; stroke-width:1; fill:cyan""><title>SRAM for ingress_port_counter</title></rect>
+<rect x="247" y="26" width="13" height="13" style="stroke:black; stroke-width:1; fill:cyan""><title>SRAM for ingress_port_counter</title></rect>
+<rect x="260" y="26" width="13" height="13" style="stroke:black; stroke-width:1; fill:limegreen""><title>SRAM for egress_port_counter</title></rect>
+<rect x="273" y="26" width="13" height="13" style="stroke:black; stroke-width:1; fill:limegreen""><title>SRAM for egress_port_counter</title></rect>
 <rect x="286" y="26" width="13" height="13" style="stroke:black; stroke-width:1; fill:white""><title>SRAM</title></rect>
 <rect x="299" y="26" width="13" height="13" style="stroke:black; stroke-width:1; fill:white""><title>SRAM</title></rect>
 <rect x="312" y="26" width="13" height="13" style="stroke:black; stroke-width:1; fill:white""><title>SRAM</title></rect>
@@ -1281,9 +1281,9 @@
 <text x="860" y="128"   style="fill:black;">ecmp_group_table</text>
 <rect x="832" y="143" width="26" height="26" style="stroke:black; stroke-width:1; fill:chocolate""><title>ecmp_group_table_counter</title></rect>
 <text x="860" y="167"   style="fill:black;">ecmp_group_table_counter</text>
-<rect x="832" y="182" width="26" height="26" style="stroke:black; stroke-width:1; fill:cyan""><title>egress_port_counter</title></rect>
+<rect x="832" y="182" width="26" height="26" style="stroke:black; stroke-width:1; fill:limegreen""><title>egress_port_counter</title></rect>
 <text x="860" y="206"   style="fill:black;">egress_port_counter</text>
-<rect x="832" y="221" width="26" height="26" style="stroke:black; stroke-width:1; fill:crimson""><title>ingress_port_counter</title></rect>
+<rect x="832" y="221" width="26" height="26" style="stroke:black; stroke-width:1; fill:cyan""><title>ingress_port_counter</title></rect>
 <text x="860" y="245"   style="fill:black;">ingress_port_counter</text>
 <rect x="832" y="260" width="26" height="26" style="stroke:black; stroke-width:1; fill:blue""><title>table0</title></rect>
 <text x="860" y="284"   style="fill:black;">table0</text>
@@ -1443,8 +1443,8 @@
 <tr>
 <td align="center">ingress_port_count_table</td>
 <td align="center">2</td>
-<td align="center">0</td>
-<td align="center">0</td>
+<td align="center">2</td>
+<td align="center">10</td>
 <td align="center">0</td>
 <td align="center">0</td>
 <td align="center">0</td>
@@ -1467,8 +1467,8 @@
 <tr>
 <td align="center">egress_port_count_table</td>
 <td align="center">2</td>
-<td align="center">0</td>
-<td align="center">0</td>
+<td align="center">2</td>
+<td align="center">10</td>
 <td align="center">1</td>
 <td align="center">0</td>
 <td align="center">0</td>
@@ -1501,7 +1501,7 @@
 <td align="center">0</td>
 </tr>
 </table>
-<br><i>Created on Tue Sep 12 11:16:59 2017</i>
+<br><i>Created on Wed Sep 13 01:00:40 2017</i>
 <br><i>Compiler version: 5.1.0 (fca32d1)</i>
 </body>
 </html>
\ No newline at end of file