diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/visualization/deparser.html b/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/visualization/deparser.html
index 29e8aa5..3cd0e6e 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/visualization/deparser.html
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/default/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>66</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 66 bit 0</td><td>(phv[66] & 0x1)</td></tr>
+<tr class=fde_row_1><td height=50 width=50>33</td><td>packet_out_hdr</td><td>PHV 66 bit 1</td><td>(phv[66] & 0x2)</td></tr>
+<tr class=fde_row_0><td height=50 width=50>34</td><td>ethernet</td><td>PHV 66 bit 2</td><td>(phv[66] & 0x4)</td></tr>
+<tr class=fde_row_1><td height=50 width=50>35</td><td>ipv4</td><td>PHV 66 bit 3</td><td>(phv[66] & 0x8)</td></tr>
+<tr class=fde_row_0><td height=50 width=50>36</td><td>tcp</td><td>PHV 66 bit 4</td><td>(phv[66] & 0x10)</td></tr>
+<tr class=fde_row_1><td height=50 width=50>37</td><td>udp</td><td>PHV 66 bit 5</td><td>(phv[66] & 0x20)</td></tr>
+<tr class=fde_row_0><td height=50 width=50>38</td><td>metadata_bridge</td><td>PHV 66 bit 6</td><td>(phv[66] & 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>
@@ -154,15 +154,6 @@
         
 
         <tr class="fde_row_1">
-            <td style="border-right: 1px solid black">metadata_bridge (38)</td>
-            <td>64</td>
-            <td>128</td>
-            <td>128</td>
-            <td>-</td>
-        </tr>
-        
-
-        <tr class="fde_row_0">
             <td style="border-right: 1px solid black">_bridged_intr_md_ (16)</td>
             <td>128</td>
             <td>128</td>
@@ -171,15 +162,6 @@
         </tr>
         
 
-        <tr class="fde_row_1">
-            <td style="border-right: 1px solid black">packet_out_hdr (33)</td>
-            <td>129</td>
-            <td>129</td>
-            <td>-</td>
-            <td>-</td>
-        </tr>
-        
-
         <tr class="fde_row_0">
             <td style="border-right: 1px solid black">packet_in_hdr (32)</td>
             <td>129</td>
@@ -190,34 +172,43 @@
         
 
         <tr class="fde_row_1">
+            <td style="border-right: 1px solid black">packet_out_hdr (33)</td>
+            <td>129</td>
+            <td>129</td>
+            <td>-</td>
+            <td>-</td>
+        </tr>
+        
+
+        <tr class="fde_row_0">
             <td style="border-right: 1px solid black">ethernet (34)</td>
+            <td>64</td>
+            <td>1</td>
+            <td>1</td>
+            <td>1</td>
+        </tr>
+        
+
+        <tr class="fde_row_1">
+            <td style="border-right: 1px solid black">ethernet (34)</td>
+            <td>1</td>
+            <td>131</td>
+            <td>131</td>
             <td>65</td>
-            <td>1</td>
-            <td>1</td>
-            <td>1</td>
         </tr>
         
 
         <tr class="fde_row_0">
             <td style="border-right: 1px solid black">ethernet (34)</td>
-            <td>1</td>
-            <td>131</td>
-            <td>131</td>
-            <td>66</td>
+            <td>2</td>
+            <td>2</td>
+            <td>2</td>
+            <td>2</td>
         </tr>
         
 
         <tr class="fde_row_1">
             <td style="border-right: 1px solid black">ethernet (34)</td>
-            <td>2</td>
-            <td>2</td>
-            <td>2</td>
-            <td>2</td>
-        </tr>
-        
-
-        <tr class="fde_row_0">
-            <td style="border-right: 1px solid black">ethernet (34)</td>
             <td>132</td>
             <td>132</td>
             <td>-</td>
@@ -225,7 +216,7 @@
         </tr>
         
 
-        <tr class="fde_row_1">
+        <tr class="fde_row_0">
             <td style="border-right: 1px solid black">ipv4 (35)</td>
             <td><font color=#333333><i>288</i></font></td>
             <td><font color=#333333><i>289</i></font></td>
@@ -234,7 +225,7 @@
         </tr>
         
 
-        <tr class="fde_row_0">
+        <tr class="fde_row_1">
             <td style="border-right: 1px solid black">ipv4 (35)</td>
             <td><font color=#333333><i>321</i></font></td>
             <td><font color=#333333><i>321</i></font></td>
@@ -243,26 +234,26 @@
         </tr>
         
 
-        <tr class="fde_row_1">
-            <td style="border-right: 1px solid black">ipv4 (35)</td>
-            <td><font color=#333333><i>256</i></font></td>
-            <td><font color=#333333><i>256</i></font></td>
-            <td><font color=#333333><i>256</i></font></td>
-            <td><font color=#333333><i>256</i></font></td>
-        </tr>
-        
-
         <tr class="fde_row_0">
             <td style="border-right: 1px solid black">ipv4 (35)</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>
+            <td><font color=#333333><i>256</i></font></td>
+            <td><font color=#333333><i>256</i></font></td>
+            <td><font color=#333333><i>256</i></font></td>
+            <td><font color=#333333><i>256</i></font></td>
         </tr>
         
 
         <tr class="fde_row_1">
             <td style="border-right: 1px solid black">ipv4 (35)</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_0">
+            <td style="border-right: 1px solid black">ipv4 (35)</td>
             <td><font color=#333333><i>258</i></font></td>
             <td><font color=#333333><i>258</i></font></td>
             <td><font color=#333333><i>258</i></font></td>
@@ -270,7 +261,7 @@
         </tr>
         
 
-        <tr class="fde_row_0">
+        <tr class="fde_row_1">
             <td style="border-right: 1px solid black">udp (37)</td>
             <td><font color=#333333><i>290</i></font></td>
             <td><font color=#333333><i>291</i></font></td>
@@ -279,7 +270,7 @@
         </tr>
         
 
-        <tr class="fde_row_1">
+        <tr class="fde_row_0">
             <td style="border-right: 1px solid black">udp (37)</td>
             <td><font color=#333333><i>259</i></font></td>
             <td><font color=#333333><i>259</i></font></td>
@@ -288,21 +279,30 @@
         </tr>
         
 
-        <tr class="fde_row_0">
+        <tr class="fde_row_1">
             <td style="border-right: 1px solid black">tcp (36)</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><font color=#333333><i>293</i></font></td>
+        </tr>
+        
+
+        <tr class="fde_row_0">
+            <td style="border-right: 1px solid black">tcp (36)</td>
             <td><font color=#333333><i>323</i></font></td>
             <td><font color=#333333><i>323</i></font></td>
+            <td><font color=#333333><i>324</i></font></td>
+            <td><font color=#333333><i>324</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>326</i></font></td>
+            <td><font color=#333333><i>326</i></font></td>
         </tr>
         
 
@@ -323,17 +323,8 @@
             <td><font color=#333333><i>260</i></font></td>
         </tr>
         
-
-        <tr class="fde_row_0">
-            <td style="border-right: 1px solid black">tcp (36)</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>
-        
 </table>
-<br>21/192 entries populated<br>
+<br>20/192 entries populated<br>
 </div></div><br><br>
 <div class="data_box">
 [<a href="javascript:void(0)" onclick="toggle_visibility('resub_table');" style="text-decoration: none;"><font size=+3><b>.</b></font></a>] <a style="text-decoration: none; color: #0000FF;" href="#resub_table">Resubmit Table</a> <br><br><div id="resub_table" style="display: block;">
@@ -370,7 +361,7 @@
 <td width=50 style="border: 1px solid black" align=center>112-119</td>
 <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=1 align=center bgcolor=#DDDDDD>82</td>
+<td height=50 colspan=1 align=center bgcolor=#DDDDDD>81</td>
 <td height=50 colspan=15 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>
@@ -394,12 +385,12 @@
 <td height=50 colspan=16 align=center bgcolor=#FFFFFF>----</td>
 </tr></table><br />
 <table border=0 style="text-align: center; border: 1px solid black; border-bottom: 0px; border-spacing: 0px;"><tr><td>POV</td><td>Use</td><td>Location</td><td>Expression</td></tr>
-<tr class=fde_row_0><td height=50 width=50>0</td><td>packet_in_hdr</td><td>PHV 82 bit 0</td><td>(phv[82] & 0x1)</td></tr>
-<tr class=fde_row_1><td height=50 width=50>1</td><td>packet_out_hdr</td><td>PHV 82 bit 1</td><td>(phv[82] & 0x2)</td></tr>
-<tr class=fde_row_0><td height=50 width=50>2</td><td>ethernet</td><td>PHV 82 bit 2</td><td>(phv[82] & 0x4)</td></tr>
-<tr class=fde_row_1><td height=50 width=50>3</td><td>ipv4</td><td>PHV 82 bit 3</td><td>(phv[82] & 0x8)</td></tr>
-<tr class=fde_row_0><td height=50 width=50>4</td><td>tcp</td><td>PHV 82 bit 4</td><td>(phv[82] & 0x10)</td></tr>
-<tr class=fde_row_1><td height=50 width=50>5</td><td>udp</td><td>PHV 82 bit 5</td><td>(phv[82] & 0x20)</td></tr>
+<tr class=fde_row_0><td height=50 width=50>0</td><td>packet_in_hdr</td><td>PHV 81 bit 0</td><td>(phv[81] & 0x1)</td></tr>
+<tr class=fde_row_1><td height=50 width=50>1</td><td>packet_out_hdr</td><td>PHV 81 bit 1</td><td>(phv[81] & 0x2)</td></tr>
+<tr class=fde_row_0><td height=50 width=50>2</td><td>ethernet</td><td>PHV 81 bit 2</td><td>(phv[81] & 0x4)</td></tr>
+<tr class=fde_row_1><td height=50 width=50>3</td><td>ipv4</td><td>PHV 81 bit 3</td><td>(phv[81] & 0x8)</td></tr>
+<tr class=fde_row_0><td height=50 width=50>4</td><td>tcp</td><td>PHV 81 bit 4</td><td>(phv[81] & 0x10)</td></tr>
+<tr class=fde_row_1><td height=50 width=50>5</td><td>udp</td><td>PHV 81 bit 5</td><td>(phv[81] & 0x20)</td></tr>
 <tr class=fde_row_0><td height=50 width=50>6-254</td><td>----</td><td>&nbsp;</td><td>&nbsp;</td></tr>
 </table>
 </div></div><br><br>
@@ -409,7 +400,7 @@
 <tr><td><center>POV</center></td><td colspan=4><center>PHV</center></td></tr>
 
         <tr class="fde_row_0">
-            <td style="border-right: 1px solid black">packet_out_hdr (1)</td>
+            <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>-</td>
@@ -418,9 +409,9 @@
         
 
         <tr class="fde_row_1">
-            <td style="border-right: 1px solid black">packet_in_hdr (0)</td>
-            <td>145</td>
-            <td>145</td>
+            <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>-</td>
             <td>-</td>
         </tr>
@@ -578,7 +569,7 @@
 </div></div><br><br>
 </td></tr>
 </table>
-<br><i>Created on Thu Sep  7 13:57:10 2017</i>
+<br><i>Created on Fri Sep  8 08:24:46 2017</i>
 
 <br><i>Compiler version: 5.1.0 (fca32d1)</i>