diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/context/context.json b/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/context/context.json
index becdf93..ac56604 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/context/context.json
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/context/context.json
@@ -1,5 +1,5 @@
 {
-    "build_date": "Fri Sep  8 08:24:01 2017", 
+    "build_date": "Wed Sep 13 00:58:27 2017", 
     "phv_allocation": [
         {
             "ingress": [
@@ -17229,12 +17229,13 @@
             "actions": [
                 {
                     "p4_parameters": [], 
+                    "disallowed_as_default_action_reason": "USES_HASH_DIST", 
                     "handle": 536870914, 
                     "name": "count_ingress", 
                     "indirect_resources": [], 
                     "override_stat_full_addr": 0, 
                     "override_meter_addr_pfe": false, 
-                    "allowed_as_default_action": true, 
+                    "allowed_as_default_action": false, 
                     "override_stat_addr_pfe": true, 
                     "override_stateful_addr_pfe": false, 
                     "override_meter_full_addr": 0, 
@@ -17264,12 +17265,13 @@
             "actions": [
                 {
                     "p4_parameters": [], 
+                    "disallowed_as_default_action_reason": "USES_HASH_DIST", 
                     "handle": 536870914, 
                     "name": "count_ingress", 
                     "indirect_resources": [], 
                     "override_stat_full_addr": 0, 
                     "override_meter_addr_pfe": false, 
-                    "allowed_as_default_action": true, 
+                    "allowed_as_default_action": false, 
                     "override_stat_addr_pfe": true, 
                     "override_stateful_addr_pfe": false, 
                     "override_meter_full_addr": 0, 
@@ -17302,18 +17304,24 @@
                         "pack_format": [
                             {
                                 "memory_word_width": 0, 
-                                "entries_per_table_word": 1, 
+                                "entries_per_table_word": 0, 
                                 "table_word_width": 0, 
                                 "number_memory_units_per_table_word": 0
                             }
                         ], 
+                        "hash_functions": [
+                            {
+                                "hash_function_number": 0, 
+                                "hash_bits": []
+                            }
+                        ], 
                         "result_physical_buses": [
                             1
                         ], 
                         "logical_table_id": 0, 
                         "stage_number": 1, 
                         "stage_table_type": "match_with_no_key", 
-                        "size": 1
+                        "size": 1024
                     }
                 ], 
                 "match_type": "match_with_no_key"
@@ -17366,12 +17374,13 @@
             "actions": [
                 {
                     "p4_parameters": [], 
+                    "disallowed_as_default_action_reason": "USES_HASH_DIST", 
                     "handle": 536870916, 
                     "name": "count_egress", 
                     "indirect_resources": [], 
                     "override_stat_full_addr": 0, 
                     "override_meter_addr_pfe": false, 
-                    "allowed_as_default_action": true, 
+                    "allowed_as_default_action": false, 
                     "override_stat_addr_pfe": true, 
                     "override_stateful_addr_pfe": false, 
                     "override_meter_full_addr": 0, 
@@ -17401,12 +17410,13 @@
             "actions": [
                 {
                     "p4_parameters": [], 
+                    "disallowed_as_default_action_reason": "USES_HASH_DIST", 
                     "handle": 536870916, 
                     "name": "count_egress", 
                     "indirect_resources": [], 
                     "override_stat_full_addr": 0, 
                     "override_meter_addr_pfe": false, 
-                    "allowed_as_default_action": true, 
+                    "allowed_as_default_action": false, 
                     "override_stat_addr_pfe": true, 
                     "override_stateful_addr_pfe": false, 
                     "override_meter_full_addr": 0, 
@@ -17439,18 +17449,24 @@
                         "pack_format": [
                             {
                                 "memory_word_width": 0, 
-                                "entries_per_table_word": 1, 
+                                "entries_per_table_word": 0, 
                                 "table_word_width": 0, 
                                 "number_memory_units_per_table_word": 0
                             }
                         ], 
+                        "hash_functions": [
+                            {
+                                "hash_function_number": 0, 
+                                "hash_bits": []
+                            }
+                        ], 
                         "result_physical_buses": [
                             0
                         ], 
                         "logical_table_id": 1, 
                         "stage_number": 1, 
                         "stage_table_type": "match_with_no_key", 
-                        "size": 1
+                        "size": 1024
                     }
                 ], 
                 "match_type": "match_with_no_key"
@@ -18386,7 +18402,7 @@
             "packet_counter_resolution": 32, 
             "pfe_bit_position": 19, 
             "how_referenced": "indirect", 
-            "size": 510
+            "size": 512
         }, 
         {
             "direction": "ingress", 
@@ -18429,7 +18445,7 @@
             "packet_counter_resolution": 32, 
             "pfe_bit_position": 19, 
             "how_referenced": "indirect", 
-            "size": 510
+            "size": 512
         }, 
         {
             "direction": "ingress", 
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/context/mau.context.json b/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/context/mau.context.json
index 8a5de37..2228613 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/context/mau.context.json
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/context/mau.context.json
@@ -1,14 +1,137 @@
 {
   "ProgramInfo": {
     "ProgramName": "default", 
-    "BuildDate": "Fri Sep  8 08:24:01 2017", 
+    "BuildDate": "Wed Sep 13 00:58:27 2017", 
     "CompilerVersion": "5.1.0"
   }, 
   "HashJsonNode": {
-    "TableCount": 0, 
+    "TableCount": 2, 
     "ProxyTables": {}, 
-    "AllTables": {}, 
-    "HashFieldCount": 0
+    "AllTables": {
+      "ingress_port_count_table": {
+        "1": [
+          {
+            "0": [
+              {}, 
+              {
+                "seed": 0
+              }
+            ], 
+            "1": [
+              {}, 
+              {
+                "seed": 0
+              }
+            ], 
+            "2": [
+              {}, 
+              {
+                "seed": 0
+              }
+            ], 
+            "3": [
+              {}, 
+              {
+                "seed": 0
+              }
+            ], 
+            "4": [
+              {}, 
+              {
+                "seed": 0
+              }
+            ], 
+            "5": [
+              {}, 
+              {
+                "seed": 0
+              }
+            ], 
+            "6": [
+              {}, 
+              {
+                "seed": 0
+              }
+            ], 
+            "7": [
+              {}, 
+              {
+                "seed": 0
+              }
+            ], 
+            "8": [
+              {}, 
+              {
+                "seed": 0
+              }
+            ]
+          }
+        ], 
+        "Handle": 16777217
+      }, 
+      "egress_port_count_table": {
+        "1": [
+          {
+            "0": [
+              {}, 
+              {
+                "seed": 0
+              }
+            ], 
+            "1": [
+              {}, 
+              {
+                "seed": 0
+              }
+            ], 
+            "2": [
+              {}, 
+              {
+                "seed": 0
+              }
+            ], 
+            "3": [
+              {}, 
+              {
+                "seed": 0
+              }
+            ], 
+            "4": [
+              {}, 
+              {
+                "seed": 0
+              }
+            ], 
+            "5": [
+              {}, 
+              {
+                "seed": 0
+              }
+            ], 
+            "6": [
+              {}, 
+              {
+                "seed": 0
+              }
+            ], 
+            "7": [
+              {}, 
+              {
+                "seed": 0
+              }
+            ], 
+            "8": [
+              {}, 
+              {
+                "seed": 0
+              }
+            ]
+          }
+        ], 
+        "Handle": 16777218
+      }
+    }, 
+    "HashFieldCount": 2
   }, 
   "EntryFormatNode": {
     "ExmEntryFormat": {
@@ -16664,21 +16787,16 @@
         "stage_tables": [
           {
             "stage_number": 1, 
-            "stage_table_type": "match_with_no_key", 
-            "number_entries": 1, 
+            "stage_table_type": "hash_action", 
+            "number_entries": 1024, 
             "pack_format_length": 1, 
             "pack_format": [
               {
                 "table_word_width": 0, 
                 "memory_word_width": 0, 
-                "entries_per_table_word": 1, 
+                "entries_per_table_word": 0, 
                 "number_memory_units_per_table_word": 0, 
-                "entry_list": [
-                  {
-                    "entry_number": 0, 
-                    "field_list": []
-                  }
-                ]
+                "entry_list": []
               }
             ], 
             "memory_resource_allocation": null, 
@@ -16715,15 +16833,15 @@
                 ], 
                 "match_group_key_bit_width": 16, 
                 "match_group_phv_bit_scrambling": {
-                  "ig_intr_md_for_tm.ucast_egress_port[0]": 0, 
-                  "ig_intr_md_for_tm.ucast_egress_port[1]": 1, 
-                  "ig_intr_md_for_tm.ucast_egress_port[2]": 2, 
-                  "ig_intr_md_for_tm.ucast_egress_port[3]": 3, 
-                  "ig_intr_md_for_tm.ucast_egress_port[4]": 4, 
-                  "ig_intr_md_for_tm.ucast_egress_port[5]": 5, 
-                  "ig_intr_md_for_tm.ucast_egress_port[6]": 6, 
-                  "ig_intr_md_for_tm.ucast_egress_port[7]": 7, 
-                  "ig_intr_md_for_tm.ucast_egress_port[8]": 8
+                  "ig_intr_md_for_tm.ucast_egress_port[0]": 16, 
+                  "ig_intr_md_for_tm.ucast_egress_port[1]": 17, 
+                  "ig_intr_md_for_tm.ucast_egress_port[2]": 18, 
+                  "ig_intr_md_for_tm.ucast_egress_port[3]": 19, 
+                  "ig_intr_md_for_tm.ucast_egress_port[4]": 20, 
+                  "ig_intr_md_for_tm.ucast_egress_port[5]": 21, 
+                  "ig_intr_md_for_tm.ucast_egress_port[6]": 22, 
+                  "ig_intr_md_for_tm.ucast_egress_port[7]": 23, 
+                  "ig_intr_md_for_tm.ucast_egress_port[8]": 24
                 }, 
                 "match_group_match_bit_scrambling": {}, 
                 "seed": [
@@ -16829,8 +16947,8 @@
           {
             "name": "count_ingress", 
             "handle": 536870914, 
-            "allowed_to_be_default_action": true, 
-            "disallowed_as_default_action_reason": null, 
+            "allowed_to_be_default_action": false, 
+            "disallowed_as_default_action_reason": "USES_HASH_DIST", 
             "override_stat_addr_pfe": true, 
             "override_stat_addr": false, 
             "override_stat_full_addr": 0, 
@@ -16861,8 +16979,8 @@
         "default_action": {
           "name": "count_ingress", 
           "handle": 536870914, 
-          "allowed_to_be_default_action": true, 
-          "disallowed_as_default_action_reason": null, 
+          "allowed_to_be_default_action": false, 
+          "disallowed_as_default_action_reason": "USES_HASH_DIST", 
           "override_stat_addr_pfe": true, 
           "override_stat_addr": false, 
           "override_stat_full_addr": 0, 
@@ -16902,7 +17020,7 @@
         "p4_stateful_tables": [], 
         "p4_selection_tables": [], 
         "include_idletime": false, 
-        "performs_hash_action": false, 
+        "performs_hash_action": true, 
         "uses_range": false, 
         "number_entries_with_ranges": 0, 
         "uses_versioning": true, 
@@ -16923,21 +17041,16 @@
         "stage_tables": [
           {
             "stage_number": 1, 
-            "stage_table_type": "match_with_no_key", 
-            "number_entries": 1, 
+            "stage_table_type": "hash_action", 
+            "number_entries": 1024, 
             "pack_format_length": 1, 
             "pack_format": [
               {
                 "table_word_width": 0, 
                 "memory_word_width": 0, 
-                "entries_per_table_word": 1, 
+                "entries_per_table_word": 0, 
                 "number_memory_units_per_table_word": 0, 
-                "entry_list": [
-                  {
-                    "entry_number": 0, 
-                    "field_list": []
-                  }
-                ]
+                "entry_list": []
               }
             ], 
             "memory_resource_allocation": null, 
@@ -17070,8 +17183,8 @@
           {
             "name": "count_egress", 
             "handle": 536870916, 
-            "allowed_to_be_default_action": true, 
-            "disallowed_as_default_action_reason": null, 
+            "allowed_to_be_default_action": false, 
+            "disallowed_as_default_action_reason": "USES_HASH_DIST", 
             "override_stat_addr_pfe": true, 
             "override_stat_addr": false, 
             "override_stat_full_addr": 0, 
@@ -17102,8 +17215,8 @@
         "default_action": {
           "name": "count_egress", 
           "handle": 536870916, 
-          "allowed_to_be_default_action": true, 
-          "disallowed_as_default_action_reason": null, 
+          "allowed_to_be_default_action": false, 
+          "disallowed_as_default_action_reason": "USES_HASH_DIST", 
           "override_stat_addr_pfe": true, 
           "override_stat_addr": false, 
           "override_stat_full_addr": 0, 
@@ -17143,7 +17256,7 @@
         "p4_stateful_tables": [], 
         "p4_selection_tables": [], 
         "include_idletime": false, 
-        "performs_hash_action": false, 
+        "performs_hash_action": true, 
         "uses_range": false, 
         "number_entries_with_ranges": 0, 
         "uses_versioning": true, 
@@ -18534,7 +18647,7 @@
         "name": "ingress_port_counter", 
         "handle": 67108865, 
         "direction": "ingress", 
-        "number_entries": 510, 
+        "number_entries": 512, 
         "stage_tables_length": 1, 
         "stage_tables": [
           {
@@ -18642,7 +18755,7 @@
         "name": "egress_port_counter", 
         "handle": 67108866, 
         "direction": "ingress", 
-        "number_entries": 510, 
+        "number_entries": 512, 
         "stage_tables_length": 1, 
         "stage_tables": [
           {
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/default.json b/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/default.json
index d082348..0141a65 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/default.json
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/default.json
@@ -9,10 +9,8 @@
       "name" : "scalars_0",
       "id" : 0,
       "fields" : [
-        ["tmp_0", 104, false],
-        ["tmp", 8, false],
-        ["tmp_1", 32, false],
-        ["tmp_2", 32, false]
+        ["tmp", 32, false],
+        ["tmp_0", 32, false]
       ]
     },
     {
@@ -194,7 +192,7 @@
           "parser_ops" : [],
           "transitions" : [
             {
-              "value" : "0xff",
+              "value" : "0x00ff",
               "mask" : null,
               "next_state" : "parse_pkt_out"
             },
@@ -381,50 +379,10 @@
         {
           "name" : "start",
           "id" : 7,
-          "parser_ops" : [
-            {
-              "parameters" : [
-                {
-                  "type" : "field",
-                  "value" : ["scalars", "tmp_0"]
-                },
-                {
-                  "type" : "lookahead",
-                  "value" : [0, 104]
-                }
-              ],
-              "op" : "set"
-            },
-            {
-              "parameters" : [
-                {
-                  "type" : "field",
-                  "value" : ["scalars", "tmp"]
-                },
-                {
-                  "type" : "expression",
-                  "value" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "&",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "tmp_0"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0xff"
-                      }
-                    }
-                  }
-                }
-              ],
-              "op" : "set"
-            }
-          ],
+          "parser_ops" : [],
           "transitions" : [
             {
-              "value" : "0x00",
+              "value" : "0x00ff",
               "mask" : null,
               "next_state" : "parse_pkt_in"
             },
@@ -437,7 +395,7 @@
           "transition_key" : [
             {
               "type" : "field",
-              "value" : ["scalars", "tmp"]
+              "value" : ["ig_intr_md", "egress_spec"]
             }
           ]
         }
@@ -650,7 +608,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "tmp_1"]
+              "value" : ["scalars", "tmp"]
             },
             {
               "type" : "expression",
@@ -680,7 +638,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "tmp_1"]
+              "value" : ["scalars", "tmp"]
             }
           ],
           "source_info" : {
@@ -702,7 +660,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "tmp_2"]
+              "value" : ["scalars", "tmp_0"]
             },
             {
               "type" : "expression",
@@ -732,7 +690,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "tmp_2"]
+              "value" : ["scalars", "tmp_0"]
             }
           ],
           "source_info" : {
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/logs/asm.log b/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/logs/asm.log
index 9328ce0..420c745 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/logs/asm.log
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/logs/asm.log
@@ -1,6 +1,6 @@
 +---------------------------------------------------------------------+
 |  Log file: asm.log                                                  |
 |  Compiler version: 5.1.0 (fca32d1)                                  |
-|  Created on: Fri Sep  8 08:23:45 2017                               |
+|  Created on: Wed Sep 13 00:58:11 2017                               |
 +---------------------------------------------------------------------+
 
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/logs/mau.characterize.log b/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/logs/mau.characterize.log
index 8115d10..1b5b65c 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/logs/mau.characterize.log
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/logs/mau.characterize.log
@@ -1,7 +1,7 @@
 +---------------------------------------------------------------------+
 |  Log file: mau.characterize.log                                     |
 |  Compiler version: 5.1.0 (fca32d1)                                  |
-|  Created on: Fri Sep  8 08:23:45 2017                               |
+|  Created on: Wed Sep 13 00:58:11 2017                               |
 +---------------------------------------------------------------------+
 
 Match+Action Resource Usage
@@ -20,8 +20,8 @@
 | process_packet_out_table | ingress |   0   |         |  -   |  0 (0/0/0/0/0)  |   0   | 1024 / 1 (-1023) |   0 / 0 (0)   |    0    |   0   |   0/0/0/0/0/0/0/0   | 0 / 0 (0)  |   0 / 0 (0)   |  0 / 0 (0)   |   0    | 0 / 0 (0) |  0 in 0 (0)  |  1 in 0 (0)  |     - / -     |     - / -     |  - / -  |
 |      stage 0 totals      |    -    |   -   |    -    |  -   |  3 (0/0/2/0/1)  |   3   |        -         |       -       |    -    |   -   |          -          |     -      |       -       |      -       |   -    |     -     |      -       |      -       |       -       |       -       |    -    |
 |                          |         |       |         |      |                 |       |                  |               |         |       |                     |            |               |              |        |           |              |              |               |               |         |
-| ingress_port_count_table | ingress |   1   |         |  -   |  2 (0/0/2/0/0)  |   0   | 1024 / 1 (-1023) |   0 / 0 (0)   |    0    |   0   |   0/0/0/0/0/0/0/0   | 0 / 0 (0)  |   0 / 0 (0)   |  0 / 0 (0)   |   0    | 0 / 0 (0) |  0 in 0 (0)  |  1 in 0 (0)  |     - / -     |     - / -     |  - / -  |
-| egress_port_count_table  | ingress |   1   |         |  -   |  2 (0/0/2/0/0)  |   0   | 1024 / 1 (-1023) |   0 / 0 (0)   |    0    |   0   |   0/0/0/0/0/0/0/0   | 0 / 0 (0)  |   0 / 0 (0)   |  0 / 0 (0)   |   0    | 0 / 0 (0) |  0 in 0 (0)  |  1 in 0 (0)  |     - / -     |     - / -     |  - / -  |
+| ingress_port_count_table | ingress |   1   |         |  -   |  2 (0/0/2/0/0)  |   0   | 1024 / 1024 (0)  |   0 / 0 (0)   |    0    |   0   |   0/0/0/0/0/0/0/0   | 0 / 0 (0)  |   0 / 0 (0)   |  0 / 0 (0)   |   0    | 0 / 0 (0) |  0 in 0 (0)  |  0 in 0 (0)  |     - / -     |     - / -     |  - / -  |
+| egress_port_count_table  | ingress |   1   |         |  -   |  2 (0/0/2/0/0)  |   0   | 1024 / 1024 (0)  |   0 / 0 (0)   |    0    |   0   |   0/0/0/0/0/0/0/0   | 0 / 0 (0)  |   0 / 0 (0)   |  0 / 0 (0)   |   0    | 0 / 0 (0) |  0 in 0 (0)  |  0 in 0 (0)  |     - / -     |     - / -     |  - / -  |
 |      stage 1 totals      |    -    |   -   |    -    |  -   |  4 (0/0/4/0/0)  |   0   |        -         |       -       |    -    |   -   |          -          |     -      |       -       |      -       |   -    |     -     |      -       |      -       |       -       |       -       |    -    |
 |                          |         |       |         |      |                 |       |                  |               |         |       |                     |            |               |              |        |           |              |              |               |               |         |
 |      overall totals      |    -    |   -   |    -    |  -   |  7 (0/0/6/0/1)  |   3   |        -         |       -       |    -    |   -   |          -          |     -      |       -       |      -       |   -    |     -     |      -       |      -       |       -       |       -       |    -    |
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/logs/mau.config.log b/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/logs/mau.config.log
index b397f72..f4265ee 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/logs/mau.config.log
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/logs/mau.config.log
@@ -1,7 +1,7 @@
 +---------------------------------------------------------------------+
 |  Log file: mau.config.log                                           |
 |  Compiler version: 5.1.0 (fca32d1)                                  |
-|  Created on: Fri Sep  8 08:23:45 2017                               |
+|  Created on: Wed Sep 13 00:58:11 2017                               |
 +---------------------------------------------------------------------+
 
 Final Stage dependencies are:
@@ -709,26 +709,26 @@
 Configuring rams.match.merge.logical_table_thread[copy_index=2].logical_table_thread_ingress to be 0x1 (previous_value=0x0 OR new_value=0x1).
 Configuring dp.mau_match_input_xbar_exact_match_enable[direction_index=0].mau_match_input_xbar_exact_match_enable to be 0x1.  (old value = 0x0 OR new value = 0x1)
 Configuring dp.xbar_hash.xbar.mau_match_input_xbar_ternary_match_enable[direction_index=0].mau_match_input_xbar_ternary_match_enable to be 0x0.  (old value = 0x0 OR new value = 0x0)
-Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=0].match_input_xbar_816b_ctl_address to be 18.
-Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=0].match_input_xbar_816b_ctl_enable to be 1.
-Configuring match input crossbar byte 0 to come from 16-bit PHV container 2.
+Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=2].match_input_xbar_816b_ctl_address to be 18.
+Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=2].match_input_xbar_816b_ctl_enable to be 1.
+Configuring match input crossbar byte 2 to come from 16-bit PHV container 2.
   That PHV byte contains {ig_intr_md_for_tm.ucast_egress_port[7:0]}.
-Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=1].match_input_xbar_816b_ctl_address to be 18.
-Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=1].match_input_xbar_816b_ctl_enable to be 1.
-Configuring match input crossbar byte 1 to come from 16-bit PHV container 2.
+Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=3].match_input_xbar_816b_ctl_address to be 18.
+Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=3].match_input_xbar_816b_ctl_enable to be 1.
+Configuring match input crossbar byte 3 to come from 16-bit PHV container 2.
   That PHV byte contains {unused[6:0], ig_intr_md_for_tm.ucast_egress_port[8:8]}.
 Configuring dp.match_input_xbar_din_power_ctl[14_byte_group=0][byte_position=8].match_input_xbar_din_power_ctl to be 0x4.  (previous value = 0x0  OR new value = 0x4)
 Configuring dp.xbar_hash.hash.parity_group_mask[parity_group_mask_index=0][byte_number=0].parity_group_mask to be 0x1.  (previous value = 0x0  OR  new value = 0x1)
 Configuring dp.xbar_hash.hash.parity_group_mask[parity_group_mask_index=0][byte_number=1].parity_group_mask to be 0x0.  (previous value = 0x0  OR  new value = 0x0)
-Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=0][hash_bit_index=40].byte1 to be 0x1.
-Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=0][hash_bit_index=41].byte0 to be 0x1.
-Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=0][hash_bit_index=42].byte0 to be 0x2.
-Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=0][hash_bit_index=43].byte0 to be 0x4.
-Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=0][hash_bit_index=44].byte0 to be 0x8.
-Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=0][hash_bit_index=45].byte0 to be 0x10.
-Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=0][hash_bit_index=46].byte0 to be 0x20.
-Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=0][hash_bit_index=47].byte0 to be 0x40.
-Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=0][hash_bit_index=48].byte0 to be 0x80.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=1][hash_bit_index=40].byte1 to be 0x1.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=1][hash_bit_index=41].byte0 to be 0x1.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=1][hash_bit_index=42].byte0 to be 0x2.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=1][hash_bit_index=43].byte0 to be 0x4.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=1][hash_bit_index=44].byte0 to be 0x8.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=1][hash_bit_index=45].byte0 to be 0x10.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=1][hash_bit_index=46].byte0 to be 0x20.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=1][hash_bit_index=47].byte0 to be 0x40.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=1][hash_bit_index=48].byte0 to be 0x80.
 Configuring dp.hashout_ctl.hash_group_ingress_enable to be 0x1.  (previous value = 0x0 OR new value = 0x1)
 Configuring rams.array.row[row=7].vh_xbar[search_bus_index=0].exactmatch_row_vh_xbar_ctl.exactmatch_row_vh_xbar_select to be 0.
 Configuring rams.array.row[row=7].vh_xbar[search_bus_index=0].exactmatch_row_vh_xbar_ctl.exactmatch_row_vh_xbar_enable to be 1.
@@ -746,23 +746,23 @@
 Configuring rams.array.row[7].gateway_table[1].gateway_table_entry_matchdata[3][0] to be 0xffffffff
 Configuring rams.array.row[7].gateway_table[1].gateway_table_entry_matchdata[3][1] to be 0xffffffff
 Configuring rams.array.row[7].gateway_table[1].gateway_table_ctl.gateway_table_mode to be 0x2
-Configuring rams.array.row[7].gateway_table[1].gateway_table_data_entry[3][0] to be 0xffffff
-Configuring rams.array.row[7].gateway_table[1].gateway_table_data_entry[3][1] to be 0xffff3f
+Configuring rams.array.row[7].gateway_table[1].gateway_table_data_entry[3][0] to be 0xffff00
+Configuring rams.array.row[7].gateway_table[1].gateway_table_data_entry[3][1] to be 0xffff00
 Configuring rams.match.merge.gateway_inhibit_lut[0] to be 0x8
 Configuring rams.match.merge.gateway_next_table_lut[0][3] to be 0x11
 Configuring rams.array.row[7].gateway_table[1].gateway_table_vv_entry[2].gateway_table_entry_versionvalid0 to be 0x3
 Configuring rams.array.row[7].gateway_table[1].gateway_table_vv_entry[2].gateway_table_entry_versionvalid1 to be 0x3
 Configuring rams.array.row[7].gateway_table[1].gateway_table_entry_matchdata[2][0] to be 0xffffffff
 Configuring rams.array.row[7].gateway_table[1].gateway_table_entry_matchdata[2][1] to be 0xffffffff
-Configuring rams.array.row[7].gateway_table[1].gateway_table_data_entry[2][0] to be 0xffffff
-Configuring rams.array.row[7].gateway_table[1].gateway_table_data_entry[2][1] to be 0xff7fff
+Configuring rams.array.row[7].gateway_table[1].gateway_table_data_entry[2][0] to be 0xff00ff
+Configuring rams.array.row[7].gateway_table[1].gateway_table_data_entry[2][1] to be 0xff00ff
 Configuring rams.match.merge.gateway_inhibit_lut[0] to be 0xc (previous value 0x8 OR new value 0x4)
 Configuring rams.match.merge.gateway_next_table_lut[0][2] to be 0x11
 Configuring rams.array.row[7].gateway_table[1].gateway_table_vv_entry[1].gateway_table_entry_versionvalid0 to be 0x3
 Configuring rams.array.row[7].gateway_table[1].gateway_table_vv_entry[1].gateway_table_entry_versionvalid1 to be 0x3
 Configuring rams.array.row[7].gateway_table[1].gateway_table_entry_matchdata[1][0] to be 0xffffffff
 Configuring rams.array.row[7].gateway_table[1].gateway_table_entry_matchdata[1][1] to be 0xffffffff
-Configuring rams.array.row[7].gateway_table[1].gateway_table_data_entry[1][0] to be 0x1ffff
+Configuring rams.array.row[7].gateway_table[1].gateway_table_data_entry[1][0] to be 0x3ffff
 Configuring rams.array.row[7].gateway_table[1].gateway_table_data_entry[1][1] to be 0xffff
 Configuring rams.match.merge.gateway_inhibit_lut[0] to be 0xe (previous value 0xc OR new value 0x2)
 Configuring rams.match.merge.gateway_next_table_lut[0][1] to be 0x11
@@ -788,7 +788,7 @@
 +------------------------------------------------------------------------
 |  Working on table ingress_port_count_table in stage 1 ---
 +------------------------------------------------------------------------
---> Match Table with no key ingress_port_count_table with logical_table_id 0
+--> Hash Action Table ingress_port_count_table with logical_table_id 0
 allocated_result_bus = Ram Data Bus MatchResult2R 0 left_and_right is 83 bits
 Configuring rams.match.merge.predication_ctl[direction_index=0].table_thread to be 0x1 (previous_value=0x1 OR new_value=0x1).
 Configuring rams.match.merge.logical_table_thread[copy_index=0].logical_table_thread_ingress to be 0x1 (previous_value=0x1 OR new_value=0x1).
@@ -808,6 +808,37 @@
 Configuring rams.match.merge.mau_action_instruction_adr_map_en[table_type_index=0].mau_action_instruction_adr_map_en to be 0x1 (previous_value=0x0 OR new_value=0x1).
 Configuring rams.match.merge.mau_action_instruction_adr_map_data[table_type_index=0][logical_table=0][entry_index=0].mau_action_instruction_adr_map_data to be 0x2000.
 Configuring rams.match.merge.mau_action_instruction_adr_map_data[table_type_index=0][logical_table=0][entry_index=1].mau_action_instruction_adr_map_data to be 0x0.
+
+---- Hash Distribution Units for table ingress_port_count_table ----
+Configuring dp.mau_match_input_xbar_exact_match_enable[direction_index=0].mau_match_input_xbar_exact_match_enable to be 0x1.  (old value = 0x1 OR new value = 0x1)
+Configuring dp.xbar_hash.xbar.mau_match_input_xbar_ternary_match_enable[direction_index=0].mau_match_input_xbar_ternary_match_enable to be 0x0.  (old value = 0x0 OR new value = 0x0)
+Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=0].match_input_xbar_816b_ctl_address to be 16.
+Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=0].match_input_xbar_816b_ctl_enable to be 1.
+Configuring match input crossbar byte 0 to come from 16-bit PHV container 0.
+  That PHV byte contains {ig_intr_md.ingress_port[7:0]}.
+Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=1].match_input_xbar_816b_ctl_address to be 16.
+Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=1].match_input_xbar_816b_ctl_enable to be 1.
+Configuring match input crossbar byte 1 to come from 16-bit PHV container 0.
+  That PHV byte contains {unused[6:0], ig_intr_md.ingress_port[8:8]}.
+Configuring dp.match_input_xbar_din_power_ctl[14_byte_group=0][byte_position=8].match_input_xbar_din_power_ctl to be 0x5.  (previous value = 0x4  OR new value = 0x1)
+Configuring dp.xbar_hash.hash.parity_group_mask[parity_group_mask_index=0][byte_number=0].parity_group_mask to be 0x1.  (previous value = 0x1  OR  new value = 0x1)
+Configuring dp.xbar_hash.hash.parity_group_mask[parity_group_mask_index=0][byte_number=1].parity_group_mask to be 0x0.  (previous value = 0x0  OR  new value = 0x0)
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=0][hash_bit_index=0].byte0 to be 0x1.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=0][hash_bit_index=1].byte0 to be 0x2.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=0][hash_bit_index=2].byte0 to be 0x4.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=0][hash_bit_index=3].byte0 to be 0x8.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=0][hash_bit_index=4].byte0 to be 0x10.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=0][hash_bit_index=5].byte0 to be 0x20.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=0][hash_bit_index=6].byte0 to be 0x40.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=0][hash_bit_index=7].byte0 to be 0x80.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=0][hash_bit_index=8].byte1 to be 0x1.
+Configuring dp.hashout_ctl.hash_group_ingress_enable to be 0x1.  (previous value = 0x1 OR new value = 0x1)
+Configuring rams.match.merge.mau_hash_group_config.hash_group_enable to be 1. (old value = 0 OR new value = 1).
+Configuring rams.match.merge.mau_hash_group_config.hash_group_sel to be 8. (old value = 0 OR new value = 8).
+Configuring rams.match.merge.mau_hash_group_config.hash_group_ctl to be 1. (old value = 0 OR new value = 1).
+Configuring rams.match.merge.mau_hash_group_shiftcount.mau_hash_group_shiftcount to be 0x1. (old value = 0x0 OR new value = 0x1).
+Configuring rams.match.merge.mau_hash_group_mask[which_16=0].mau_hash_group_mask to be 0x3ff.  (previous value = 0x0  OR new value = 0x3ff)
+Configuring rams.match.merge.mau_hash_group_xbar_ctl[output_type_index=3][control_group_index=0].mau_hash_group_xbar_ctl to be 0x8 (old value = 0x0 OR new value = 0x8).
 Configuring rams.match.merge.mau_payload_shifter_enable[table_type=0][result_bus=1].stats_adr_payload_shifter_en to be 1.
 Configuring rams.match.merge.mau_payload_shifter_enable[table_type=0][result_bus=1].action_instruction_adr_payload_shifter_en to be 1.
 
@@ -819,7 +850,7 @@
 +------------------------------------------------------------------------
 |  Working on table egress_port_count_table in stage 1 ---
 +------------------------------------------------------------------------
---> Match Table with no key egress_port_count_table with logical_table_id 1
+--> Hash Action Table egress_port_count_table with logical_table_id 1
 allocated_result_bus = Ram Data Bus MatchResult1R 0 left_and_right is 83 bits
 Configuring rams.match.merge.predication_ctl[direction_index=0].table_thread to be 0x3 (previous_value=0x1 OR new_value=0x2).
 Configuring rams.match.merge.logical_table_thread[copy_index=0].logical_table_thread_ingress to be 0x3 (previous_value=0x1 OR new_value=0x2).
@@ -839,6 +870,37 @@
 Configuring rams.match.merge.mau_action_instruction_adr_map_en[table_type_index=0].mau_action_instruction_adr_map_en to be 0x3 (previous_value=0x1 OR new_value=0x2).
 Configuring rams.match.merge.mau_action_instruction_adr_map_data[table_type_index=0][logical_table=1][entry_index=0].mau_action_instruction_adr_map_data to be 0x40.
 Configuring rams.match.merge.mau_action_instruction_adr_map_data[table_type_index=0][logical_table=1][entry_index=1].mau_action_instruction_adr_map_data to be 0x0.
+
+---- Hash Distribution Units for table egress_port_count_table ----
+Configuring dp.mau_match_input_xbar_exact_match_enable[direction_index=0].mau_match_input_xbar_exact_match_enable to be 0x3.  (old value = 0x1 OR new value = 0x2)
+Configuring dp.xbar_hash.xbar.mau_match_input_xbar_ternary_match_enable[direction_index=0].mau_match_input_xbar_ternary_match_enable to be 0x0.  (old value = 0x0 OR new value = 0x0)
+Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=8].match_input_xbar_816b_ctl_address to be 18.
+Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=8].match_input_xbar_816b_ctl_enable to be 1.
+Configuring match input crossbar byte 8 to come from 16-bit PHV container 2.
+  That PHV byte contains {ig_intr_md_for_tm.ucast_egress_port[7:0]}.
+Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=9].match_input_xbar_816b_ctl_address to be 18.
+Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=9].match_input_xbar_816b_ctl_enable to be 1.
+Configuring match input crossbar byte 9 to come from 16-bit PHV container 2.
+  That PHV byte contains {unused[6:0], ig_intr_md_for_tm.ucast_egress_port[8:8]}.
+Configuring dp.match_input_xbar_din_power_ctl[14_byte_group=0][byte_position=8].match_input_xbar_din_power_ctl to be 0x5.  (previous value = 0x5  OR new value = 0x4)
+Configuring dp.xbar_hash.hash.parity_group_mask[parity_group_mask_index=1][byte_number=0].parity_group_mask to be 0x2.  (previous value = 0x0  OR  new value = 0x2)
+Configuring dp.xbar_hash.hash.parity_group_mask[parity_group_mask_index=1][byte_number=1].parity_group_mask to be 0x0.  (previous value = 0x0  OR  new value = 0x0)
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=4][hash_bit_index=0].byte0 to be 0x1.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=4][hash_bit_index=1].byte0 to be 0x2.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=4][hash_bit_index=2].byte0 to be 0x4.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=4][hash_bit_index=3].byte0 to be 0x8.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=4][hash_bit_index=4].byte0 to be 0x10.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=4][hash_bit_index=5].byte0 to be 0x20.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=4][hash_bit_index=6].byte0 to be 0x40.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=4][hash_bit_index=7].byte0 to be 0x80.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=4][hash_bit_index=8].byte1 to be 0x1.
+Configuring dp.hashout_ctl.hash_group_ingress_enable to be 0x3.  (previous value = 0x1 OR new value = 0x2)
+Configuring rams.match.merge.mau_hash_group_config.hash_group_enable to be 9. (old value = 1 OR new value = 8).
+Configuring rams.match.merge.mau_hash_group_config.hash_group_sel to be 152. (old value = 8 OR new value = 144).
+Configuring rams.match.merge.mau_hash_group_config.hash_group_ctl to be 65. (old value = 1 OR new value = 64).
+Configuring rams.match.merge.mau_hash_group_shiftcount.mau_hash_group_shiftcount to be 0x201. (old value = 0x1 OR new value = 0x200).
+Configuring rams.match.merge.mau_hash_group_mask[which_16=3].mau_hash_group_mask to be 0x3ff.  (previous value = 0x0  OR new value = 0x3ff)
+Configuring rams.match.merge.mau_hash_group_xbar_ctl[output_type_index=3][control_group_index=0].mau_hash_group_xbar_ctl to be 0xb8 (old value = 0x8 OR new value = 0xb0).
 --> Stage Gateway Table for condition egress_port_count_table_always_true_condition in stage 1
 Configuring rams.match.merge.predication_ctl[direction_index=0].table_thread to be 0x3 (previous_value=0x3 OR new_value=0x2).
 Configuring rams.match.adrdist.adr_dist_table_thread[direction_index=0][copy_index=0].adr_dist_table_thread to be 0x3 (previous_value=0x3 OR new_value=0x2).
@@ -846,11 +908,11 @@
 Configuring rams.match.merge.logical_table_thread[copy_index=0].logical_table_thread_ingress to be 0x3 (previous_value=0x3 OR new_value=0x2).
 Configuring rams.match.merge.logical_table_thread[copy_index=1].logical_table_thread_ingress to be 0x3 (previous_value=0x3 OR new_value=0x2).
 Configuring rams.match.merge.logical_table_thread[copy_index=2].logical_table_thread_ingress to be 0x3 (previous_value=0x3 OR new_value=0x2).
-Configuring dp.mau_match_input_xbar_exact_match_enable[direction_index=0].mau_match_input_xbar_exact_match_enable to be 0x1.  (old value = 0x1 OR new value = 0x0)
+Configuring dp.mau_match_input_xbar_exact_match_enable[direction_index=0].mau_match_input_xbar_exact_match_enable to be 0x3.  (old value = 0x3 OR new value = 0x0)
 Configuring dp.xbar_hash.xbar.mau_match_input_xbar_ternary_match_enable[direction_index=0].mau_match_input_xbar_ternary_match_enable to be 0x0.  (old value = 0x0 OR new value = 0x0)
 Configuring dp.xbar_hash.hash.parity_group_mask[parity_group_mask_index=0][byte_number=0].parity_group_mask to be 0x1.  (previous value = 0x1  OR  new value = 0x0)
 Configuring dp.xbar_hash.hash.parity_group_mask[parity_group_mask_index=0][byte_number=1].parity_group_mask to be 0x0.  (previous value = 0x0  OR  new value = 0x0)
-Configuring dp.hashout_ctl.hash_group_ingress_enable to be 0x1.  (previous value = 0x1 OR new value = 0x1)
+Configuring dp.hashout_ctl.hash_group_ingress_enable to be 0x3.  (previous value = 0x3 OR new value = 0x1)
 Configuring rams.array.row[7].gateway_table[0].gateway_table_ctl.gateway_table_input_data0_select to be 0x1
 Configuring rams.array.row[7].gateway_table[0].gateway_table_ctl.gateway_table_input_data1_select to be 0x0
 Configuring rams.array.row[7].gateway_table[0].gateway_table_ctl.gateway_table_input_hash0_select to be 0x1
@@ -1948,7 +2010,7 @@
 Configuring dp.phv_fifo_enable.phv_fifo_egress_final_output_enable to be 0.
 
 +------------------------------------------------------------------------
-|  Number of configuration field values set in Match-Action Stages: 1567
+|  Number of configuration field values set in Match-Action Stages: 1617
 +------------------------------------------------------------------------
 
 +------------------------------------------------------------------------
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/logs/mau.gateway.log b/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/logs/mau.gateway.log
index 0a9fafe..952f9be 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/logs/mau.gateway.log
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/logs/mau.gateway.log
@@ -1,7 +1,7 @@
 +---------------------------------------------------------------------+
 |  Log file: mau.gateway.log                                          |
 |  Compiler version: 5.1.0 (fca32d1)                                  |
-|  Created on: Fri Sep  8 08:23:45 2017                               |
+|  Created on: Wed Sep 13 00:58:11 2017                               |
 +---------------------------------------------------------------------+
 
 
@@ -752,7 +752,7 @@
 Gateway 14
 ------- Phase 0 -------------
 Looking at gateway table 14
-match_groups_attached_to_gateway = OrderedDict([(0, (0, [0], 0, [0], [(<p4c_tofino.target.tofino.device.pipeline.mau.match_keys.packed_gateway_key.PackedGatewayKey object at 0x7f84ff249450>, 0)])), (1, (None, [], None, [], []))])
+match_groups_attached_to_gateway = OrderedDict([(0, (0, [0], 0, [0], [(<p4c_tofino.target.tofino.device.pipeline.mau.match_keys.packed_gateway_key.PackedGatewayKey object at 0x7f676a5b8390>, 0)])), (1, (None, [], None, [], []))])
 Search bus 0 on row 7
 ----------------------------
  Trying to place Gateway Resource Request for table process_packet_out_table_always_true_condition needs access to 0 input bits in exact match group 0 (parity groups [0]) and hash group 0 for gateway 14.
@@ -1121,7 +1121,7 @@
 Gateway 14
 ------- Phase 0 -------------
 Looking at gateway table 14
-match_groups_attached_to_gateway = OrderedDict([(0, (0, [0], 0, [0], [(<p4c_tofino.target.tofino.device.pipeline.mau.match_keys.packed_gateway_key.PackedGatewayKey object at 0x7f84ff27e810>, 0)])), (1, (None, [], None, [], []))])
+match_groups_attached_to_gateway = OrderedDict([(0, (0, [0], 0, [0], [(<p4c_tofino.target.tofino.device.pipeline.mau.match_keys.packed_gateway_key.PackedGatewayKey object at 0x7f676a5e9790>, 0)])), (1, (None, [], None, [], []))])
 Search bus 0 on row 7
 ----------------------------
  Trying to place Gateway Resource Request for table process_packet_out_table_always_true_condition needs access to 0 input bits in exact match group 0 (parity groups [0]) and hash group 0 for gateway 14.
@@ -1495,15 +1495,15 @@
   [42] = None
   [43] = None
  Hash Bit Mapping:
-   (1, 0) --> 40
-   (0, 0) --> 41
-   (0, 1) --> 42
-   (0, 2) --> 43
-   (0, 3) --> 44
-   (0, 4) --> 45
-   (0, 5) --> 46
-   (0, 6) --> 47
-   (0, 7) --> 48
+   (3, 0) --> 40
+   (2, 0) --> 41
+   (2, 1) --> 42
+   (2, 2) --> 43
+   (2, 3) --> 44
+   (2, 4) --> 45
+   (2, 5) --> 46
+   (2, 6) --> 47
+   (2, 7) --> 48
 
 Allocating: Ram Data Bus MatchSearch1 7 left_and_right is 128 bits in stage 1 for gateway
 Allocating: Gateway 15 in stage 1 for _condition_2.
@@ -1742,15 +1742,15 @@
   [42] = None
   [43] = None
  Hash Bit Mapping:
-   (1, 0) --> 40
-   (0, 0) --> 41
-   (0, 1) --> 42
-   (0, 2) --> 43
-   (0, 3) --> 44
-   (0, 4) --> 45
-   (0, 5) --> 46
-   (0, 6) --> 47
-   (0, 7) --> 48
+   (3, 0) --> 40
+   (2, 0) --> 41
+   (2, 1) --> 42
+   (2, 2) --> 43
+   (2, 3) --> 44
+   (2, 4) --> 45
+   (2, 5) --> 46
+   (2, 6) --> 47
+   (2, 7) --> 48
 
 Allocating: Ram Data Bus MatchSearch1 7 left_and_right is 128 bits in stage 1 for gateway
 Allocating: Gateway 15 in stage 1 for _condition_2.
@@ -1846,7 +1846,7 @@
 match_groups_attached_to_gateway = OrderedDict([(0, (None, [], None, [], [])), (1, (None, [], None, [], []))])
 Search bus 0 on row 7
 
- final_parity_group_ids = [(0, []), (1, [])] 
+ final_parity_group_ids = [(0, [0]), (1, [])] 
 
  open_parity_group_ids = [0, 1] 
 ----------------------------
@@ -1989,15 +1989,15 @@
   [42] = None
   [43] = None
  Hash Bit Mapping:
-   (1, 0) --> 40
-   (0, 0) --> 41
-   (0, 1) --> 42
-   (0, 2) --> 43
-   (0, 3) --> 44
-   (0, 4) --> 45
-   (0, 5) --> 46
-   (0, 6) --> 47
-   (0, 7) --> 48
+   (3, 0) --> 40
+   (2, 0) --> 41
+   (2, 1) --> 42
+   (2, 2) --> 43
+   (2, 3) --> 44
+   (2, 4) --> 45
+   (2, 5) --> 46
+   (2, 6) --> 47
+   (2, 7) --> 48
 
 Allocating: Ram Data Bus MatchSearch1 7 left_and_right is 128 bits in stage 1 for gateway
 Allocating: Gateway 15 in stage 1 for _condition_2.
@@ -2106,7 +2106,7 @@
 match_groups_attached_to_gateway = OrderedDict([(0, (None, [], None, [], [])), (1, (None, [], None, [], []))])
 Search bus 0 on row 7
 
- final_parity_group_ids = [(0, []), (1, [])] 
+ final_parity_group_ids = [(0, [0]), (1, [])] 
 
  open_parity_group_ids = [0, 1] 
 ----------------------------
@@ -2249,15 +2249,15 @@
   [42] = None
   [43] = None
  Hash Bit Mapping:
-   (1, 0) --> 40
-   (0, 0) --> 41
-   (0, 1) --> 42
-   (0, 2) --> 43
-   (0, 3) --> 44
-   (0, 4) --> 45
-   (0, 5) --> 46
-   (0, 6) --> 47
-   (0, 7) --> 48
+   (3, 0) --> 40
+   (2, 0) --> 41
+   (2, 1) --> 42
+   (2, 2) --> 43
+   (2, 3) --> 44
+   (2, 4) --> 45
+   (2, 5) --> 46
+   (2, 6) --> 47
+   (2, 7) --> 48
 
 Allocating: Ram Data Bus MatchSearch1 7 left_and_right is 128 bits in stage 1 for gateway
 Allocating: Gateway 15 in stage 1 for _condition_2.
@@ -2279,7 +2279,7 @@
 Gateway 14
 ------- Phase 0 -------------
 Looking at gateway table 14
-match_groups_attached_to_gateway = OrderedDict([(0, (0, [0], 0, [0], [(<p4c_tofino.target.tofino.device.pipeline.mau.match_keys.packed_gateway_key.PackedGatewayKey object at 0x7f8502ec6c90>, 0)])), (1, (None, [], None, [], []))])
+match_groups_attached_to_gateway = OrderedDict([(0, (0, [0], 0, [0], [(<p4c_tofino.target.tofino.device.pipeline.mau.match_keys.packed_gateway_key.PackedGatewayKey object at 0x7f676ebf5c50>, 0)])), (1, (None, [], None, [], []))])
 Search bus 0 on row 7
 ----------------------------
  Trying to place Gateway Resource Request for table egress_port_count_table_always_true_condition needs access to 0 input bits in exact match group 0 (parity groups [0]) and hash group 0 for gateway 14.
@@ -2491,7 +2491,7 @@
 match_groups_attached_to_gateway = OrderedDict([(0, (None, [], None, [], [])), (1, (None, [], None, [], []))])
 Search bus 0 on row 7
 
- final_parity_group_ids = [(0, []), (1, [])] 
+ final_parity_group_ids = [(0, [0]), (1, [])] 
 
  open_parity_group_ids = [0, 1] 
 ----------------------------
@@ -2634,15 +2634,15 @@
   [42] = None
   [43] = None
  Hash Bit Mapping:
-   (1, 0) --> 40
-   (0, 0) --> 41
-   (0, 1) --> 42
-   (0, 2) --> 43
-   (0, 3) --> 44
-   (0, 4) --> 45
-   (0, 5) --> 46
-   (0, 6) --> 47
-   (0, 7) --> 48
+   (3, 0) --> 40
+   (2, 0) --> 41
+   (2, 1) --> 42
+   (2, 2) --> 43
+   (2, 3) --> 44
+   (2, 4) --> 45
+   (2, 5) --> 46
+   (2, 6) --> 47
+   (2, 7) --> 48
 
 Allocating: Ram Data Bus MatchSearch1 7 left_and_right is 128 bits in stage 1 for gateway
 Allocating: Gateway 15 in stage 1 for _condition_2.
@@ -2664,7 +2664,7 @@
 Gateway 14
 ------- Phase 0 -------------
 Looking at gateway table 14
-match_groups_attached_to_gateway = OrderedDict([(0, (0, [0], 0, [0], [(<p4c_tofino.target.tofino.device.pipeline.mau.match_keys.packed_gateway_key.PackedGatewayKey object at 0x7f84fec7fdd0>, 0)])), (1, (None, [], None, [], []))])
+match_groups_attached_to_gateway = OrderedDict([(0, (0, [0], 0, [0], [(<p4c_tofino.target.tofino.device.pipeline.mau.match_keys.packed_gateway_key.PackedGatewayKey object at 0x7f676a5e4d10>, 0)])), (1, (None, [], None, [], []))])
 Search bus 0 on row 7
 ----------------------------
  Trying to place Gateway Resource Request for table egress_port_count_table_always_true_condition needs access to 0 input bits in exact match group 0 (parity groups [0]) and hash group 0 for gateway 14.
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/logs/mau.gw.log b/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/logs/mau.gw.log
index d96caae..85360a8 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/logs/mau.gw.log
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/logs/mau.gw.log
@@ -1,7 +1,7 @@
 +---------------------------------------------------------------------+
 |  Log file: mau.gw.log                                               |
 |  Compiler version: 5.1.0 (fca32d1)                                  |
-|  Created on: Fri Sep  8 08:23:45 2017                               |
+|  Created on: Wed Sep 13 00:58:11 2017                               |
 +---------------------------------------------------------------------+
 
 cond _condition_0: not valid packet_out_hdr
@@ -10,13 +10,13 @@
 cond _condition_0 can be gateway (1+0)x1
 cond !_condition_0 can be gateway (1+0)x1
 _condition_0 is gateway for table0
-cond _condition_2: ig_intr_md_for_tm.ucast_egress_port < 510
-     ig_intr_md_for_tm.ucast_egress_port < 510
-   ! ig_intr_md_for_tm.ucast_egress_port >= 510
+cond _condition_2: ig_intr_md_for_tm.ucast_egress_port < 512
+     ig_intr_md_for_tm.ucast_egress_port < 512
+   ! ig_intr_md_for_tm.ucast_egress_port >= 512
 cond _condition_2 can be gateway (9+0)x1
 cond !_condition_2 can be gateway (9+0)x1
 _condition_2 is gateway for ingress_port_count_table
-fields = OrderedSet([<p4_hlir.hlir.p4_headers.p4_field object at 0x7f85035d1d90>]) and and xor_fields is OrderedSet()
+fields = OrderedSet([<p4_hlir.hlir.p4_headers.p4_field object at 0x7f676f2f9d10>]) and and xor_fields is OrderedSet()
 fields = OrderedSet() and and xor_fields is OrderedSet()
 cond _condition_0: not valid packet_out_hdr
      not valid packet_out_hdr
@@ -24,13 +24,13 @@
 cond _condition_0 can be gateway (1+0)x1
 cond !_condition_0 can be gateway (1+0)x1
 _condition_0 is gateway for table0
-cond _condition_2: ig_intr_md_for_tm.ucast_egress_port < 510
-     ig_intr_md_for_tm.ucast_egress_port < 510
-   ! ig_intr_md_for_tm.ucast_egress_port >= 510
+cond _condition_2: ig_intr_md_for_tm.ucast_egress_port < 512
+     ig_intr_md_for_tm.ucast_egress_port < 512
+   ! ig_intr_md_for_tm.ucast_egress_port >= 512
 cond _condition_2 can be gateway (9+0)x1
 cond !_condition_2 can be gateway (9+0)x1
 _condition_2 is gateway for ingress_port_count_table
-fields = OrderedSet([<p4_hlir.hlir.p4_headers.p4_field object at 0x7f85035d1d90>]) and and xor_fields is OrderedSet()
+fields = OrderedSet([<p4_hlir.hlir.p4_headers.p4_field object at 0x7f676f2f9d10>]) and and xor_fields is OrderedSet()
 fields = OrderedSet() and and xor_fields is OrderedSet()
 cond _condition_0: not valid packet_out_hdr
      not valid packet_out_hdr
@@ -38,13 +38,13 @@
 cond _condition_0 can be gateway (1+0)x1
 cond !_condition_0 can be gateway (1+0)x1
 _condition_0 is gateway for table0
-cond _condition_2: ig_intr_md_for_tm.ucast_egress_port < 510
-     ig_intr_md_for_tm.ucast_egress_port < 510
-   ! ig_intr_md_for_tm.ucast_egress_port >= 510
+cond _condition_2: ig_intr_md_for_tm.ucast_egress_port < 512
+     ig_intr_md_for_tm.ucast_egress_port < 512
+   ! ig_intr_md_for_tm.ucast_egress_port >= 512
 cond _condition_2 can be gateway (9+0)x1
 cond !_condition_2 can be gateway (9+0)x1
 _condition_2 is gateway for ingress_port_count_table
-fields = OrderedSet([<p4_hlir.hlir.p4_headers.p4_field object at 0x7f85035d1d90>]) and and xor_fields is OrderedSet()
+fields = OrderedSet([<p4_hlir.hlir.p4_headers.p4_field object at 0x7f676f2f9d10>]) and and xor_fields is OrderedSet()
 fields = OrderedSet() and and xor_fields is OrderedSet()
 cond _always_true: True == True
      True
@@ -66,12 +66,12 @@
 final.tcam: [(match=0 mask=0 T)], miss=False
 --> Stage Gateway Table for condition _condition_2 in stage 1
 T -> ingress_port_count_table(16),  F -> None(255)
-building tcam for GatewayTest('ig_intr_md_for_tm.ucast_egress_port < 510')
-  adding line (range=[ffff ffff 3fff] match=0 mask=0 T)
-  adding line (range=[ffff 7fff ffff] match=0 mask=0 T)
-  adding line (range=[1 ffff ffff] match=0 mask=0 T)
-tcam data: [(range=[ffff ffff 3fff] match=0 mask=0 T), (range=[ffff 7fff ffff] match=0 mask=0 T), (range=[1 ffff ffff] match=0 mask=0 T)]
-final.tcam: [(range=[ffff ffff 3fff] match=0 mask=0 T), (range=[ffff 7fff ffff] match=0 mask=0 T), (range=[1 ffff ffff] match=0 mask=0 T)], miss=False
+building tcam for GatewayTest('ig_intr_md_for_tm.ucast_egress_port < 512')
+  adding line (range=[ffff ffff 0] match=0 mask=0 T)
+  adding line (range=[ffff 0 ffff] match=0 mask=0 T)
+  adding line (range=[3 ffff ffff] match=0 mask=0 T)
+tcam data: [(range=[ffff ffff 0] match=0 mask=0 T), (range=[ffff 0 ffff] match=0 mask=0 T), (range=[3 ffff ffff] match=0 mask=0 T)]
+final.tcam: [(range=[ffff ffff 0] match=0 mask=0 T), (range=[ffff 0 ffff] match=0 mask=0 T), (range=[3 ffff ffff] match=0 mask=0 T)], miss=False
 --> Stage Gateway Table for condition egress_port_count_table_always_true_condition in stage 1
 T -> egress_port_count_table(17),  F -> egress_port_count_table(17)
 building tcam for GatewayTest('True')
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/logs/mau.log b/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/logs/mau.log
index dbfc867..fafa4be 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/logs/mau.log
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/logs/mau.log
@@ -1,7 +1,7 @@
 +---------------------------------------------------------------------+
 |  Log file: mau.log                                                  |
 |  Compiler version: 5.1.0 (fca32d1)                                  |
-|  Created on: Fri Sep  8 08:23:45 2017                               |
+|  Created on: Wed Sep 13 00:58:11 2017                               |
 +---------------------------------------------------------------------+
 
 Match Table table0 did not specify the number of entries required. A default value (512) will be used.
@@ -15,129 +15,7 @@
 Metadata bridge_ingress_intrinsic containers added between ingress/egress: [128]
 Match Entry Table table0 has already been associated with stat Table table0_counter.
 Match table ingress_port_count_table has no match key fields
-Cannot use hash-action for table ingress_port_count_table with no key because the number of entries required by side-effect table ingress_port_counter is not a power of 2 -- 510.
-
-##########################################
-  Call to decide_action_data_placement(stage=0, table=ingress_port_count_table)
-##########################################
-
-
-Max immediate bits used in any action is 0 bits.
-Overhead bit width for table ingress_port_count_table is 22 bits.
-Bits available in overhead for non-essential immediate data is 32 bits.
-~~~~~~~~~~~~~~~~~~~~~
- Examining placing 0 bits in match overhead
-Overhead bit width for table ingress_port_count_table is 22 bits.
-Overhead SRAMs to use = 97
-  Entries requested = 1024  and match entries get = 0
-ram_size_matrix = 
- (8, 8, False)  (8, 8, True)  (8, 32, False)  (16, 16, False)  (16, 16, True)  (16, 32, False)  (32, 32, False)  (32, 32, True) 
-       0              0              0               0                0               0                0                0        # 0
-
-immediate_size_matrix = 
- (8, 8, False)  (8, 8, True)  (8, 32, False)  (16, 16, False)  (16, 16, True)  (16, 32, False)  (32, 32, False)  (32, 32, True) 
-       0              0              0               0                0               0                0                0        # 0
-
-hash_to_phv_matrix = 
- (8, 8, False)  (8, 8, True)  (8, 32, False)  (16, 16, False)  (16, 16, True)  (16, 32, False)  (32, 32, False)  (32, 32, True) 
-       0              0              0               0                0               0                0                0        # 0
-
-total action ram packing size = [0, 0, 0]
-action_ram_packing:
-  action count_ingress has []
-total action ram packing size = [0, 0, 0]
-action_ram_packing:
-  action count_ingress has []
-total action ram packing size = [0, 0, 0]
-action_ram_packing:
-  action count_ingress has []
-byte_enables = []
-After allocation of 32s, available_slots is []
-final packing is []
-byte_enables = []
-After allocation of 32s, available_slots is []
-final packing is []
-byte_enables = []
-After allocation of 32s, available_slots is []
-final packing is []
-Action Data SRAMs to use = 0
-TODO: Total RAMs use when put 0 bits in match overhead: 97
-TODO: Total RAMs use when put 0 bits in match overhead: 97
-~~~~~~~~~~~~~~~~~~~~~
- Examining placing 8 bits in match overhead
-~~~~~~~~~~~~~~~~~~~~~
- Examining placing 16 bits in match overhead
-~~~~~~~~~~~~~~~~~~~~~
- Examining placing 24 bits in match overhead
-~~~~~~~~~~~~~~~~~~~~~
- Examining placing 32 bits in match overhead
-
-##########################################
-
-Best Ram Usage is 97 rams
-Best Immediate placement is 0 bits
 Match table egress_port_count_table has no match key fields
-Cannot use hash-action for table egress_port_count_table with no key because the number of entries required by side-effect table egress_port_counter is not a power of 2 -- 510.
-
-##########################################
-  Call to decide_action_data_placement(stage=0, table=egress_port_count_table)
-##########################################
-
-
-Max immediate bits used in any action is 0 bits.
-Overhead bit width for table egress_port_count_table is 20 bits.
-Bits available in overhead for non-essential immediate data is 32 bits.
-~~~~~~~~~~~~~~~~~~~~~
- Examining placing 0 bits in match overhead
-Overhead bit width for table egress_port_count_table is 20 bits.
-Overhead SRAMs to use = 97
-  Entries requested = 1024  and match entries get = 0
-ram_size_matrix = 
- (8, 8, False)  (8, 8, True)  (8, 32, False)  (16, 16, False)  (16, 16, True)  (16, 32, False)  (32, 32, False)  (32, 32, True) 
-       0              0              0               0                0               0                0                0        # 0
-
-immediate_size_matrix = 
- (8, 8, False)  (8, 8, True)  (8, 32, False)  (16, 16, False)  (16, 16, True)  (16, 32, False)  (32, 32, False)  (32, 32, True) 
-       0              0              0               0                0               0                0                0        # 0
-
-hash_to_phv_matrix = 
- (8, 8, False)  (8, 8, True)  (8, 32, False)  (16, 16, False)  (16, 16, True)  (16, 32, False)  (32, 32, False)  (32, 32, True) 
-       0              0              0               0                0               0                0                0        # 0
-
-total action ram packing size = [0, 0, 0]
-action_ram_packing:
-  action count_egress has []
-total action ram packing size = [0, 0, 0]
-action_ram_packing:
-  action count_egress has []
-total action ram packing size = [0, 0, 0]
-action_ram_packing:
-  action count_egress has []
-byte_enables = []
-After allocation of 32s, available_slots is []
-final packing is []
-byte_enables = []
-After allocation of 32s, available_slots is []
-final packing is []
-byte_enables = []
-After allocation of 32s, available_slots is []
-final packing is []
-Action Data SRAMs to use = 0
-TODO: Total RAMs use when put 0 bits in match overhead: 97
-TODO: Total RAMs use when put 0 bits in match overhead: 97
-~~~~~~~~~~~~~~~~~~~~~
- Examining placing 8 bits in match overhead
-~~~~~~~~~~~~~~~~~~~~~
- Examining placing 16 bits in match overhead
-~~~~~~~~~~~~~~~~~~~~~
- Examining placing 24 bits in match overhead
-~~~~~~~~~~~~~~~~~~~~~
- Examining placing 32 bits in match overhead
-
-##########################################
-
-Best Ram Usage is 97 rams
-Best Immediate placement is 0 bits
 
 ##########################################
   Call to decide_action_data_placement(stage=0, table=process_packet_out_table)
@@ -821,7 +699,7 @@
 Allocating Action Logical Table ID 0 in stage 1
 
 ----------------------------------------------
-Call to Allocate P4 Table with table ingress_port_counter, number_entries = 510, table id = None, and match type = exact
+Call to Allocate P4 Table with table ingress_port_counter, number_entries = 512, table id = None, and match type = exact
   Allocating in stage 1
 ----------------------------------------------
 
@@ -850,23 +728,185 @@
 Logical Table ID in stage 1 was not supplied by table placement for table ingress_port_count_table.
 Allocating Logical Table ID 0 in stage 1
 Allocating Table Type ID 0 of type exact in stage 1
-Match Overhead:
-  Field --version_valid-- [3:0] (4 bits)
-  Field --instruction_address-- [1:0] (2 bits)
-  Field --statistics_pointer-- [19:0] (20 bits)
+Too few bits (9) specified to address ingress_port_counter from table ingress_port_count_table.  10 are needed.
+The most significant 1 bit will be padded with zeros.
+----------------------------------------------
+ Call to allocate_hash_distribution_units with
+    hash_algorithm = identity
+    hash_output_width = 10
+    hash_bits_need = 10
+    output_hash_bit_start = 0
+    immediate_bit_positions = None
+    used_for = Statistics Address
+----------------------------------------------
+available_tuples_sorted_by_parity_bytes_available = [(0, 3, 0), (1, 3, 0)]
+available_tuples_split_sorted_by_parity_bytes_available = []
+Allocate fresh exact match group / hash group
+Allocating: Byte 0 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ig_intr_md.ingress_port[7:0]}.
+Allocating: Byte 1 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {unused[6:0], ig_intr_md.ingress_port[8:8]}.
+-------------------
+Call to _allocate_hash_distribution_and_hash_bits
+    p4_table = ingress_port_count_table
+    used_for = Statistics Address
+    hash_distribution_hash_id = 0
+    hash_group_id = 0
+    hash_bits_in_units = OrderedDict([(0, [0, 1, 2, 3, 4, 5, 6, 7, 8, 9])])
+    address_left_shift = 1
+-------------------
+Allocating Hash Distribution Group 0/0 for table ingress_port_count_table in stage 1.
+Allocating Hash Bit 0 in hash match group 0 for table ingress_port_count_table in stage 1.
+Allocating Hash Bit 1 in hash match group 0 for table ingress_port_count_table in stage 1.
+Allocating Hash Bit 2 in hash match group 0 for table ingress_port_count_table in stage 1.
+Allocating Hash Bit 3 in hash match group 0 for table ingress_port_count_table in stage 1.
+Allocating Hash Bit 4 in hash match group 0 for table ingress_port_count_table in stage 1.
+Allocating Hash Bit 5 in hash match group 0 for table ingress_port_count_table in stage 1.
+Allocating Hash Bit 6 in hash match group 0 for table ingress_port_count_table in stage 1.
+Allocating Hash Bit 7 in hash match group 0 for table ingress_port_count_table in stage 1.
+Allocating Hash Bit 8 in hash match group 0 for table ingress_port_count_table in stage 1.
+Allocating Hash Bit 9 in hash match group 0 for table ingress_port_count_table in stage 1.
+seed = 0x0
+set the seed to be [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
+Hash Function 0
+hash_bit_0 = ig_intr_md.ingress_port[0] ^ 0
+hash_bit_1 = ig_intr_md.ingress_port[1] ^ 0
+hash_bit_2 = ig_intr_md.ingress_port[2] ^ 0
+hash_bit_3 = ig_intr_md.ingress_port[3] ^ 0
+hash_bit_4 = ig_intr_md.ingress_port[4] ^ 0
+hash_bit_5 = ig_intr_md.ingress_port[5] ^ 0
+hash_bit_6 = ig_intr_md.ingress_port[6] ^ 0
+hash_bit_7 = ig_intr_md.ingress_port[7] ^ 0
+hash_bit_8 = ig_intr_md.ingress_port[8] ^ 0
+hash_bit_9 = 0
+hash_bit_10 = 0
+hash_bit_11 = 0
+hash_bit_12 = 0
+hash_bit_13 = 0
+hash_bit_14 = 0
+hash_bit_15 = 0
+hash_bit_16 = 0
+hash_bit_17 = 0
+hash_bit_18 = 0
+hash_bit_19 = 0
+hash_bit_20 = 0
+hash_bit_21 = 0
+hash_bit_22 = 0
+hash_bit_23 = 0
+hash_bit_24 = 0
+hash_bit_25 = 0
+hash_bit_26 = 0
+hash_bit_27 = 0
+hash_bit_28 = 0
+hash_bit_29 = 0
+hash_bit_30 = 0
+hash_bit_31 = 0
+hash_bit_32 = 0
+hash_bit_33 = 0
+hash_bit_34 = 0
+hash_bit_35 = 0
+hash_bit_36 = 0
+hash_bit_37 = 0
+hash_bit_38 = 0
+hash_bit_39 = 0
+hash_bit_40 = 0
+hash_bit_41 = 0
+hash_bit_42 = 0
+hash_bit_43 = 0
+hash_bit_44 = 0
+hash_bit_45 = 0
+hash_bit_46 = 0
+hash_bit_47 = 0
+hash_bit_48 = 0
+hash_bit_49 = 0
+hash_bit_50 = 0
+hash_bit_51 = 0
 
-Logical Table ID in stage 1 was not supplied by table placement for table ingress_port_count_table.
-Allocating Logical Table ID 0 in stage 1
-Allocating Table Type ID 0 of type exact in stage 1
-Allocating: Byte 0 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ig_intr_md_for_tm.ucast_egress_port[7:0]}.
-Allocating: Byte 1 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {unused[6:0], ig_intr_md_for_tm.ucast_egress_port[8:8]}.
+Allocating: Byte 2 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ig_intr_md_for_tm.ucast_egress_port[7:0]}.
+Allocating: Byte 3 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {unused[6:0], ig_intr_md_for_tm.ucast_egress_port[8:8]}.
 Match Table Resource Request is:
 SRAM Resource Request for table ingress_port_count_table (of type match), with 0 ways wants 0 rams.
-Allocating: Byte 0 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ig_intr_md_for_tm.ucast_egress_port[7:0]}.
-Allocating: Byte 1 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {unused[6:0], ig_intr_md_for_tm.ucast_egress_port[8:8]}.
+Allocating: Byte 2 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ig_intr_md_for_tm.ucast_egress_port[7:0]}.
+Allocating: Byte 3 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {unused[6:0], ig_intr_md_for_tm.ucast_egress_port[8:8]}.
 No micro instructions needed for action count_ingress executed from table ingress_port_count_table.
 Allocating Action ALU 0 (32 bits) in stage 1 for match table ingress_port_count_table's action count_ingress
 Allocating VLIW Instruction : 0 in stage 1 for match table ingress_port_count_table's action count_ingress
+My hash-action stage table is 
+StageHashActionTable
+  stage_number: 1
+  number_entries 1024
+  pack_format:
+    Pack Format:
+  table_word_width: 0
+  memory_word_width: 0
+  entries_per_table_word: 0
+  number_memory_units_per_table_word: 0
+  entry_list: [
+]
+
+  p4_table: 'ingress_port_count_table'
+  stage_table_handle: 0
+  stage_table_type_handle: 0
+  stage_gateway_table: StageGatewayTable
+  stage_number: 1
+  number_entries 0
+  memory_resource_allocation GatewayMemoryResourceAllocation:
+  memory_type: gateway
+  memory_units: [[15]]
+  home_row: -1
+  stateful_action_bus_output: None
+
+  p4_table: '_condition_2'
+
+  match_group_resource_allocation:
+  vliw_resource_allocation:
+   action handle 536870914 maps to:
+VliwResourceAllocation:
+  match_table_name: ingress_port_count_table
+  p4_action: count_ingress
+  address_to_use: 1
+  full_address: 64
+  vliw_instruction_number: 0
+  color: 0
+  direction: ingress
+  micro_instructions:
+
+  action_to_vliw_mapping:
+    action handle 536870914 maps to vliw instruction 0, color 0, and direction ingress and is found in instruction address 1
+  hash_distribution_usages:
+    MAU Hash Distribution Resource Usage for P4 table ingress_port_count_table
+  exact_match_group_resource_allocation : HashMatchGroupResourceAllocation:
+  match_groups: [(0, 16)]
+  match_group_key_bit_width: 9
+  match_group_phv_bit_scrambling: OrderedDict([(('ig_intr_md.ingress_port', 0), 0), (('ig_intr_md.ingress_port', 1), 1), (('ig_intr_md.ingress_port', 2), 2), (('ig_intr_md.ingress_port', 3), 3), (('ig_intr_md.ingress_port', 4), 4), (('ig_intr_md.ingress_port', 5), 5), (('ig_intr_md.ingress_port', 6), 6), (('ig_intr_md.ingress_port', 7), 7), (('ig_intr_md.ingress_port', 8), 8)])
+    ('ig_intr_md.ingress_port', 0) -> 0
+    ('ig_intr_md.ingress_port', 1) -> 1
+    ('ig_intr_md.ingress_port', 2) -> 2
+    ('ig_intr_md.ingress_port', 3) -> 3
+    ('ig_intr_md.ingress_port', 4) -> 4
+    ('ig_intr_md.ingress_port', 5) -> 5
+    ('ig_intr_md.ingress_port', 6) -> 6
+    ('ig_intr_md.ingress_port', 7) -> 7
+    ('ig_intr_md.ingress_port', 8) -> 8
+  hash_function_dictionary: OrderedDict([(0, <p4c_tofino.target.tofino.llir.mau.stage.resources.hash_function.HashFunction object at 0x7f676a5e4cd0>)])
+  hash_group_id: 0
+  seed: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
+  table_direction: ingress
+
+  hash_distribution_resource_allocations :
+Hash Distribution:
+  source_hash_group : 0
+  hash_distribution_hash_id : 0
+  hash_distribution_group_id : 0
+  hash_distribution_used_for : Statistics Address
+  table_direction : ingress
+  bits_to_use : [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+  left_shift : 1
+  expanded_lo : False
+  expanded_hi : False
+  expanded_bit_width : 0
+  immediate_position : unused
+
+
+
 
 ----------------------------------------------
 Call to Allocate P4 Table with table egress_port_count_table__action__, number_entries = 1024, table id = None, and match type = exact
@@ -906,7 +946,7 @@
 Allocating Action Logical Table ID 1 in stage 1
 
 ----------------------------------------------
-Call to Allocate P4 Table with table egress_port_counter, number_entries = 510, table id = None, and match type = exact
+Call to Allocate P4 Table with table egress_port_counter, number_entries = 512, table id = None, and match type = exact
   Allocating in stage 1
 ----------------------------------------------
 
@@ -926,8 +966,8 @@
       ram_word_select_bits : 0
       ram_enable_select_bits : 0
 
-Allocating: Byte 0 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ig_intr_md_for_tm.ucast_egress_port[7:0]}.
-Allocating: Byte 1 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {unused[6:0], ig_intr_md_for_tm.ucast_egress_port[8:8]}.
+Allocating: Byte 2 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ig_intr_md_for_tm.ucast_egress_port[7:0]}.
+Allocating: Byte 3 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {unused[6:0], ig_intr_md_for_tm.ucast_egress_port[8:8]}.
 
 ----------------------------------------------
 Call to Allocate P4 Table with table egress_port_count_table, number_entries = 1024, table id = None, and match type = exact
@@ -937,22 +977,185 @@
 Logical Table ID in stage 1 was not supplied by table placement for table egress_port_count_table.
 Allocating Logical Table ID 1 in stage 1
 Allocating Table Type ID 1 of type exact in stage 1
-Match Overhead:
-  Field --version_valid-- [3:0] (4 bits)
-  Field --statistics_pointer-- [19:0] (20 bits)
+Too few bits (9) specified to address egress_port_counter from table egress_port_count_table.  10 are needed.
+The most significant 1 bit will be padded with zeros.
+----------------------------------------------
+ Call to allocate_hash_distribution_units with
+    hash_algorithm = identity
+    hash_output_width = 10
+    hash_bits_need = 10
+    output_hash_bit_start = 0
+    immediate_bit_positions = None
+    used_for = Statistics Address
+----------------------------------------------
+available_tuples_sorted_by_parity_bytes_available = [(1, 3, 0), (0, 2, 4)]
+available_tuples_split_sorted_by_parity_bytes_available = []
+Allocate fresh exact match group / hash group
+Allocating: Byte 8 is of type exact and member of group 0 (parity group 1) with 16 bytes. for {ig_intr_md_for_tm.ucast_egress_port[7:0]}.
+Allocating: Byte 9 is of type exact and member of group 0 (parity group 1) with 16 bytes. for {unused[6:0], ig_intr_md_for_tm.ucast_egress_port[8:8]}.
+-------------------
+Call to _allocate_hash_distribution_and_hash_bits
+    p4_table = egress_port_count_table
+    used_for = Statistics Address
+    hash_distribution_hash_id = 1
+    hash_group_id = 1
+    hash_bits_in_units = OrderedDict([(0, [0, 1, 2, 3, 4, 5, 6, 7, 8, 9])])
+    address_left_shift = 1
+-------------------
+Allocating Hash Distribution Group 1/0 for table egress_port_count_table in stage 1.
+Allocating Hash Bit 0 in hash match group 1 for table egress_port_count_table in stage 1.
+Allocating Hash Bit 1 in hash match group 1 for table egress_port_count_table in stage 1.
+Allocating Hash Bit 2 in hash match group 1 for table egress_port_count_table in stage 1.
+Allocating Hash Bit 3 in hash match group 1 for table egress_port_count_table in stage 1.
+Allocating Hash Bit 4 in hash match group 1 for table egress_port_count_table in stage 1.
+Allocating Hash Bit 5 in hash match group 1 for table egress_port_count_table in stage 1.
+Allocating Hash Bit 6 in hash match group 1 for table egress_port_count_table in stage 1.
+Allocating Hash Bit 7 in hash match group 1 for table egress_port_count_table in stage 1.
+Allocating Hash Bit 8 in hash match group 1 for table egress_port_count_table in stage 1.
+Allocating Hash Bit 9 in hash match group 1 for table egress_port_count_table in stage 1.
+seed = 0x0
+set the seed to be [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
+Hash Function 0
+hash_bit_0 = ig_intr_md_for_tm.ucast_egress_port[0] ^ 0
+hash_bit_1 = ig_intr_md_for_tm.ucast_egress_port[1] ^ 0
+hash_bit_2 = ig_intr_md_for_tm.ucast_egress_port[2] ^ 0
+hash_bit_3 = ig_intr_md_for_tm.ucast_egress_port[3] ^ 0
+hash_bit_4 = ig_intr_md_for_tm.ucast_egress_port[4] ^ 0
+hash_bit_5 = ig_intr_md_for_tm.ucast_egress_port[5] ^ 0
+hash_bit_6 = ig_intr_md_for_tm.ucast_egress_port[6] ^ 0
+hash_bit_7 = ig_intr_md_for_tm.ucast_egress_port[7] ^ 0
+hash_bit_8 = ig_intr_md_for_tm.ucast_egress_port[8] ^ 0
+hash_bit_9 = 0
+hash_bit_10 = 0
+hash_bit_11 = 0
+hash_bit_12 = 0
+hash_bit_13 = 0
+hash_bit_14 = 0
+hash_bit_15 = 0
+hash_bit_16 = 0
+hash_bit_17 = 0
+hash_bit_18 = 0
+hash_bit_19 = 0
+hash_bit_20 = 0
+hash_bit_21 = 0
+hash_bit_22 = 0
+hash_bit_23 = 0
+hash_bit_24 = 0
+hash_bit_25 = 0
+hash_bit_26 = 0
+hash_bit_27 = 0
+hash_bit_28 = 0
+hash_bit_29 = 0
+hash_bit_30 = 0
+hash_bit_31 = 0
+hash_bit_32 = 0
+hash_bit_33 = 0
+hash_bit_34 = 0
+hash_bit_35 = 0
+hash_bit_36 = 0
+hash_bit_37 = 0
+hash_bit_38 = 0
+hash_bit_39 = 0
+hash_bit_40 = 0
+hash_bit_41 = 0
+hash_bit_42 = 0
+hash_bit_43 = 0
+hash_bit_44 = 0
+hash_bit_45 = 0
+hash_bit_46 = 0
+hash_bit_47 = 0
+hash_bit_48 = 0
+hash_bit_49 = 0
+hash_bit_50 = 0
+hash_bit_51 = 0
 
-Logical Table ID in stage 1 was not supplied by table placement for table egress_port_count_table.
-Allocating Logical Table ID 1 in stage 1
-Allocating Table Type ID 1 of type exact in stage 1
-Allocating: Byte 0 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ig_intr_md_for_tm.ucast_egress_port[7:0]}.
-Allocating: Byte 1 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {unused[6:0], ig_intr_md_for_tm.ucast_egress_port[8:8]}.
+Allocating: Byte 2 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ig_intr_md_for_tm.ucast_egress_port[7:0]}.
+Allocating: Byte 3 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {unused[6:0], ig_intr_md_for_tm.ucast_egress_port[8:8]}.
 Match Table Resource Request is:
 SRAM Resource Request for table egress_port_count_table (of type match), with 0 ways wants 0 rams.
-Allocating: Byte 0 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ig_intr_md_for_tm.ucast_egress_port[7:0]}.
-Allocating: Byte 1 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {unused[6:0], ig_intr_md_for_tm.ucast_egress_port[8:8]}.
+Allocating: Byte 2 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ig_intr_md_for_tm.ucast_egress_port[7:0]}.
+Allocating: Byte 3 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {unused[6:0], ig_intr_md_for_tm.ucast_egress_port[8:8]}.
 No micro instructions needed for action count_egress executed from table egress_port_count_table.
 Allocating Action ALU 0 (32 bits) in stage 1 for match table egress_port_count_table's action count_egress
 Allocating VLIW Instruction : 0 in stage 1 for match table egress_port_count_table's action count_egress
+My hash-action stage table is 
+StageHashActionTable
+  stage_number: 1
+  number_entries 1024
+  pack_format:
+    Pack Format:
+  table_word_width: 0
+  memory_word_width: 0
+  entries_per_table_word: 0
+  number_memory_units_per_table_word: 0
+  entry_list: [
+]
+
+  p4_table: 'egress_port_count_table'
+  stage_table_handle: 1
+  stage_table_type_handle: 1
+  stage_gateway_table: StageGatewayTable
+  stage_number: 1
+  number_entries 0
+  memory_resource_allocation GatewayMemoryResourceAllocation:
+  memory_type: gateway
+  memory_units: [[14]]
+  home_row: -1
+  stateful_action_bus_output: None
+
+  p4_table: 'egress_port_count_table_always_true_condition'
+
+  match_group_resource_allocation:
+  vliw_resource_allocation:
+   action handle 536870916 maps to:
+VliwResourceAllocation:
+  match_table_name: egress_port_count_table
+  p4_action: count_egress
+  address_to_use: 0
+  full_address: 64
+  vliw_instruction_number: 0
+  color: 0
+  direction: ingress
+  micro_instructions:
+
+  action_to_vliw_mapping:
+    action handle 536870916 maps to vliw instruction 0, color 0, and direction ingress and is found in instruction address 0
+  hash_distribution_usages:
+    MAU Hash Distribution Resource Usage for P4 table egress_port_count_table
+  exact_match_group_resource_allocation : HashMatchGroupResourceAllocation:
+  match_groups: [(0, 16)]
+  match_group_key_bit_width: 73
+  match_group_phv_bit_scrambling: OrderedDict([(('ig_intr_md_for_tm.ucast_egress_port', 0), 64), (('ig_intr_md_for_tm.ucast_egress_port', 1), 65), (('ig_intr_md_for_tm.ucast_egress_port', 2), 66), (('ig_intr_md_for_tm.ucast_egress_port', 3), 67), (('ig_intr_md_for_tm.ucast_egress_port', 4), 68), (('ig_intr_md_for_tm.ucast_egress_port', 5), 69), (('ig_intr_md_for_tm.ucast_egress_port', 6), 70), (('ig_intr_md_for_tm.ucast_egress_port', 7), 71), (('ig_intr_md_for_tm.ucast_egress_port', 8), 72)])
+    ('ig_intr_md_for_tm.ucast_egress_port', 0) -> 64
+    ('ig_intr_md_for_tm.ucast_egress_port', 1) -> 65
+    ('ig_intr_md_for_tm.ucast_egress_port', 2) -> 66
+    ('ig_intr_md_for_tm.ucast_egress_port', 3) -> 67
+    ('ig_intr_md_for_tm.ucast_egress_port', 4) -> 68
+    ('ig_intr_md_for_tm.ucast_egress_port', 5) -> 69
+    ('ig_intr_md_for_tm.ucast_egress_port', 6) -> 70
+    ('ig_intr_md_for_tm.ucast_egress_port', 7) -> 71
+    ('ig_intr_md_for_tm.ucast_egress_port', 8) -> 72
+  hash_function_dictionary: OrderedDict([(0, <p4c_tofino.target.tofino.llir.mau.stage.resources.hash_function.HashFunction object at 0x7f676aee2590>)])
+  hash_group_id: 1
+  seed: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
+  table_direction: ingress
+
+  hash_distribution_resource_allocations :
+Hash Distribution:
+  source_hash_group : 1
+  hash_distribution_hash_id : 1
+  hash_distribution_group_id : 0
+  hash_distribution_used_for : Statistics Address
+  table_direction : ingress
+  bits_to_use : [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+  left_shift : 1
+  expanded_lo : False
+  expanded_hi : False
+  expanded_bit_width : 0
+  immediate_position : unused
+
+
+
 Cannot find table object for 'process_packet_out_table_always_true_condition'.
 Cannot find table object for 'egress_port_count_table_always_true_condition'.
 Cannot find table object for 'process_packet_out_table_always_true_condition'.
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/logs/mau.resources.log b/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/logs/mau.resources.log
index 94aa4c1..40c1f20 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/logs/mau.resources.log
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/logs/mau.resources.log
@@ -1,7 +1,7 @@
 +---------------------------------------------------------------------+
 |  Log file: mau.resources.log                                        |
 |  Compiler version: 5.1.0 (fca32d1)                                  |
-|  Created on: Fri Sep  8 08:23:45 2017                               |
+|  Created on: Wed Sep 13 00:58:11 2017                               |
 +---------------------------------------------------------------------+
 
 
@@ -9,7 +9,7 @@
 | Stage Number | Exact Match Input xbar | Ternary Match Input xbar | Hash Bit | Hash Dist Unit | Gateway | SRAM | Map RAM | TCAM | VLIW Instr | Meter ALU | Stats ALU | Stash | Action Data Bus Bytes | 8-bit Action Slots | 16-bit Action Slots | 32-bit Action Slots | Logical TableID |
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 |      0       |           1            |            16            |    1     |       0        |    2    |  3   |    3    |  3   |     3      |     0     |     1     |   0   |           4           |         0          |          2          |          1          |        2        |
-|      1       |           2            |            0             |    9     |       0        |    2    |  4   |    4    |  0   |     1      |     0     |     2     |   0   |           0           |         0          |          0          |          0          |        2        |
+|      1       |           6            |            0             |    29    |       2        |    2    |  4   |    4    |  0   |     1      |     0     |     2     |   0   |           0           |         0          |          0          |          0          |        2        |
 |      2       |           0            |            0             |    0     |       0        |    0    |  0   |    0    |  0   |     0      |     0     |     0     |   0   |           0           |         0          |          0          |          0          |        0        |
 |      3       |           0            |            0             |    0     |       0        |    0    |  0   |    0    |  0   |     0      |     0     |     0     |   0   |           0           |         0          |          0          |          0          |        0        |
 |      4       |           0            |            0             |    0     |       0        |    0    |  0   |    0    |  0   |     0      |     0     |     0     |   0   |           0           |         0          |          0          |          0          |        0        |
@@ -21,7 +21,7 @@
 |      10      |           0            |            0             |    0     |       0        |    0    |  0   |    0    |  0   |     0      |     0     |     0     |   0   |           0           |         0          |          0          |          0          |        0        |
 |      11      |           0            |            0             |    0     |       0        |    0    |  0   |    0    |  0   |     0      |     0     |     0     |   0   |           0           |         0          |          0          |          0          |        0        |
 |              |                        |                          |          |                |         |      |         |      |            |           |           |       |                       |                    |                     |                     |                 |
-|    Totals    |           3            |            16            |    10    |       0        |    4    |  7   |    7    |  3   |     4      |     0     |     3     |   0   |           4           |         0          |          2          |          1          |        4        |
+|    Totals    |           7            |            16            |    30    |       2        |    4    |  7   |    7    |  3   |     4      |     0     |     3     |   0   |           4           |         0          |          2          |          1          |        4        |
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 
 
@@ -29,7 +29,7 @@
 | Stage Number | Exact Match Input xbar | Ternary Match Input xbar | Hash Bit | Hash Dist Unit | Gateway |  SRAM | Map RAM |  TCAM  | VLIW Instr | Meter ALU | Stats ALU | Stash | Action Data Bus Bytes | 8-bit Action Slots | 16-bit Action Slots | 32-bit Action Slots | Logical TableID |
 ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 |      0       |         0.78%          |          24.24%          |  0.24%   |     0.00%      |  12.50% | 3.75% |  6.25%  | 12.50% |   9.38%    |   0.00%   |   25.00%  | 0.00% |         3.12%         |       0.00%        |        6.25%        |        3.12%        |      12.50%     |
-|      1       |         1.56%          |          0.00%           |  2.16%   |     0.00%      |  12.50% | 5.00% |  8.33%  | 0.00%  |   3.12%    |   0.00%   |   50.00%  | 0.00% |         0.00%         |       0.00%        |        0.00%        |        0.00%        |      12.50%     |
+|      1       |         4.69%          |          0.00%           |  6.97%   |     33.33%     |  12.50% | 5.00% |  8.33%  | 0.00%  |   3.12%    |   0.00%   |   50.00%  | 0.00% |         0.00%         |       0.00%        |        0.00%        |        0.00%        |      12.50%     |
 |      2       |         0.00%          |          0.00%           |  0.00%   |     0.00%      |  0.00%  | 0.00% |  0.00%  | 0.00%  |   0.00%    |   0.00%   |   0.00%   | 0.00% |         0.00%         |       0.00%        |        0.00%        |        0.00%        |      0.00%      |
 |      3       |         0.00%          |          0.00%           |  0.00%   |     0.00%      |  0.00%  | 0.00% |  0.00%  | 0.00%  |   0.00%    |   0.00%   |   0.00%   | 0.00% |         0.00%         |       0.00%        |        0.00%        |        0.00%        |      0.00%      |
 |      4       |         0.00%          |          0.00%           |  0.00%   |     0.00%      |  0.00%  | 0.00% |  0.00%  | 0.00%  |   0.00%    |   0.00%   |   0.00%   | 0.00% |         0.00%         |       0.00%        |        0.00%        |        0.00%        |      0.00%      |
@@ -41,7 +41,7 @@
 |      10      |         0.00%          |          0.00%           |  0.00%   |     0.00%      |  0.00%  | 0.00% |  0.00%  | 0.00%  |   0.00%    |   0.00%   |   0.00%   | 0.00% |         0.00%         |       0.00%        |        0.00%        |        0.00%        |      0.00%      |
 |      11      |         0.00%          |          0.00%           |  0.00%   |     0.00%      |  0.00%  | 0.00% |  0.00%  | 0.00%  |   0.00%    |   0.00%   |   0.00%   | 0.00% |         0.00%         |       0.00%        |        0.00%        |        0.00%        |      0.00%      |
 |              |                        |                          |          |                |         |       |         |        |            |           |           |       |                       |                    |                     |                     |                 |
-|   Average    |         0.20%          |          2.02%           |  0.20%   |     0.00%      |  2.08%  | 0.73% |  1.22%  | 1.04%  |   1.04%    |   0.00%   |   6.25%   | 0.00% |         0.26%         |       0.00%        |        0.52%        |        0.26%        |      2.08%      |
+|   Average    |         0.46%          |          2.02%           |  0.60%   |     2.78%      |  2.08%  | 0.73% |  1.22%  | 1.04%  |   1.04%    |   0.00%   |   6.25%   | 0.00% |         0.26%         |       0.00%        |        0.52%        |        0.26%        |      2.08%      |
 ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 
 
@@ -60,9 +60,9 @@
 |           table0_counter           |   0    |    0     |  0   |    0     |  2   |   0   |  2   |   0    |   0   |
 |            _condition_2            |   1    |    2     |  9   |    1     |  0   |   0   |  0   |   0    |   0   |
 | ingress_port_count_table__action__ |   1    |    0     |  0   |    0     |  0   |   0   |  0   |   0    |   0   |
-|      ingress_port_count_table      |   1    |    0     |  0   |    0     |  0   |   0   |  0   |   0    |   1   |
+|      ingress_port_count_table      |   1    |    2     |  10  |    0     |  0   |   0   |  0   |   0    |   1   |
 | egress_port_count_table__action__  |   1    |    0     |  0   |    0     |  0   |   0   |  0   |   0    |   0   |
-|      egress_port_count_table       |   1    |    0     |  0   |    1     |  0   |   0   |  0   |   0    |   1   |
+|      egress_port_count_table       |   1    |    2     |  10  |    1     |  0   |   0   |  0   |   0    |   1   |
 |        ingress_port_counter        |   1    |    0     |  0   |    0     |  2   |   0   |  2   |   0    |   0   |
 |        egress_port_counter         |   1    |    0     |  0   |    0     |  2   |   0   |  2   |   0    |   0   |
 --------------------------------------------------------------------------------------------------------------------
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/logs/mau.rf.log b/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/logs/mau.rf.log
index 69e271f..199843c 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/logs/mau.rf.log
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/logs/mau.rf.log
@@ -1,6 +1,6 @@
 +---------------------------------------------------------------------+
 |  Log file: mau.rf.log                                               |
 |  Compiler version: 5.1.0 (fca32d1)                                  |
-|  Created on: Fri Sep  8 08:23:45 2017                               |
+|  Created on: Wed Sep 13 00:58:11 2017                               |
 +---------------------------------------------------------------------+
 
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/logs/mau.sram.log b/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/logs/mau.sram.log
index 9d68a7c..ad41f60 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/logs/mau.sram.log
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/logs/mau.sram.log
@@ -1,7 +1,7 @@
 +---------------------------------------------------------------------+
 |  Log file: mau.sram.log                                             |
 |  Compiler version: 5.1.0 (fca32d1)                                  |
-|  Created on: Fri Sep  8 08:23:45 2017                               |
+|  Created on: Wed Sep 13 00:58:11 2017                               |
 +---------------------------------------------------------------------+
 
 
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/logs/mau.tcam.log b/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/logs/mau.tcam.log
index 601ac55..2fa5a20 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/logs/mau.tcam.log
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/logs/mau.tcam.log
@@ -1,7 +1,7 @@
 +---------------------------------------------------------------------+
 |  Log file: mau.tcam.log                                             |
 |  Compiler version: 5.1.0 (fca32d1)                                  |
-|  Created on: Fri Sep  8 08:23:45 2017                               |
+|  Created on: Wed Sep 13 00:58:11 2017                               |
 +---------------------------------------------------------------------+
 
 
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/logs/mau.tp.log b/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/logs/mau.tp.log
index e3bcc21..5ce958d 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/logs/mau.tp.log
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/logs/mau.tp.log
@@ -1,7 +1,7 @@
 +---------------------------------------------------------------------+
 |  Log file: mau.tp.log                                               |
 |  Compiler version: 5.1.0 (fca32d1)                                  |
-|  Created on: Fri Sep  8 08:23:45 2017                               |
+|  Created on: Wed Sep 13 00:58:11 2017                               |
 +---------------------------------------------------------------------+
 
 ----- Stage 0 ------
@@ -31,10 +31,10 @@
 ------------------------------------------
  Running Table Placement 4
 ------------------------------------------
-Cannot use hash action for table ingress_port_count_table.
-Cannot use hash-action for table ingress_port_count_table with no key because the number of entries required by side-effect table ingress_port_counter is not a power of 2 -- 510.
-Cannot use hash action for table egress_port_count_table.
-Cannot use hash-action for table egress_port_count_table with no key because the number of entries required by side-effect table egress_port_counter is not a power of 2 -- 510.
+Can use hash action for table ingress_port_count_table???  True
+Decided that match table ingress_port_count_table is more efficiently allocated using hash-action to ingress_port_counter.
+Can use hash action for table egress_port_count_table???  True
+Decided that match table egress_port_count_table is more efficiently allocated using hash-action to egress_port_counter.
 Cannot use hash action for table process_packet_out_table.
 Table process_packet_out_table has no side effect tables.
 Cannot use hash action for table table0.
@@ -42,8 +42,8 @@
 ------------------------------------------
  Table Groups
 ------------------------------------------
-Table Grouping (ingress) with match table ingress_port_count_table (1024) [ingress_port_count_table__action__ (1024), ingress_port_counter (510)]
-Table Grouping (ingress) with match table egress_port_count_table (1024) [egress_port_count_table__action__ (1024), egress_port_counter (510)]
+Table Grouping (ingress) with match table ingress_port_count_table (1024) [ingress_port_count_table__action__ (1024), ingress_port_counter (512)]
+Table Grouping (ingress) with match table egress_port_count_table (1024) [egress_port_count_table__action__ (1024), egress_port_counter (512)]
 Table Grouping (ingress) with match table process_packet_out_table (1024) [process_packet_out_table__action__ (1024)]
 Table Grouping (ingress) with match table table0 (512) [table0__action__ (512), table0_counter (512)]
 Table Grouping (ingress) with condition table _condition_0 (0) []
@@ -81,13 +81,13 @@
 
 Nodes could place:
   _condition_2 (4)
->> choose Table Grouping (ingress) with match table ingress_port_count_table (1024) [ingress_port_count_table__action__ (1024), ingress_port_counter (510)]
+>> choose Table Grouping (ingress) with match table ingress_port_count_table (1024) [ingress_port_count_table__action__ (1024), ingress_port_counter (512)]
 Earliest stage can place: 1
 Placing table: ingress_port_count_table__action__ with 1024 entries
-Placing table: ingress_port_counter with 510 entries
+Placing table: ingress_port_counter with 512 entries
 Table ingress_port_count_table__action__ with 0 entries is directly referenced
 Table ingress_port_counter with 4096 entries is indirectly referenced
-Match Table ingress_port_count_table has a total of 1 entries in stage 1
+Match Table ingress_port_count_table has a total of 1024 entries in stage 1
   Direct mapped table ingress_port_count_table__action__ has 0 entries
 >> set ingress_port_count_table (5) to placed
 >> set _condition_2 (4) to placed
@@ -96,15 +96,15 @@
   egress_port_count_table (6)
 egress_port_count_table and _condition_2 not mutually exclusive
 egress_port_count_table and ingress_port_count_table not mutually exclusive
->> choose Table Grouping (ingress) with match table egress_port_count_table (1024) [egress_port_count_table__action__ (1024), egress_port_counter (510)]
+>> choose Table Grouping (ingress) with match table egress_port_count_table (1024) [egress_port_count_table__action__ (1024), egress_port_counter (512)]
 Earliest stage can place: 1
 egress_port_count_table and _condition_2 not mutually exclusive
 egress_port_count_table and ingress_port_count_table not mutually exclusive
 Placing table: egress_port_count_table__action__ with 1024 entries
-Placing table: egress_port_counter with 510 entries
+Placing table: egress_port_counter with 512 entries
 Table egress_port_count_table__action__ with 0 entries is directly referenced
 Table egress_port_counter with 4096 entries is indirectly referenced
-Match Table egress_port_count_table has a total of 1 entries in stage 1
+Match Table egress_port_count_table has a total of 1024 entries in stage 1
   Direct mapped table egress_port_count_table__action__ has 0 entries
 >> set egress_port_count_table (6) to placed
 
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/logs/pa.characterize.log b/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/logs/pa.characterize.log
index 64f4f4d..8b718f1 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/logs/pa.characterize.log
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/logs/pa.characterize.log
@@ -1,7 +1,7 @@
 +---------------------------------------------------------------------+
 |  Log file: pa.characterize.log                                      |
 |  Compiler version: 5.1.0 (fca32d1)                                  |
-|  Created on: Fri Sep  8 08:23:45 2017                               |
+|  Created on: Wed Sep 13 00:58:11 2017                               |
 +---------------------------------------------------------------------+
 
 Program: default
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/logs/pa.constraints.log b/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/logs/pa.constraints.log
index 6a0cbe3..0178132 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/logs/pa.constraints.log
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/logs/pa.constraints.log
@@ -1,7 +1,7 @@
 +---------------------------------------------------------------------+
 |  Log file: pa.constraints.log                                       |
 |  Compiler version: 5.1.0 (fca32d1)                                  |
-|  Created on: Fri Sep  8 08:23:45 2017                               |
+|  Created on: Wed Sep 13 00:58:11 2017                               |
 +---------------------------------------------------------------------+
 
 To populate this log file, include --print-pa-constraints as a compiler argument.
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/logs/pa.liveness.log b/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/logs/pa.liveness.log
index 0c96580..ec9c0e6 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/logs/pa.liveness.log
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/logs/pa.liveness.log
@@ -1,6 +1,6 @@
 +---------------------------------------------------------------------+
 |  Log file: pa.liveness.log                                          |
 |  Compiler version: 5.1.0 (fca32d1)                                  |
-|  Created on: Fri Sep  8 08:23:45 2017                               |
+|  Created on: Wed Sep 13 00:58:11 2017                               |
 +---------------------------------------------------------------------+
 
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/logs/pa.log b/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/logs/pa.log
index 253cf9e..ad01943 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/logs/pa.log
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/logs/pa.log
@@ -1,7 +1,7 @@
 +---------------------------------------------------------------------+
 |  Log file: pa.log                                                   |
 |  Compiler version: 5.1.0 (fca32d1)                                  |
-|  Created on: Fri Sep  8 08:23:45 2017                               |
+|  Created on: Wed Sep 13 00:58:11 2017                               |
 +---------------------------------------------------------------------+
 
 HLIR Version: 0.10.5
@@ -549,7 +549,7 @@
   parse_pkt_in and parse_pkt_out are exclusive parse states
   parse_tcp and parse_udp are exclusive parse states
 
->>Event 'pa_init' at time 1504859028.15
+>>Event 'pa_init' at time 1505264293.79
    Took 0.01 seconds
 --------------------------------------------
 PHV MAU Groups: 90
@@ -827,7 +827,7 @@
   eg_intr_md.egress_cos <3 bits egress parsed imeta>
 
 
->>Event 'pa_resv' at time 1504859028.15
+>>Event 'pa_resv' at time 1505264293.79
    Took 0.00 seconds
 
 -----------------------------------------------
@@ -869,7 +869,7 @@
   Group 2 32 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 12 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv32
   Group 3 32 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 12 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv48
 Reserving 32-bit container for ingress: phv0
->>Event 'pa_bridge' at time 1504859028.19
+>>Event 'pa_bridge' at time 1505264293.83
    Took 0.04 seconds
 
 -----------------------------------------------
@@ -922,7 +922,7 @@
 |     Overall total      |    1 (0.30%)    | 32 (0.52%) |      6144      |
 ---------------------------------------------------------------------------
 
->>Event 'pa_phase0' at time 1504859028.19
+>>Event 'pa_phase0' at time 1505264293.84
    Took 0.00 seconds
 
 -----------------------------------------------
@@ -975,7 +975,7 @@
 |     Overall total      |    1 (0.30%)    | 32 (0.52%) |      6144      |
 ---------------------------------------------------------------------------
 
->>Event 'pa_critical' at time 1504859028.20
+>>Event 'pa_critical' at time 1505264293.84
    Took 0.00 seconds
 
 -----------------------------------------------
@@ -2023,8 +2023,8 @@
 |     Overall total      |   52 (15.48%)   | 968 (15.76%) |      6144      |
 -----------------------------------------------------------------------------
 
->>Event 'pa_overlay' at time 1504859037.24
-   Took 9.05 seconds
+>>Event 'pa_overlay' at time 1505264302.89
+   Took 9.06 seconds
 
 -----------------------------------------------
   Allocating remaining parsed fields
@@ -2288,8 +2288,8 @@
 |     Overall total      |    0 (0.00%)    | 0 (0.00%) |      6144      |
 --------------------------------------------------------------------------
 
->>Event 'pa_meta1' at time 1504859037.76
-   Took 0.51 seconds
+>>Event 'pa_meta1' at time 1505264303.41
+   Took 0.52 seconds
 
 -----------------------------------------------
   Allocating metadata (pass 1)
@@ -2433,7 +2433,7 @@
 --------------------------------------------------------------------------
 
 Sorted metadata field instances to allocate: 0 / 0 bits (0 ingress bits and 0 egress bits)
->>Event 'pa_pov' at time 1504859037.83
+>>Event 'pa_pov' at time 1505264303.48
    Took 0.07 seconds
 
 -----------------------------------------------
@@ -2590,7 +2590,7 @@
  egress
     phv81 (8 bits)
   >> 8 total bits
->>Event 'pa_meta2' at time 1504859037.95
+>>Event 'pa_meta2' at time 1505264303.60
    Took 0.12 seconds
 
 -----------------------------------------------
@@ -2733,7 +2733,7 @@
     final start_bit = 5
   (1) msb_offset = 8
 ***Allocating phv67[7:5] for ig_intr_md_for_tm.drop_ctl[2:0]
->>Event 'pa_meta_init' at time 1504859038.01
+>>Event 'pa_meta_init' at time 1505264303.67
    Took 0.06 seconds
 
 -----------------------------------------------
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/logs/pa.results.log b/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/logs/pa.results.log
index 2176027..183e5f9 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/logs/pa.results.log
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/logs/pa.results.log
@@ -1,7 +1,7 @@
 +---------------------------------------------------------------------+
 |  Log file: pa.results.log                                           |
 |  Compiler version: 5.1.0 (fca32d1)                                  |
-|  Created on: Fri Sep  8 08:23:45 2017                               |
+|  Created on: Wed Sep 13 00:58:11 2017                               |
 +---------------------------------------------------------------------+
 
 Program: default
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/logs/parde.calcfields.log b/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/logs/parde.calcfields.log
index cb2febd..36d2ffd 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/logs/parde.calcfields.log
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/logs/parde.calcfields.log
@@ -1,7 +1,7 @@
 +---------------------------------------------------------------------+
 |  Log file: parde.calcfields.log                                     |
 |  Compiler version: 5.1.0 (fca32d1)                                  |
-|  Created on: Fri Sep  8 08:23:45 2017                               |
+|  Created on: Wed Sep 13 00:58:11 2017                               |
 +---------------------------------------------------------------------+
 
 Reserving 0 16-bit ingress tphvs for residual checksums
@@ -19,19 +19,19 @@
 Number of reachable states from state <POV initialization>_<Ingress intrinsic metadata>_<Phase 0> : 10
 Number of reachable states from state <Shim start state> : 11
 parser_state_calculations:[
-	parse_tcp_140209192795728
-	parse_tcp_140209191822416
-	parse_udp_140209191821456
-	parse_ipv4_140209191823248
-	parse_ethernet_140209182763984
-	parse_pkt_in_140209191823440
-	parse_pkt_out_140209191924688
-	default_parser_140209191924496
-	start_140209191824080
-	<Phase 0>_140209187540368
-	<Ingress intrinsic metadata>_140209187540048
-	<POV initialization>_140209187540752
-	<Shim start state>_140209187721360
+	parse_tcp_140082152353168
+	parse_tcp_140082146911312
+	parse_udp_140082146910352
+	parse_ipv4_140082146912144
+	parse_ethernet_140082151783440
+	parse_pkt_in_140082146912336
+	parse_pkt_out_140082150511504
+	default_parser_140082150511312
+	start_140082146912976
+	<Phase 0>_140082147044688
+	<Ingress intrinsic metadata>_140082147044368
+	<POV initialization>_140082147045072
+	<Shim start state>_140082147151952
 ]
 parser_calculations: [
 	
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/logs/parde.config.log b/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/logs/parde.config.log
index b9b8cae..7b374ec 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/logs/parde.config.log
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/logs/parde.config.log
@@ -1,7 +1,7 @@
 +---------------------------------------------------------------------+
 |  Log file: parde.config.log                                         |
 |  Compiler version: 5.1.0 (fca32d1)                                  |
-|  Created on: Fri Sep  8 08:23:45 2017                               |
+|  Created on: Wed Sep 13 00:58:11 2017                               |
 +---------------------------------------------------------------------+
 
 Configuring deparser.inp.iim.ii_phv_csum.csum_cfg[0].csum_cfg_entry[0].zero_m_s_b = 1
@@ -16399,5 +16399,5 @@
 [None]
 ---------------
 Deparse order:
-Ingress: ['metadata_bridge', '_bridged_intr_md_', 'packet_in_hdr', 'packet_out_hdr', 'ethernet', 'ipv4', 'udp', 'tcp']
-Egress:  ['packet_in_hdr', 'packet_out_hdr', 'ethernet', 'ipv4', 'udp', 'tcp']
+Ingress: ['metadata_bridge', '_bridged_intr_md_', 'packet_out_hdr', 'packet_in_hdr', 'ethernet', 'ipv4', 'udp', 'tcp']
+Egress:  ['packet_out_hdr', 'packet_in_hdr', 'ethernet', 'ipv4', 'udp', 'tcp']
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/logs/parde.error.log b/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/logs/parde.error.log
index f9967fa..ce117bf 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/logs/parde.error.log
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/logs/parde.error.log
@@ -1,6 +1,6 @@
 +---------------------------------------------------------------------+
 |  Log file: parde.error.log                                          |
 |  Compiler version: 5.1.0 (fca32d1)                                  |
-|  Created on: Fri Sep  8 08:23:45 2017                               |
+|  Created on: Wed Sep 13 00:58:11 2017                               |
 +---------------------------------------------------------------------+
 
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/logs/parde.log b/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/logs/parde.log
index e1f680e..6c9a764 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/logs/parde.log
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/logs/parde.log
@@ -1,7 +1,7 @@
 +---------------------------------------------------------------------+
 |  Log file: parde.log                                                |
 |  Compiler version: 5.1.0 (fca32d1)                                  |
-|  Created on: Fri Sep  8 08:23:45 2017                               |
+|  Created on: Wed Sep 13 00:58:11 2017                               |
 +---------------------------------------------------------------------+
 
 ># Begin digest init (pre-PHV)
@@ -18,14 +18,14 @@
 ># Begin unroll of HLIR parse graph
 >## Create shadow parse graph and find loops
 >## Entrypoint 'p4_parse_state.start'
-Creating shadow state: 'p4_parse_state.start' -> 'shadow_state (start, 140209182764624)'
-Creating shadow state: 'p4_parse_state.parse_pkt_in' -> 'shadow_state (parse_pkt_in, 140209182764432)'
-Creating shadow state: 'p4_parse_state.parse_ethernet' -> 'shadow_state (parse_ethernet, 140209182763856)'
-Creating shadow state: 'p4_parse_state.parse_ipv4' -> 'shadow_state (parse_ipv4, 140209182763728)'
-Creating shadow state: 'p4_parse_state.parse_tcp' -> 'shadow_state (parse_tcp, 140209182763600)'
-Creating shadow state: 'p4_parse_state.parse_udp' -> 'shadow_state (parse_udp, 140209182763664)'
-Creating shadow state: 'p4_parse_state.default_parser' -> 'shadow_state (default_parser, 140209182763536)'
-Creating shadow state: 'p4_parse_state.parse_pkt_out' -> 'shadow_state (parse_pkt_out, 140209182763344)'
+Creating shadow state: 'p4_parse_state.start' -> 'shadow_state (start, 140082151784016)'
+Creating shadow state: 'p4_parse_state.parse_pkt_in' -> 'shadow_state (parse_pkt_in, 140082151783824)'
+Creating shadow state: 'p4_parse_state.parse_ethernet' -> 'shadow_state (parse_ethernet, 140082151783248)'
+Creating shadow state: 'p4_parse_state.parse_ipv4' -> 'shadow_state (parse_ipv4, 140082151783120)'
+Creating shadow state: 'p4_parse_state.parse_tcp' -> 'shadow_state (parse_tcp, 140082151782992)'
+Creating shadow state: 'p4_parse_state.parse_udp' -> 'shadow_state (parse_udp, 140082151783056)'
+Creating shadow state: 'p4_parse_state.default_parser' -> 'shadow_state (default_parser, 140082151782928)'
+Creating shadow state: 'p4_parse_state.parse_pkt_out' -> 'shadow_state (parse_pkt_out, 140082151782864)'
 ># End unroll of HLIR parse graph
 ># Begin deparser init
 >## Create records for gress 0
@@ -43,8 +43,8 @@
 Created record for 'p4_header_instance.tcp'
 Created record for 'p4_header_instance.udp'
 >## Build record ordering for gress 0
->## Build field ordering for record 'packet_in_hdr'
 >## Build field ordering for record 'packet_out_hdr'
+>## Build field ordering for record 'packet_in_hdr'
 >## Build field ordering for record 'ethernet'
 >## Build field ordering for record 'ipv4'
 >## Build field ordering for record 'udp'
@@ -64,8 +64,8 @@
 Created record for 'p4_header_instance.tcp'
 Created record for 'p4_header_instance.udp'
 >## Build record ordering for gress 1
->## Build field ordering for record 'packet_in_hdr'
 >## Build field ordering for record 'packet_out_hdr'
+>## Build field ordering for record 'packet_in_hdr'
 >## Build field ordering for record 'ethernet'
 >## Build field ordering for record 'ipv4'
 >## Build field ordering for record 'udp'
@@ -89,13 +89,13 @@
 ># Begin scraping deparser POV allocation from raw PHV allocation
 PHV layout: [0, 0, 0, 0, 66, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None]
 >## Scraping individual POV records
-POV 33 -> packet_out_hdr
-POV 34 -> ethernet
 POV 35 -> ipv4
 POV 36 -> tcp
 POV 37 -> udp
-POV 38 -> pov_bmeta
 POV 32 -> packet_in_hdr
+POV 38 -> pov_bmeta
+POV 33 -> packet_out_hdr
+POV 34 -> ethernet
 >## Setting up array bits
 ># End scraping deparser POV allocation from raw PHV allocation
 ># Begin parser POV rewrite
@@ -116,12 +116,12 @@
 ># Begin scraping deparser POV allocation from raw PHV allocation
 PHV layout: [81, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None]
 >## Scraping individual POV records
-POV 1 -> packet_out_hdr
-POV 2 -> ethernet
 POV 3 -> ipv4
 POV 4 -> tcp
 POV 5 -> udp
 POV 0 -> packet_in_hdr
+POV 1 -> packet_out_hdr
+POV 2 -> ethernet
 >## Setting up array bits
 ># End scraping deparser POV allocation from raw PHV allocation
 ># Begin parser POV rewrite
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/logs/parser.characterize.log b/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/logs/parser.characterize.log
index e48226f..30cdc12 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/logs/parser.characterize.log
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/logs/parser.characterize.log
@@ -1,6 +1,6 @@
 +---------------------------------------------------------------------+
 |  Log file: parser.characterize.log                                  |
 |  Compiler version: 5.1.0 (fca32d1)                                  |
-|  Created on: Fri Sep  8 08:23:45 2017                               |
+|  Created on: Wed Sep 13 00:58:11 2017                               |
 +---------------------------------------------------------------------+
 
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/logs/transform.log b/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/logs/transform.log
index 9c7e0a4..029bc74 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/logs/transform.log
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/logs/transform.log
@@ -1,7 +1,7 @@
 +---------------------------------------------------------------------+
 |  Log file: transform.log                                            |
 |  Compiler version: 5.1.0 (fca32d1)                                  |
-|  Created on: Fri Sep  8 08:23:45 2017                               |
+|  Created on: Wed Sep 13 00:58:11 2017                               |
 +---------------------------------------------------------------------+
 
 -------------------------------
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/tofino.bin b/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/tofino.bin
index cdb2e28..465447d 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/tofino.bin
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/tofino.bin
Binary files differ
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/visualization/deparser.html b/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/visualization/deparser.html
index 806ee84..44136ea 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/visualization/deparser.html
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/visualization/deparser.html
@@ -163,7 +163,7 @@
         
 
         <tr class="fde_row_0">
-            <td style="border-right: 1px solid black">packet_in_hdr (32)</td>
+            <td style="border-right: 1px solid black">packet_out_hdr (33)</td>
             <td>129</td>
             <td>129</td>
             <td>-</td>
@@ -172,7 +172,7 @@
         
 
         <tr class="fde_row_1">
-            <td style="border-right: 1px solid black">packet_out_hdr (33)</td>
+            <td style="border-right: 1px solid black">packet_in_hdr (32)</td>
             <td>129</td>
             <td>129</td>
             <td>-</td>
@@ -400,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_in_hdr (0)</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>
@@ -409,7 +409,7 @@
         
 
         <tr class="fde_row_1">
-            <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>
@@ -569,7 +569,7 @@
 </div></div><br><br>
 </td></tr>
 </table>
-<br><i>Created on Fri Sep  8 08:24:02 2017</i>
+<br><i>Created on Wed Sep 13 00:58:27 2017</i>
 
 <br><i>Compiler version: 5.1.0 (fca32d1)</i>
 
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/visualization/mau.html b/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/visualization/mau.html
index 635ee23..54922a5 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/visualization/mau.html
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/visualization/mau.html
@@ -49,10 +49,10 @@
 </tr>
 <tr>
 <td align="center">1</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">3</td>
+<td align="center">7</td>
 <td align="center">16</td>
-<td align="center">10</td>
-<td align="center">0</td>
+<td align="center">30</td>
+<td align="center">2</td>
 <td align="center">4</td>
 <td align="center">7</td>
 <td align="center">7</td>
@@ -352,10 +352,10 @@
 </tr>
 <tr>
 <td align="center">1</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="#01fe00" >0.20%</td>
+<td align="center" bgcolor="#02fe00" >0.46%</td>
 <td align="center" bgcolor="#0afe00" >2.02%</td>
-<td align="center" bgcolor="#01fe00" >0.20%</td>
-<td align="center" bgcolor="#00c000" >0.00%</td>
+<td align="center" bgcolor="#03fe00" >0.60%</td>
+<td align="center" bgcolor="#0efe00" >2.78%</td>
 <td align="center" bgcolor="#0afe00" >2.08%</td>
 <td align="center" bgcolor="#03fe00" >0.73%</td>
 <td align="center" bgcolor="#06fe00" >1.22%</td>
@@ -3409,20 +3409,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:chartreuse""><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:chartreuse""><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:chartreuse""><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:chartreuse""><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:chocolate""><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:chocolate""><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>
@@ -3789,7 +3801,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:chocolate""><title>SRAM:
+<rect x="360" y="104" width="16" height="16" style="stroke:black; stroke-width:1; fill:coral""><title>SRAM:
  Row: 4  Col: 6
  Unit Number: 54
  Entry Bit Width: 128
@@ -3822,7 +3834,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:coral""><title>SRAM:
+<rect x="360" y="56" width="16" height="16" style="stroke:black; stroke-width:1; fill:cornflowerblue""><title>SRAM:
  Row: 6  Col: 6
  Unit Number: 78
  Entry Bit Width: 128
@@ -3875,7 +3887,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:chocolate""><title>SRAM:
+<rect x="384" y="104" width="16" height="16" style="stroke:black; stroke-width:1; fill:coral""><title>SRAM:
  Row: 4  Col: 7
  Unit Number: 55
  Entry Bit Width: 128
@@ -3908,7 +3920,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:coral""><title>SRAM:
+<rect x="384" y="56" width="16" height="16" style="stroke:black; stroke-width:1; fill:cornflowerblue""><title>SRAM:
  Row: 6  Col: 7
  Unit Number: 79
  Entry Bit Width: 128
@@ -4247,9 +4259,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:chartreuse""><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
@@ -4259,9 +4274,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:chocolate""><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
@@ -4272,16 +4290,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:chartreuse""><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:chartreuse""><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:chartreuse""><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:chartreuse""><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:chartreuse""><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:chartreuse""><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:chartreuse""><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:chartreuse""><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:chartreuse""><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:chartreuse""><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>
@@ -4333,16 +4361,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:chocolate""><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:chocolate""><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:chocolate""><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:chocolate""><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:chocolate""><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:chocolate""><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:chocolate""><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:chocolate""><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:chocolate""><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:chocolate""><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>
@@ -4754,7 +4792,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:cornflowerblue""><title>Gateway Table Gateway:
+<rect x="72" y="40" width="8" height="8" style="stroke:black; stroke-width:1; fill:crimson""><title>Gateway Table Gateway:
  Unit: 14
  Entry Bit Width: 44
  Depth: 4
@@ -4966,7 +5004,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:chocolate""><title>Map RAM:
+<rect x="280" y="104" width="8" height="8" style="stroke:black; stroke-width:1; fill:coral""><title>Map RAM:
  Row: 4  Unit: 0
  Unit Number: 24
  Entry Bit Width: 11
@@ -4974,7 +5012,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:chocolate""><title>Map RAM:
+<rect x="288" y="104" width="8" height="8" style="stroke:black; stroke-width:1; fill:coral""><title>Map RAM:
  Row: 4  Unit: 1
  Unit Number: 25
  Entry Bit Width: 11
@@ -5032,7 +5070,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:coral""><title>Map RAM:
+<rect x="280" y="56" width="8" height="8" style="stroke:black; stroke-width:1; fill:cornflowerblue""><title>Map RAM:
  Row: 6  Unit: 0
  Unit Number: 36
  Entry Bit Width: 11
@@ -5040,7 +5078,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:coral""><title>Map RAM:
+<rect x="288" y="56" width="8" height="8" style="stroke:black; stroke-width:1; fill:cornflowerblue""><title>Map RAM:
  Row: 6  Unit: 1
  Unit Number: 37
  Entry Bit Width: 11
@@ -5103,10 +5141,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:chocolate""><title>128-bit Statistics ALU:
+<rect x="336" y="104" width="8" height="8" style="stroke:black; stroke-width:1; fill:coral""><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:coral""><title>128-bit Statistics ALU:
+<rect x="336" y="56" width="8" height="8" style="stroke:black; stroke-width:1; fill:cornflowerblue""><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:
@@ -5578,7 +5616,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:crimson""><title>Logical Table ID:
+<rect x="192" y="600" width="8" height="8" style="stroke:black; stroke-width:1; fill:chocolate""><title>Logical Table ID:
  ID: 1
 
  Occupied By: egress_port_count_table</title></rect>
@@ -5625,7 +5663,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:crimson""><title>32-bit ALU:
+<rect x="560" y="48" width="8" height="8" style="stroke:black; stroke-width:1; fill:chocolate""><title>32-bit ALU:
  Unit: 0
  Occupied By:
 For Match Table ingress_port_count_table's action count_ingress:
@@ -6084,13 +6122,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:crimson""><title>egress_port_count_table</title></rect>
+<rect x="720" y="64" width="16" height="16" style="stroke:black; stroke-width:1; fill:chocolate""><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:coral""><title>egress_port_counter</title></rect>
+<rect x="720" y="88" width="16" height="16" style="stroke:black; stroke-width:1; fill:cornflowerblue""><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:chartreuse""><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:chocolate""><title>ingress_port_counter</title></rect>
+<rect x="720" y="136" width="16" height="16" style="stroke:black; stroke-width:1; fill:coral""><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>
 
@@ -6101,13 +6139,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>
@@ -31964,7 +32002,7 @@
 </svg><br>
 
 
-<br><i>Created on Fri Sep  8 08:23:58 2017</i>
+<br><i>Created on Wed Sep 13 00:58:24 2017</i>
 <br><i>Compiler version: 5.1.0 (fca32d1)</i>
 </div>
 </body>
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/visualization/parser.egress.html b/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/visualization/parser.egress.html
index fbcf3a8..83ee52d 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/visualization/parser.egress.html
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/visualization/parser.egress.html
@@ -6639,7 +6639,7 @@
 <br></td></tr>
 
 </table>
-<br><i>Created on Fri Sep  8 08:24:02 2017</i>
+<br><i>Created on Wed Sep 13 00:58:27 2017</i>
 
 <br><i>Compiler version: 5.1.0 (fca32d1)</i>
 
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/visualization/parser.ingress.html b/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/visualization/parser.ingress.html
index 4da6209..eb4009c 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/visualization/parser.ingress.html
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/visualization/parser.ingress.html
@@ -7420,7 +7420,7 @@
 <br></td></tr>
 
 </table>
-<br><i>Created on Fri Sep  8 08:24:02 2017</i>
+<br><i>Created on Wed Sep 13 00:58:27 2017</i>
 
 <br><i>Compiler version: 5.1.0 (fca32d1)</i>
 
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/visualization/phv_allocation.html b/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/visualization/phv_allocation.html
index ec8e80c..0db92aa 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/visualization/phv_allocation.html
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/visualization/phv_allocation.html
@@ -3648,6 +3648,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
@@ -3661,6 +3663,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:darkseagreen""><title>PHV Group: 8
@@ -3682,6 +3686,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
@@ -3692,6 +3698,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:limegreen""><title>PHV Group: 8
@@ -31204,7 +31212,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 Fri Sep  8 08:23:59 2017</i>
+<br><i>Created on Wed Sep 13 00:58:25 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/default/mavericks/visualization/table_placement.html b/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/visualization/table_placement.html
index d157ab2..ea188a6 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/visualization/table_placement.html
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/visualization/table_placement.html
@@ -110,10 +110,10 @@
 <rect x="91" y="195" width="13" height="13" style="stroke:black; stroke-width:1; fill:white""><title>TCAM</title></rect>
 <rect x="0" y="26" width="104" height="182" style="stroke:black; stroke-width:2; fill:none""></rect>
 <text x="41" y="245" textLength="24" lengthAdjust="spacingAndGlyphs" textHeight="24" heightAdjust="spacingAndGlyphs" style="fill:black;">0</text>
-<rect x="117" y="26" width="13" height="13" style="stroke:black; stroke-width:1; fill:chocolate""><title>SRAM for ingress_port_counter</title></rect>
-<rect x="130" y="26" width="13" height="13" style="stroke:black; stroke-width:1; fill:chocolate""><title>SRAM for ingress_port_counter</title></rect>
-<rect x="143" y="26" width="13" height="13" style="stroke:black; stroke-width:1; fill:coral""><title>SRAM for egress_port_counter</title></rect>
-<rect x="156" y="26" width="13" height="13" style="stroke:black; stroke-width:1; fill:coral""><title>SRAM for egress_port_counter</title></rect>
+<rect x="117" y="26" width="13" height="13" style="stroke:black; stroke-width:1; fill:coral""><title>SRAM for ingress_port_counter</title></rect>
+<rect x="130" y="26" width="13" height="13" style="stroke:black; stroke-width:1; fill:coral""><title>SRAM for ingress_port_counter</title></rect>
+<rect x="143" y="26" width="13" height="13" style="stroke:black; stroke-width:1; fill:cornflowerblue""><title>SRAM for egress_port_counter</title></rect>
+<rect x="156" y="26" width="13" height="13" style="stroke:black; stroke-width:1; fill:cornflowerblue""><title>SRAM for egress_port_counter</title></rect>
 <rect x="169" y="26" width="13" height="13" style="stroke:black; stroke-width:1; fill:white""><title>SRAM</title></rect>
 <rect x="182" y="26" width="13" height="13" style="stroke:black; stroke-width:1; fill:white""><title>SRAM</title></rect>
 <rect x="195" y="26" width="13" height="13" style="stroke:black; stroke-width:1; fill:white""><title>SRAM</title></rect>
@@ -1277,9 +1277,9 @@
 <rect x="585" y="260" width="104" height="182" style="stroke:black; stroke-width:2; fill:none""></rect>
 <text x="626" y="479" textLength="24" lengthAdjust="spacingAndGlyphs" textHeight="24" heightAdjust="spacingAndGlyphs" style="fill:black;">11</text>
 <text x="834" y="89"   style="fill:black; font-weight:bold;">Legend</text>
-<rect x="832" y="104" width="26" height="26" style="stroke:black; stroke-width:1; fill:coral""><title>egress_port_counter</title></rect>
+<rect x="832" y="104" width="26" height="26" style="stroke:black; stroke-width:1; fill:cornflowerblue""><title>egress_port_counter</title></rect>
 <text x="860" y="128"   style="fill:black;">egress_port_counter</text>
-<rect x="832" y="143" width="26" height="26" style="stroke:black; stroke-width:1; fill:chocolate""><title>ingress_port_counter</title></rect>
+<rect x="832" y="143" width="26" height="26" style="stroke:black; stroke-width:1; fill:coral""><title>ingress_port_counter</title></rect>
 <text x="860" y="167"   style="fill:black;">ingress_port_counter</text>
 <rect x="832" y="182" width="26" height="26" style="stroke:black; stroke-width:1; fill:aquamarine""><title>table0</title></rect>
 <text x="860" y="206"   style="fill:black;">table0</text>
@@ -1401,8 +1401,8 @@
 <tr>
 <td align="center">ingress_port_count_table</td>
 <td align="center">1</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>
@@ -1425,8 +1425,8 @@
 <tr>
 <td align="center">egress_port_count_table</td>
 <td align="center">1</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>
@@ -1459,7 +1459,7 @@
 <td align="center">0</td>
 </tr>
 </table>
-<br><i>Created on Fri Sep  8 08:23:58 2017</i>
+<br><i>Created on Wed Sep 13 00:58:24 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/default/montara/context/context.json b/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/context/context.json
index 4c129d7..4450ef9 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/context/context.json
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/context/context.json
@@ -1,5 +1,5 @@
 {
-    "build_date": "Fri Sep  8 08:24:46 2017", 
+    "build_date": "Wed Sep 13 00:59:11 2017", 
     "phv_allocation": [
         {
             "ingress": [
@@ -17229,12 +17229,13 @@
             "actions": [
                 {
                     "p4_parameters": [], 
+                    "disallowed_as_default_action_reason": "USES_HASH_DIST", 
                     "handle": 536870914, 
                     "name": "count_ingress", 
                     "indirect_resources": [], 
                     "override_stat_full_addr": 0, 
                     "override_meter_addr_pfe": false, 
-                    "allowed_as_default_action": true, 
+                    "allowed_as_default_action": false, 
                     "override_stat_addr_pfe": true, 
                     "override_stateful_addr_pfe": false, 
                     "override_meter_full_addr": 0, 
@@ -17264,12 +17265,13 @@
             "actions": [
                 {
                     "p4_parameters": [], 
+                    "disallowed_as_default_action_reason": "USES_HASH_DIST", 
                     "handle": 536870914, 
                     "name": "count_ingress", 
                     "indirect_resources": [], 
                     "override_stat_full_addr": 0, 
                     "override_meter_addr_pfe": false, 
-                    "allowed_as_default_action": true, 
+                    "allowed_as_default_action": false, 
                     "override_stat_addr_pfe": true, 
                     "override_stateful_addr_pfe": false, 
                     "override_meter_full_addr": 0, 
@@ -17302,18 +17304,24 @@
                         "pack_format": [
                             {
                                 "memory_word_width": 0, 
-                                "entries_per_table_word": 1, 
+                                "entries_per_table_word": 0, 
                                 "table_word_width": 0, 
                                 "number_memory_units_per_table_word": 0
                             }
                         ], 
+                        "hash_functions": [
+                            {
+                                "hash_function_number": 0, 
+                                "hash_bits": []
+                            }
+                        ], 
                         "result_physical_buses": [
                             1
                         ], 
                         "logical_table_id": 0, 
                         "stage_number": 1, 
                         "stage_table_type": "match_with_no_key", 
-                        "size": 1
+                        "size": 1024
                     }
                 ], 
                 "match_type": "match_with_no_key"
@@ -17366,12 +17374,13 @@
             "actions": [
                 {
                     "p4_parameters": [], 
+                    "disallowed_as_default_action_reason": "USES_HASH_DIST", 
                     "handle": 536870916, 
                     "name": "count_egress", 
                     "indirect_resources": [], 
                     "override_stat_full_addr": 0, 
                     "override_meter_addr_pfe": false, 
-                    "allowed_as_default_action": true, 
+                    "allowed_as_default_action": false, 
                     "override_stat_addr_pfe": true, 
                     "override_stateful_addr_pfe": false, 
                     "override_meter_full_addr": 0, 
@@ -17401,12 +17410,13 @@
             "actions": [
                 {
                     "p4_parameters": [], 
+                    "disallowed_as_default_action_reason": "USES_HASH_DIST", 
                     "handle": 536870916, 
                     "name": "count_egress", 
                     "indirect_resources": [], 
                     "override_stat_full_addr": 0, 
                     "override_meter_addr_pfe": false, 
-                    "allowed_as_default_action": true, 
+                    "allowed_as_default_action": false, 
                     "override_stat_addr_pfe": true, 
                     "override_stateful_addr_pfe": false, 
                     "override_meter_full_addr": 0, 
@@ -17439,18 +17449,24 @@
                         "pack_format": [
                             {
                                 "memory_word_width": 0, 
-                                "entries_per_table_word": 1, 
+                                "entries_per_table_word": 0, 
                                 "table_word_width": 0, 
                                 "number_memory_units_per_table_word": 0
                             }
                         ], 
+                        "hash_functions": [
+                            {
+                                "hash_function_number": 0, 
+                                "hash_bits": []
+                            }
+                        ], 
                         "result_physical_buses": [
                             0
                         ], 
                         "logical_table_id": 1, 
                         "stage_number": 1, 
                         "stage_table_type": "match_with_no_key", 
-                        "size": 1
+                        "size": 1024
                     }
                 ], 
                 "match_type": "match_with_no_key"
@@ -18386,7 +18402,7 @@
             "packet_counter_resolution": 32, 
             "pfe_bit_position": 19, 
             "how_referenced": "indirect", 
-            "size": 510
+            "size": 512
         }, 
         {
             "direction": "ingress", 
@@ -18429,7 +18445,7 @@
             "packet_counter_resolution": 32, 
             "pfe_bit_position": 19, 
             "how_referenced": "indirect", 
-            "size": 510
+            "size": 512
         }, 
         {
             "direction": "ingress", 
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/context/mau.context.json b/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/context/mau.context.json
index df27a61..1ace548 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/context/mau.context.json
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/context/mau.context.json
@@ -1,14 +1,137 @@
 {
   "ProgramInfo": {
     "ProgramName": "default", 
-    "BuildDate": "Fri Sep  8 08:24:46 2017", 
+    "BuildDate": "Wed Sep 13 00:59:11 2017", 
     "CompilerVersion": "5.1.0"
   }, 
   "HashJsonNode": {
-    "TableCount": 0, 
+    "TableCount": 2, 
     "ProxyTables": {}, 
-    "AllTables": {}, 
-    "HashFieldCount": 0
+    "AllTables": {
+      "ingress_port_count_table": {
+        "1": [
+          {
+            "0": [
+              {}, 
+              {
+                "seed": 0
+              }
+            ], 
+            "1": [
+              {}, 
+              {
+                "seed": 0
+              }
+            ], 
+            "2": [
+              {}, 
+              {
+                "seed": 0
+              }
+            ], 
+            "3": [
+              {}, 
+              {
+                "seed": 0
+              }
+            ], 
+            "4": [
+              {}, 
+              {
+                "seed": 0
+              }
+            ], 
+            "5": [
+              {}, 
+              {
+                "seed": 0
+              }
+            ], 
+            "6": [
+              {}, 
+              {
+                "seed": 0
+              }
+            ], 
+            "7": [
+              {}, 
+              {
+                "seed": 0
+              }
+            ], 
+            "8": [
+              {}, 
+              {
+                "seed": 0
+              }
+            ]
+          }
+        ], 
+        "Handle": 16777217
+      }, 
+      "egress_port_count_table": {
+        "1": [
+          {
+            "0": [
+              {}, 
+              {
+                "seed": 0
+              }
+            ], 
+            "1": [
+              {}, 
+              {
+                "seed": 0
+              }
+            ], 
+            "2": [
+              {}, 
+              {
+                "seed": 0
+              }
+            ], 
+            "3": [
+              {}, 
+              {
+                "seed": 0
+              }
+            ], 
+            "4": [
+              {}, 
+              {
+                "seed": 0
+              }
+            ], 
+            "5": [
+              {}, 
+              {
+                "seed": 0
+              }
+            ], 
+            "6": [
+              {}, 
+              {
+                "seed": 0
+              }
+            ], 
+            "7": [
+              {}, 
+              {
+                "seed": 0
+              }
+            ], 
+            "8": [
+              {}, 
+              {
+                "seed": 0
+              }
+            ]
+          }
+        ], 
+        "Handle": 16777218
+      }
+    }, 
+    "HashFieldCount": 2
   }, 
   "EntryFormatNode": {
     "ExmEntryFormat": {
@@ -16664,21 +16787,16 @@
         "stage_tables": [
           {
             "stage_number": 1, 
-            "stage_table_type": "match_with_no_key", 
-            "number_entries": 1, 
+            "stage_table_type": "hash_action", 
+            "number_entries": 1024, 
             "pack_format_length": 1, 
             "pack_format": [
               {
                 "table_word_width": 0, 
                 "memory_word_width": 0, 
-                "entries_per_table_word": 1, 
+                "entries_per_table_word": 0, 
                 "number_memory_units_per_table_word": 0, 
-                "entry_list": [
-                  {
-                    "entry_number": 0, 
-                    "field_list": []
-                  }
-                ]
+                "entry_list": []
               }
             ], 
             "memory_resource_allocation": null, 
@@ -16715,15 +16833,15 @@
                 ], 
                 "match_group_key_bit_width": 16, 
                 "match_group_phv_bit_scrambling": {
-                  "ig_intr_md_for_tm.ucast_egress_port[0]": 0, 
-                  "ig_intr_md_for_tm.ucast_egress_port[1]": 1, 
-                  "ig_intr_md_for_tm.ucast_egress_port[2]": 2, 
-                  "ig_intr_md_for_tm.ucast_egress_port[3]": 3, 
-                  "ig_intr_md_for_tm.ucast_egress_port[4]": 4, 
-                  "ig_intr_md_for_tm.ucast_egress_port[5]": 5, 
-                  "ig_intr_md_for_tm.ucast_egress_port[6]": 6, 
-                  "ig_intr_md_for_tm.ucast_egress_port[7]": 7, 
-                  "ig_intr_md_for_tm.ucast_egress_port[8]": 8
+                  "ig_intr_md_for_tm.ucast_egress_port[0]": 16, 
+                  "ig_intr_md_for_tm.ucast_egress_port[1]": 17, 
+                  "ig_intr_md_for_tm.ucast_egress_port[2]": 18, 
+                  "ig_intr_md_for_tm.ucast_egress_port[3]": 19, 
+                  "ig_intr_md_for_tm.ucast_egress_port[4]": 20, 
+                  "ig_intr_md_for_tm.ucast_egress_port[5]": 21, 
+                  "ig_intr_md_for_tm.ucast_egress_port[6]": 22, 
+                  "ig_intr_md_for_tm.ucast_egress_port[7]": 23, 
+                  "ig_intr_md_for_tm.ucast_egress_port[8]": 24
                 }, 
                 "match_group_match_bit_scrambling": {}, 
                 "seed": [
@@ -16829,8 +16947,8 @@
           {
             "name": "count_ingress", 
             "handle": 536870914, 
-            "allowed_to_be_default_action": true, 
-            "disallowed_as_default_action_reason": null, 
+            "allowed_to_be_default_action": false, 
+            "disallowed_as_default_action_reason": "USES_HASH_DIST", 
             "override_stat_addr_pfe": true, 
             "override_stat_addr": false, 
             "override_stat_full_addr": 0, 
@@ -16861,8 +16979,8 @@
         "default_action": {
           "name": "count_ingress", 
           "handle": 536870914, 
-          "allowed_to_be_default_action": true, 
-          "disallowed_as_default_action_reason": null, 
+          "allowed_to_be_default_action": false, 
+          "disallowed_as_default_action_reason": "USES_HASH_DIST", 
           "override_stat_addr_pfe": true, 
           "override_stat_addr": false, 
           "override_stat_full_addr": 0, 
@@ -16902,7 +17020,7 @@
         "p4_stateful_tables": [], 
         "p4_selection_tables": [], 
         "include_idletime": false, 
-        "performs_hash_action": false, 
+        "performs_hash_action": true, 
         "uses_range": false, 
         "number_entries_with_ranges": 0, 
         "uses_versioning": true, 
@@ -16923,21 +17041,16 @@
         "stage_tables": [
           {
             "stage_number": 1, 
-            "stage_table_type": "match_with_no_key", 
-            "number_entries": 1, 
+            "stage_table_type": "hash_action", 
+            "number_entries": 1024, 
             "pack_format_length": 1, 
             "pack_format": [
               {
                 "table_word_width": 0, 
                 "memory_word_width": 0, 
-                "entries_per_table_word": 1, 
+                "entries_per_table_word": 0, 
                 "number_memory_units_per_table_word": 0, 
-                "entry_list": [
-                  {
-                    "entry_number": 0, 
-                    "field_list": []
-                  }
-                ]
+                "entry_list": []
               }
             ], 
             "memory_resource_allocation": null, 
@@ -17070,8 +17183,8 @@
           {
             "name": "count_egress", 
             "handle": 536870916, 
-            "allowed_to_be_default_action": true, 
-            "disallowed_as_default_action_reason": null, 
+            "allowed_to_be_default_action": false, 
+            "disallowed_as_default_action_reason": "USES_HASH_DIST", 
             "override_stat_addr_pfe": true, 
             "override_stat_addr": false, 
             "override_stat_full_addr": 0, 
@@ -17102,8 +17215,8 @@
         "default_action": {
           "name": "count_egress", 
           "handle": 536870916, 
-          "allowed_to_be_default_action": true, 
-          "disallowed_as_default_action_reason": null, 
+          "allowed_to_be_default_action": false, 
+          "disallowed_as_default_action_reason": "USES_HASH_DIST", 
           "override_stat_addr_pfe": true, 
           "override_stat_addr": false, 
           "override_stat_full_addr": 0, 
@@ -17143,7 +17256,7 @@
         "p4_stateful_tables": [], 
         "p4_selection_tables": [], 
         "include_idletime": false, 
-        "performs_hash_action": false, 
+        "performs_hash_action": true, 
         "uses_range": false, 
         "number_entries_with_ranges": 0, 
         "uses_versioning": true, 
@@ -18534,7 +18647,7 @@
         "name": "ingress_port_counter", 
         "handle": 67108865, 
         "direction": "ingress", 
-        "number_entries": 510, 
+        "number_entries": 512, 
         "stage_tables_length": 1, 
         "stage_tables": [
           {
@@ -18642,7 +18755,7 @@
         "name": "egress_port_counter", 
         "handle": 67108866, 
         "direction": "ingress", 
-        "number_entries": 510, 
+        "number_entries": 512, 
         "stage_tables_length": 1, 
         "stage_tables": [
           {
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/default.json b/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/default.json
index d082348..0141a65 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/default.json
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/default.json
@@ -9,10 +9,8 @@
       "name" : "scalars_0",
       "id" : 0,
       "fields" : [
-        ["tmp_0", 104, false],
-        ["tmp", 8, false],
-        ["tmp_1", 32, false],
-        ["tmp_2", 32, false]
+        ["tmp", 32, false],
+        ["tmp_0", 32, false]
       ]
     },
     {
@@ -194,7 +192,7 @@
           "parser_ops" : [],
           "transitions" : [
             {
-              "value" : "0xff",
+              "value" : "0x00ff",
               "mask" : null,
               "next_state" : "parse_pkt_out"
             },
@@ -381,50 +379,10 @@
         {
           "name" : "start",
           "id" : 7,
-          "parser_ops" : [
-            {
-              "parameters" : [
-                {
-                  "type" : "field",
-                  "value" : ["scalars", "tmp_0"]
-                },
-                {
-                  "type" : "lookahead",
-                  "value" : [0, 104]
-                }
-              ],
-              "op" : "set"
-            },
-            {
-              "parameters" : [
-                {
-                  "type" : "field",
-                  "value" : ["scalars", "tmp"]
-                },
-                {
-                  "type" : "expression",
-                  "value" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "&",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "tmp_0"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0xff"
-                      }
-                    }
-                  }
-                }
-              ],
-              "op" : "set"
-            }
-          ],
+          "parser_ops" : [],
           "transitions" : [
             {
-              "value" : "0x00",
+              "value" : "0x00ff",
               "mask" : null,
               "next_state" : "parse_pkt_in"
             },
@@ -437,7 +395,7 @@
           "transition_key" : [
             {
               "type" : "field",
-              "value" : ["scalars", "tmp"]
+              "value" : ["ig_intr_md", "egress_spec"]
             }
           ]
         }
@@ -650,7 +608,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "tmp_1"]
+              "value" : ["scalars", "tmp"]
             },
             {
               "type" : "expression",
@@ -680,7 +638,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "tmp_1"]
+              "value" : ["scalars", "tmp"]
             }
           ],
           "source_info" : {
@@ -702,7 +660,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "tmp_2"]
+              "value" : ["scalars", "tmp_0"]
             },
             {
               "type" : "expression",
@@ -732,7 +690,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "tmp_2"]
+              "value" : ["scalars", "tmp_0"]
             }
           ],
           "source_info" : {
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/logs/asm.log b/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/logs/asm.log
index 45374d2..3c40129 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/logs/asm.log
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/logs/asm.log
@@ -1,6 +1,6 @@
 +---------------------------------------------------------------------+
 |  Log file: asm.log                                                  |
 |  Compiler version: 5.1.0 (fca32d1)                                  |
-|  Created on: Fri Sep  8 08:24:30 2017                               |
+|  Created on: Wed Sep 13 00:58:56 2017                               |
 +---------------------------------------------------------------------+
 
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/logs/mau.characterize.log b/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/logs/mau.characterize.log
index 891b532..02d1e5c 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/logs/mau.characterize.log
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/logs/mau.characterize.log
@@ -1,7 +1,7 @@
 +---------------------------------------------------------------------+
 |  Log file: mau.characterize.log                                     |
 |  Compiler version: 5.1.0 (fca32d1)                                  |
-|  Created on: Fri Sep  8 08:24:30 2017                               |
+|  Created on: Wed Sep 13 00:58:56 2017                               |
 +---------------------------------------------------------------------+
 
 Match+Action Resource Usage
@@ -20,8 +20,8 @@
 | process_packet_out_table | ingress |   0   |         |  -   |  0 (0/0/0/0/0)  |   0   | 1024 / 1 (-1023) |   0 / 0 (0)   |    0    |   0   |   0/0/0/0/0/0/0/0   | 0 / 0 (0)  |   0 / 0 (0)   |  0 / 0 (0)   |   0    | 0 / 0 (0) |  0 in 0 (0)  |  1 in 0 (0)  |     - / -     |     - / -     |  - / -  |
 |      stage 0 totals      |    -    |   -   |    -    |  -   |  3 (0/0/2/0/1)  |   3   |        -         |       -       |    -    |   -   |          -          |     -      |       -       |      -       |   -    |     -     |      -       |      -       |       -       |       -       |    -    |
 |                          |         |       |         |      |                 |       |                  |               |         |       |                     |            |               |              |        |           |              |              |               |               |         |
-| ingress_port_count_table | ingress |   1   |         |  -   |  2 (0/0/2/0/0)  |   0   | 1024 / 1 (-1023) |   0 / 0 (0)   |    0    |   0   |   0/0/0/0/0/0/0/0   | 0 / 0 (0)  |   0 / 0 (0)   |  0 / 0 (0)   |   0    | 0 / 0 (0) |  0 in 0 (0)  |  1 in 0 (0)  |     - / -     |     - / -     |  - / -  |
-| egress_port_count_table  | ingress |   1   |         |  -   |  2 (0/0/2/0/0)  |   0   | 1024 / 1 (-1023) |   0 / 0 (0)   |    0    |   0   |   0/0/0/0/0/0/0/0   | 0 / 0 (0)  |   0 / 0 (0)   |  0 / 0 (0)   |   0    | 0 / 0 (0) |  0 in 0 (0)  |  1 in 0 (0)  |     - / -     |     - / -     |  - / -  |
+| ingress_port_count_table | ingress |   1   |         |  -   |  2 (0/0/2/0/0)  |   0   | 1024 / 1024 (0)  |   0 / 0 (0)   |    0    |   0   |   0/0/0/0/0/0/0/0   | 0 / 0 (0)  |   0 / 0 (0)   |  0 / 0 (0)   |   0    | 0 / 0 (0) |  0 in 0 (0)  |  0 in 0 (0)  |     - / -     |     - / -     |  - / -  |
+| egress_port_count_table  | ingress |   1   |         |  -   |  2 (0/0/2/0/0)  |   0   | 1024 / 1024 (0)  |   0 / 0 (0)   |    0    |   0   |   0/0/0/0/0/0/0/0   | 0 / 0 (0)  |   0 / 0 (0)   |  0 / 0 (0)   |   0    | 0 / 0 (0) |  0 in 0 (0)  |  0 in 0 (0)  |     - / -     |     - / -     |  - / -  |
 |      stage 1 totals      |    -    |   -   |    -    |  -   |  4 (0/0/4/0/0)  |   0   |        -         |       -       |    -    |   -   |          -          |     -      |       -       |      -       |   -    |     -     |      -       |      -       |       -       |       -       |    -    |
 |                          |         |       |         |      |                 |       |                  |               |         |       |                     |            |               |              |        |           |              |              |               |               |         |
 |      overall totals      |    -    |   -   |    -    |  -   |  7 (0/0/6/0/1)  |   3   |        -         |       -       |    -    |   -   |          -          |     -      |       -       |      -       |   -    |     -     |      -       |      -       |       -       |       -       |    -    |
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/logs/mau.config.log b/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/logs/mau.config.log
index 81dcf25..e6c99a9 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/logs/mau.config.log
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/logs/mau.config.log
@@ -1,7 +1,7 @@
 +---------------------------------------------------------------------+
 |  Log file: mau.config.log                                           |
 |  Compiler version: 5.1.0 (fca32d1)                                  |
-|  Created on: Fri Sep  8 08:24:30 2017                               |
+|  Created on: Wed Sep 13 00:58:56 2017                               |
 +---------------------------------------------------------------------+
 
 Final Stage dependencies are:
@@ -709,26 +709,26 @@
 Configuring rams.match.merge.logical_table_thread[copy_index=2].logical_table_thread_ingress to be 0x1 (previous_value=0x0 OR new_value=0x1).
 Configuring dp.mau_match_input_xbar_exact_match_enable[direction_index=0].mau_match_input_xbar_exact_match_enable to be 0x1.  (old value = 0x0 OR new value = 0x1)
 Configuring dp.xbar_hash.xbar.mau_match_input_xbar_ternary_match_enable[direction_index=0].mau_match_input_xbar_ternary_match_enable to be 0x0.  (old value = 0x0 OR new value = 0x0)
-Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=0].match_input_xbar_816b_ctl_address to be 18.
-Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=0].match_input_xbar_816b_ctl_enable to be 1.
-Configuring match input crossbar byte 0 to come from 16-bit PHV container 2.
+Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=2].match_input_xbar_816b_ctl_address to be 18.
+Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=2].match_input_xbar_816b_ctl_enable to be 1.
+Configuring match input crossbar byte 2 to come from 16-bit PHV container 2.
   That PHV byte contains {ig_intr_md_for_tm.ucast_egress_port[7:0]}.
-Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=1].match_input_xbar_816b_ctl_address to be 18.
-Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=1].match_input_xbar_816b_ctl_enable to be 1.
-Configuring match input crossbar byte 1 to come from 16-bit PHV container 2.
+Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=3].match_input_xbar_816b_ctl_address to be 18.
+Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=3].match_input_xbar_816b_ctl_enable to be 1.
+Configuring match input crossbar byte 3 to come from 16-bit PHV container 2.
   That PHV byte contains {unused[6:0], ig_intr_md_for_tm.ucast_egress_port[8:8]}.
 Configuring dp.match_input_xbar_din_power_ctl[14_byte_group=0][byte_position=8].match_input_xbar_din_power_ctl to be 0x4.  (previous value = 0x0  OR new value = 0x4)
 Configuring dp.xbar_hash.hash.parity_group_mask[parity_group_mask_index=0][byte_number=0].parity_group_mask to be 0x1.  (previous value = 0x0  OR  new value = 0x1)
 Configuring dp.xbar_hash.hash.parity_group_mask[parity_group_mask_index=0][byte_number=1].parity_group_mask to be 0x0.  (previous value = 0x0  OR  new value = 0x0)
-Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=0][hash_bit_index=40].byte1 to be 0x1.
-Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=0][hash_bit_index=41].byte0 to be 0x1.
-Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=0][hash_bit_index=42].byte0 to be 0x2.
-Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=0][hash_bit_index=43].byte0 to be 0x4.
-Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=0][hash_bit_index=44].byte0 to be 0x8.
-Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=0][hash_bit_index=45].byte0 to be 0x10.
-Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=0][hash_bit_index=46].byte0 to be 0x20.
-Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=0][hash_bit_index=47].byte0 to be 0x40.
-Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=0][hash_bit_index=48].byte0 to be 0x80.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=1][hash_bit_index=40].byte1 to be 0x1.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=1][hash_bit_index=41].byte0 to be 0x1.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=1][hash_bit_index=42].byte0 to be 0x2.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=1][hash_bit_index=43].byte0 to be 0x4.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=1][hash_bit_index=44].byte0 to be 0x8.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=1][hash_bit_index=45].byte0 to be 0x10.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=1][hash_bit_index=46].byte0 to be 0x20.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=1][hash_bit_index=47].byte0 to be 0x40.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=1][hash_bit_index=48].byte0 to be 0x80.
 Configuring dp.hashout_ctl.hash_group_ingress_enable to be 0x1.  (previous value = 0x0 OR new value = 0x1)
 Configuring rams.array.row[row=7].vh_xbar[search_bus_index=0].exactmatch_row_vh_xbar_ctl.exactmatch_row_vh_xbar_select to be 0.
 Configuring rams.array.row[row=7].vh_xbar[search_bus_index=0].exactmatch_row_vh_xbar_ctl.exactmatch_row_vh_xbar_enable to be 1.
@@ -746,23 +746,23 @@
 Configuring rams.array.row[7].gateway_table[1].gateway_table_entry_matchdata[3][0] to be 0xffffffff
 Configuring rams.array.row[7].gateway_table[1].gateway_table_entry_matchdata[3][1] to be 0xffffffff
 Configuring rams.array.row[7].gateway_table[1].gateway_table_ctl.gateway_table_mode to be 0x2
-Configuring rams.array.row[7].gateway_table[1].gateway_table_data_entry[3][0] to be 0xffffff
-Configuring rams.array.row[7].gateway_table[1].gateway_table_data_entry[3][1] to be 0xffff3f
+Configuring rams.array.row[7].gateway_table[1].gateway_table_data_entry[3][0] to be 0xffff00
+Configuring rams.array.row[7].gateway_table[1].gateway_table_data_entry[3][1] to be 0xffff00
 Configuring rams.match.merge.gateway_inhibit_lut[0] to be 0x8
 Configuring rams.match.merge.gateway_next_table_lut[0][3] to be 0x11
 Configuring rams.array.row[7].gateway_table[1].gateway_table_vv_entry[2].gateway_table_entry_versionvalid0 to be 0x3
 Configuring rams.array.row[7].gateway_table[1].gateway_table_vv_entry[2].gateway_table_entry_versionvalid1 to be 0x3
 Configuring rams.array.row[7].gateway_table[1].gateway_table_entry_matchdata[2][0] to be 0xffffffff
 Configuring rams.array.row[7].gateway_table[1].gateway_table_entry_matchdata[2][1] to be 0xffffffff
-Configuring rams.array.row[7].gateway_table[1].gateway_table_data_entry[2][0] to be 0xffffff
-Configuring rams.array.row[7].gateway_table[1].gateway_table_data_entry[2][1] to be 0xff7fff
+Configuring rams.array.row[7].gateway_table[1].gateway_table_data_entry[2][0] to be 0xff00ff
+Configuring rams.array.row[7].gateway_table[1].gateway_table_data_entry[2][1] to be 0xff00ff
 Configuring rams.match.merge.gateway_inhibit_lut[0] to be 0xc (previous value 0x8 OR new value 0x4)
 Configuring rams.match.merge.gateway_next_table_lut[0][2] to be 0x11
 Configuring rams.array.row[7].gateway_table[1].gateway_table_vv_entry[1].gateway_table_entry_versionvalid0 to be 0x3
 Configuring rams.array.row[7].gateway_table[1].gateway_table_vv_entry[1].gateway_table_entry_versionvalid1 to be 0x3
 Configuring rams.array.row[7].gateway_table[1].gateway_table_entry_matchdata[1][0] to be 0xffffffff
 Configuring rams.array.row[7].gateway_table[1].gateway_table_entry_matchdata[1][1] to be 0xffffffff
-Configuring rams.array.row[7].gateway_table[1].gateway_table_data_entry[1][0] to be 0x1ffff
+Configuring rams.array.row[7].gateway_table[1].gateway_table_data_entry[1][0] to be 0x3ffff
 Configuring rams.array.row[7].gateway_table[1].gateway_table_data_entry[1][1] to be 0xffff
 Configuring rams.match.merge.gateway_inhibit_lut[0] to be 0xe (previous value 0xc OR new value 0x2)
 Configuring rams.match.merge.gateway_next_table_lut[0][1] to be 0x11
@@ -788,7 +788,7 @@
 +------------------------------------------------------------------------
 |  Working on table ingress_port_count_table in stage 1 ---
 +------------------------------------------------------------------------
---> Match Table with no key ingress_port_count_table with logical_table_id 0
+--> Hash Action Table ingress_port_count_table with logical_table_id 0
 allocated_result_bus = Ram Data Bus MatchResult2R 0 left_and_right is 83 bits
 Configuring rams.match.merge.predication_ctl[direction_index=0].table_thread to be 0x1 (previous_value=0x1 OR new_value=0x1).
 Configuring rams.match.merge.logical_table_thread[copy_index=0].logical_table_thread_ingress to be 0x1 (previous_value=0x1 OR new_value=0x1).
@@ -808,6 +808,37 @@
 Configuring rams.match.merge.mau_action_instruction_adr_map_en[table_type_index=0].mau_action_instruction_adr_map_en to be 0x1 (previous_value=0x0 OR new_value=0x1).
 Configuring rams.match.merge.mau_action_instruction_adr_map_data[table_type_index=0][logical_table=0][entry_index=0].mau_action_instruction_adr_map_data to be 0x2000.
 Configuring rams.match.merge.mau_action_instruction_adr_map_data[table_type_index=0][logical_table=0][entry_index=1].mau_action_instruction_adr_map_data to be 0x0.
+
+---- Hash Distribution Units for table ingress_port_count_table ----
+Configuring dp.mau_match_input_xbar_exact_match_enable[direction_index=0].mau_match_input_xbar_exact_match_enable to be 0x1.  (old value = 0x1 OR new value = 0x1)
+Configuring dp.xbar_hash.xbar.mau_match_input_xbar_ternary_match_enable[direction_index=0].mau_match_input_xbar_ternary_match_enable to be 0x0.  (old value = 0x0 OR new value = 0x0)
+Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=0].match_input_xbar_816b_ctl_address to be 16.
+Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=0].match_input_xbar_816b_ctl_enable to be 1.
+Configuring match input crossbar byte 0 to come from 16-bit PHV container 0.
+  That PHV byte contains {ig_intr_md.ingress_port[7:0]}.
+Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=1].match_input_xbar_816b_ctl_address to be 16.
+Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=1].match_input_xbar_816b_ctl_enable to be 1.
+Configuring match input crossbar byte 1 to come from 16-bit PHV container 0.
+  That PHV byte contains {unused[6:0], ig_intr_md.ingress_port[8:8]}.
+Configuring dp.match_input_xbar_din_power_ctl[14_byte_group=0][byte_position=8].match_input_xbar_din_power_ctl to be 0x5.  (previous value = 0x4  OR new value = 0x1)
+Configuring dp.xbar_hash.hash.parity_group_mask[parity_group_mask_index=0][byte_number=0].parity_group_mask to be 0x1.  (previous value = 0x1  OR  new value = 0x1)
+Configuring dp.xbar_hash.hash.parity_group_mask[parity_group_mask_index=0][byte_number=1].parity_group_mask to be 0x0.  (previous value = 0x0  OR  new value = 0x0)
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=0][hash_bit_index=0].byte0 to be 0x1.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=0][hash_bit_index=1].byte0 to be 0x2.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=0][hash_bit_index=2].byte0 to be 0x4.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=0][hash_bit_index=3].byte0 to be 0x8.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=0][hash_bit_index=4].byte0 to be 0x10.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=0][hash_bit_index=5].byte0 to be 0x20.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=0][hash_bit_index=6].byte0 to be 0x40.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=0][hash_bit_index=7].byte0 to be 0x80.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=0][hash_bit_index=8].byte1 to be 0x1.
+Configuring dp.hashout_ctl.hash_group_ingress_enable to be 0x1.  (previous value = 0x1 OR new value = 0x1)
+Configuring rams.match.merge.mau_hash_group_config.hash_group_enable to be 1. (old value = 0 OR new value = 1).
+Configuring rams.match.merge.mau_hash_group_config.hash_group_sel to be 8. (old value = 0 OR new value = 8).
+Configuring rams.match.merge.mau_hash_group_config.hash_group_ctl to be 1. (old value = 0 OR new value = 1).
+Configuring rams.match.merge.mau_hash_group_shiftcount.mau_hash_group_shiftcount to be 0x1. (old value = 0x0 OR new value = 0x1).
+Configuring rams.match.merge.mau_hash_group_mask[which_16=0].mau_hash_group_mask to be 0x3ff.  (previous value = 0x0  OR new value = 0x3ff)
+Configuring rams.match.merge.mau_hash_group_xbar_ctl[output_type_index=3][control_group_index=0].mau_hash_group_xbar_ctl to be 0x8 (old value = 0x0 OR new value = 0x8).
 Configuring rams.match.merge.mau_payload_shifter_enable[table_type=0][result_bus=1].stats_adr_payload_shifter_en to be 1.
 Configuring rams.match.merge.mau_payload_shifter_enable[table_type=0][result_bus=1].action_instruction_adr_payload_shifter_en to be 1.
 
@@ -819,7 +850,7 @@
 +------------------------------------------------------------------------
 |  Working on table egress_port_count_table in stage 1 ---
 +------------------------------------------------------------------------
---> Match Table with no key egress_port_count_table with logical_table_id 1
+--> Hash Action Table egress_port_count_table with logical_table_id 1
 allocated_result_bus = Ram Data Bus MatchResult1R 0 left_and_right is 83 bits
 Configuring rams.match.merge.predication_ctl[direction_index=0].table_thread to be 0x3 (previous_value=0x1 OR new_value=0x2).
 Configuring rams.match.merge.logical_table_thread[copy_index=0].logical_table_thread_ingress to be 0x3 (previous_value=0x1 OR new_value=0x2).
@@ -839,6 +870,37 @@
 Configuring rams.match.merge.mau_action_instruction_adr_map_en[table_type_index=0].mau_action_instruction_adr_map_en to be 0x3 (previous_value=0x1 OR new_value=0x2).
 Configuring rams.match.merge.mau_action_instruction_adr_map_data[table_type_index=0][logical_table=1][entry_index=0].mau_action_instruction_adr_map_data to be 0x40.
 Configuring rams.match.merge.mau_action_instruction_adr_map_data[table_type_index=0][logical_table=1][entry_index=1].mau_action_instruction_adr_map_data to be 0x0.
+
+---- Hash Distribution Units for table egress_port_count_table ----
+Configuring dp.mau_match_input_xbar_exact_match_enable[direction_index=0].mau_match_input_xbar_exact_match_enable to be 0x3.  (old value = 0x1 OR new value = 0x2)
+Configuring dp.xbar_hash.xbar.mau_match_input_xbar_ternary_match_enable[direction_index=0].mau_match_input_xbar_ternary_match_enable to be 0x0.  (old value = 0x0 OR new value = 0x0)
+Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=8].match_input_xbar_816b_ctl_address to be 18.
+Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=8].match_input_xbar_816b_ctl_enable to be 1.
+Configuring match input crossbar byte 8 to come from 16-bit PHV container 2.
+  That PHV byte contains {ig_intr_md_for_tm.ucast_egress_port[7:0]}.
+Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=9].match_input_xbar_816b_ctl_address to be 18.
+Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=9].match_input_xbar_816b_ctl_enable to be 1.
+Configuring match input crossbar byte 9 to come from 16-bit PHV container 2.
+  That PHV byte contains {unused[6:0], ig_intr_md_for_tm.ucast_egress_port[8:8]}.
+Configuring dp.match_input_xbar_din_power_ctl[14_byte_group=0][byte_position=8].match_input_xbar_din_power_ctl to be 0x5.  (previous value = 0x5  OR new value = 0x4)
+Configuring dp.xbar_hash.hash.parity_group_mask[parity_group_mask_index=1][byte_number=0].parity_group_mask to be 0x2.  (previous value = 0x0  OR  new value = 0x2)
+Configuring dp.xbar_hash.hash.parity_group_mask[parity_group_mask_index=1][byte_number=1].parity_group_mask to be 0x0.  (previous value = 0x0  OR  new value = 0x0)
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=4][hash_bit_index=0].byte0 to be 0x1.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=4][hash_bit_index=1].byte0 to be 0x2.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=4][hash_bit_index=2].byte0 to be 0x4.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=4][hash_bit_index=3].byte0 to be 0x8.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=4][hash_bit_index=4].byte0 to be 0x10.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=4][hash_bit_index=5].byte0 to be 0x20.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=4][hash_bit_index=6].byte0 to be 0x40.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=4][hash_bit_index=7].byte0 to be 0x80.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=4][hash_bit_index=8].byte1 to be 0x1.
+Configuring dp.hashout_ctl.hash_group_ingress_enable to be 0x3.  (previous value = 0x1 OR new value = 0x2)
+Configuring rams.match.merge.mau_hash_group_config.hash_group_enable to be 9. (old value = 1 OR new value = 8).
+Configuring rams.match.merge.mau_hash_group_config.hash_group_sel to be 152. (old value = 8 OR new value = 144).
+Configuring rams.match.merge.mau_hash_group_config.hash_group_ctl to be 65. (old value = 1 OR new value = 64).
+Configuring rams.match.merge.mau_hash_group_shiftcount.mau_hash_group_shiftcount to be 0x201. (old value = 0x1 OR new value = 0x200).
+Configuring rams.match.merge.mau_hash_group_mask[which_16=3].mau_hash_group_mask to be 0x3ff.  (previous value = 0x0  OR new value = 0x3ff)
+Configuring rams.match.merge.mau_hash_group_xbar_ctl[output_type_index=3][control_group_index=0].mau_hash_group_xbar_ctl to be 0xb8 (old value = 0x8 OR new value = 0xb0).
 --> Stage Gateway Table for condition egress_port_count_table_always_true_condition in stage 1
 Configuring rams.match.merge.predication_ctl[direction_index=0].table_thread to be 0x3 (previous_value=0x3 OR new_value=0x2).
 Configuring rams.match.adrdist.adr_dist_table_thread[direction_index=0][copy_index=0].adr_dist_table_thread to be 0x3 (previous_value=0x3 OR new_value=0x2).
@@ -846,11 +908,11 @@
 Configuring rams.match.merge.logical_table_thread[copy_index=0].logical_table_thread_ingress to be 0x3 (previous_value=0x3 OR new_value=0x2).
 Configuring rams.match.merge.logical_table_thread[copy_index=1].logical_table_thread_ingress to be 0x3 (previous_value=0x3 OR new_value=0x2).
 Configuring rams.match.merge.logical_table_thread[copy_index=2].logical_table_thread_ingress to be 0x3 (previous_value=0x3 OR new_value=0x2).
-Configuring dp.mau_match_input_xbar_exact_match_enable[direction_index=0].mau_match_input_xbar_exact_match_enable to be 0x1.  (old value = 0x1 OR new value = 0x0)
+Configuring dp.mau_match_input_xbar_exact_match_enable[direction_index=0].mau_match_input_xbar_exact_match_enable to be 0x3.  (old value = 0x3 OR new value = 0x0)
 Configuring dp.xbar_hash.xbar.mau_match_input_xbar_ternary_match_enable[direction_index=0].mau_match_input_xbar_ternary_match_enable to be 0x0.  (old value = 0x0 OR new value = 0x0)
 Configuring dp.xbar_hash.hash.parity_group_mask[parity_group_mask_index=0][byte_number=0].parity_group_mask to be 0x1.  (previous value = 0x1  OR  new value = 0x0)
 Configuring dp.xbar_hash.hash.parity_group_mask[parity_group_mask_index=0][byte_number=1].parity_group_mask to be 0x0.  (previous value = 0x0  OR  new value = 0x0)
-Configuring dp.hashout_ctl.hash_group_ingress_enable to be 0x1.  (previous value = 0x1 OR new value = 0x1)
+Configuring dp.hashout_ctl.hash_group_ingress_enable to be 0x3.  (previous value = 0x3 OR new value = 0x1)
 Configuring rams.array.row[7].gateway_table[0].gateway_table_ctl.gateway_table_input_data0_select to be 0x1
 Configuring rams.array.row[7].gateway_table[0].gateway_table_ctl.gateway_table_input_data1_select to be 0x0
 Configuring rams.array.row[7].gateway_table[0].gateway_table_ctl.gateway_table_input_hash0_select to be 0x1
@@ -1948,7 +2010,7 @@
 Configuring dp.phv_fifo_enable.phv_fifo_egress_final_output_enable to be 0.
 
 +------------------------------------------------------------------------
-|  Number of configuration field values set in Match-Action Stages: 1567
+|  Number of configuration field values set in Match-Action Stages: 1617
 +------------------------------------------------------------------------
 
 +------------------------------------------------------------------------
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/logs/mau.gateway.log b/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/logs/mau.gateway.log
index 30897dd..2a1b0c2 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/logs/mau.gateway.log
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/logs/mau.gateway.log
@@ -1,7 +1,7 @@
 +---------------------------------------------------------------------+
 |  Log file: mau.gateway.log                                          |
 |  Compiler version: 5.1.0 (fca32d1)                                  |
-|  Created on: Fri Sep  8 08:24:30 2017                               |
+|  Created on: Wed Sep 13 00:58:56 2017                               |
 +---------------------------------------------------------------------+
 
 
@@ -752,7 +752,7 @@
 Gateway 14
 ------- Phase 0 -------------
 Looking at gateway table 14
-match_groups_attached_to_gateway = OrderedDict([(0, (0, [0], 0, [0], [(<p4c_tofino.target.tofino.device.pipeline.mau.match_keys.packed_gateway_key.PackedGatewayKey object at 0x7f555b613450>, 0)])), (1, (None, [], None, [], []))])
+match_groups_attached_to_gateway = OrderedDict([(0, (0, [0], 0, [0], [(<p4c_tofino.target.tofino.device.pipeline.mau.match_keys.packed_gateway_key.PackedGatewayKey object at 0x7ff9ed740390>, 0)])), (1, (None, [], None, [], []))])
 Search bus 0 on row 7
 ----------------------------
  Trying to place Gateway Resource Request for table process_packet_out_table_always_true_condition needs access to 0 input bits in exact match group 0 (parity groups [0]) and hash group 0 for gateway 14.
@@ -1121,7 +1121,7 @@
 Gateway 14
 ------- Phase 0 -------------
 Looking at gateway table 14
-match_groups_attached_to_gateway = OrderedDict([(0, (0, [0], 0, [0], [(<p4c_tofino.target.tofino.device.pipeline.mau.match_keys.packed_gateway_key.PackedGatewayKey object at 0x7f555b192810>, 0)])), (1, (None, [], None, [], []))])
+match_groups_attached_to_gateway = OrderedDict([(0, (0, [0], 0, [0], [(<p4c_tofino.target.tofino.device.pipeline.mau.match_keys.packed_gateway_key.PackedGatewayKey object at 0x7ff9ed9d1790>, 0)])), (1, (None, [], None, [], []))])
 Search bus 0 on row 7
 ----------------------------
  Trying to place Gateway Resource Request for table process_packet_out_table_always_true_condition needs access to 0 input bits in exact match group 0 (parity groups [0]) and hash group 0 for gateway 14.
@@ -1495,15 +1495,15 @@
   [42] = None
   [43] = None
  Hash Bit Mapping:
-   (1, 0) --> 40
-   (0, 0) --> 41
-   (0, 1) --> 42
-   (0, 2) --> 43
-   (0, 3) --> 44
-   (0, 4) --> 45
-   (0, 5) --> 46
-   (0, 6) --> 47
-   (0, 7) --> 48
+   (3, 0) --> 40
+   (2, 0) --> 41
+   (2, 1) --> 42
+   (2, 2) --> 43
+   (2, 3) --> 44
+   (2, 4) --> 45
+   (2, 5) --> 46
+   (2, 6) --> 47
+   (2, 7) --> 48
 
 Allocating: Ram Data Bus MatchSearch1 7 left_and_right is 128 bits in stage 1 for gateway
 Allocating: Gateway 15 in stage 1 for _condition_2.
@@ -1742,15 +1742,15 @@
   [42] = None
   [43] = None
  Hash Bit Mapping:
-   (1, 0) --> 40
-   (0, 0) --> 41
-   (0, 1) --> 42
-   (0, 2) --> 43
-   (0, 3) --> 44
-   (0, 4) --> 45
-   (0, 5) --> 46
-   (0, 6) --> 47
-   (0, 7) --> 48
+   (3, 0) --> 40
+   (2, 0) --> 41
+   (2, 1) --> 42
+   (2, 2) --> 43
+   (2, 3) --> 44
+   (2, 4) --> 45
+   (2, 5) --> 46
+   (2, 6) --> 47
+   (2, 7) --> 48
 
 Allocating: Ram Data Bus MatchSearch1 7 left_and_right is 128 bits in stage 1 for gateway
 Allocating: Gateway 15 in stage 1 for _condition_2.
@@ -1846,7 +1846,7 @@
 match_groups_attached_to_gateway = OrderedDict([(0, (None, [], None, [], [])), (1, (None, [], None, [], []))])
 Search bus 0 on row 7
 
- final_parity_group_ids = [(0, []), (1, [])] 
+ final_parity_group_ids = [(0, [0]), (1, [])] 
 
  open_parity_group_ids = [0, 1] 
 ----------------------------
@@ -1989,15 +1989,15 @@
   [42] = None
   [43] = None
  Hash Bit Mapping:
-   (1, 0) --> 40
-   (0, 0) --> 41
-   (0, 1) --> 42
-   (0, 2) --> 43
-   (0, 3) --> 44
-   (0, 4) --> 45
-   (0, 5) --> 46
-   (0, 6) --> 47
-   (0, 7) --> 48
+   (3, 0) --> 40
+   (2, 0) --> 41
+   (2, 1) --> 42
+   (2, 2) --> 43
+   (2, 3) --> 44
+   (2, 4) --> 45
+   (2, 5) --> 46
+   (2, 6) --> 47
+   (2, 7) --> 48
 
 Allocating: Ram Data Bus MatchSearch1 7 left_and_right is 128 bits in stage 1 for gateway
 Allocating: Gateway 15 in stage 1 for _condition_2.
@@ -2106,7 +2106,7 @@
 match_groups_attached_to_gateway = OrderedDict([(0, (None, [], None, [], [])), (1, (None, [], None, [], []))])
 Search bus 0 on row 7
 
- final_parity_group_ids = [(0, []), (1, [])] 
+ final_parity_group_ids = [(0, [0]), (1, [])] 
 
  open_parity_group_ids = [0, 1] 
 ----------------------------
@@ -2249,15 +2249,15 @@
   [42] = None
   [43] = None
  Hash Bit Mapping:
-   (1, 0) --> 40
-   (0, 0) --> 41
-   (0, 1) --> 42
-   (0, 2) --> 43
-   (0, 3) --> 44
-   (0, 4) --> 45
-   (0, 5) --> 46
-   (0, 6) --> 47
-   (0, 7) --> 48
+   (3, 0) --> 40
+   (2, 0) --> 41
+   (2, 1) --> 42
+   (2, 2) --> 43
+   (2, 3) --> 44
+   (2, 4) --> 45
+   (2, 5) --> 46
+   (2, 6) --> 47
+   (2, 7) --> 48
 
 Allocating: Ram Data Bus MatchSearch1 7 left_and_right is 128 bits in stage 1 for gateway
 Allocating: Gateway 15 in stage 1 for _condition_2.
@@ -2279,7 +2279,7 @@
 Gateway 14
 ------- Phase 0 -------------
 Looking at gateway table 14
-match_groups_attached_to_gateway = OrderedDict([(0, (0, [0], 0, [0], [(<p4c_tofino.target.tofino.device.pipeline.mau.match_keys.packed_gateway_key.PackedGatewayKey object at 0x7f555f79cc90>, 0)])), (1, (None, [], None, [], []))])
+match_groups_attached_to_gateway = OrderedDict([(0, (0, [0], 0, [0], [(<p4c_tofino.target.tofino.device.pipeline.mau.match_keys.packed_gateway_key.PackedGatewayKey object at 0x7ff9f1742c50>, 0)])), (1, (None, [], None, [], []))])
 Search bus 0 on row 7
 ----------------------------
  Trying to place Gateway Resource Request for table egress_port_count_table_always_true_condition needs access to 0 input bits in exact match group 0 (parity groups [0]) and hash group 0 for gateway 14.
@@ -2491,7 +2491,7 @@
 match_groups_attached_to_gateway = OrderedDict([(0, (None, [], None, [], [])), (1, (None, [], None, [], []))])
 Search bus 0 on row 7
 
- final_parity_group_ids = [(0, []), (1, [])] 
+ final_parity_group_ids = [(0, [0]), (1, [])] 
 
  open_parity_group_ids = [0, 1] 
 ----------------------------
@@ -2634,15 +2634,15 @@
   [42] = None
   [43] = None
  Hash Bit Mapping:
-   (1, 0) --> 40
-   (0, 0) --> 41
-   (0, 1) --> 42
-   (0, 2) --> 43
-   (0, 3) --> 44
-   (0, 4) --> 45
-   (0, 5) --> 46
-   (0, 6) --> 47
-   (0, 7) --> 48
+   (3, 0) --> 40
+   (2, 0) --> 41
+   (2, 1) --> 42
+   (2, 2) --> 43
+   (2, 3) --> 44
+   (2, 4) --> 45
+   (2, 5) --> 46
+   (2, 6) --> 47
+   (2, 7) --> 48
 
 Allocating: Ram Data Bus MatchSearch1 7 left_and_right is 128 bits in stage 1 for gateway
 Allocating: Gateway 15 in stage 1 for _condition_2.
@@ -2664,7 +2664,7 @@
 Gateway 14
 ------- Phase 0 -------------
 Looking at gateway table 14
-match_groups_attached_to_gateway = OrderedDict([(0, (0, [0], 0, [0], [(<p4c_tofino.target.tofino.device.pipeline.mau.match_keys.packed_gateway_key.PackedGatewayKey object at 0x7f555b5fadd0>, 0)])), (1, (None, [], None, [], []))])
+match_groups_attached_to_gateway = OrderedDict([(0, (0, [0], 0, [0], [(<p4c_tofino.target.tofino.device.pipeline.mau.match_keys.packed_gateway_key.PackedGatewayKey object at 0x7ff9ed76bd10>, 0)])), (1, (None, [], None, [], []))])
 Search bus 0 on row 7
 ----------------------------
  Trying to place Gateway Resource Request for table egress_port_count_table_always_true_condition needs access to 0 input bits in exact match group 0 (parity groups [0]) and hash group 0 for gateway 14.
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/logs/mau.gw.log b/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/logs/mau.gw.log
index e208fa4..f7b547f 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/logs/mau.gw.log
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/logs/mau.gw.log
@@ -1,7 +1,7 @@
 +---------------------------------------------------------------------+
 |  Log file: mau.gw.log                                               |
 |  Compiler version: 5.1.0 (fca32d1)                                  |
-|  Created on: Fri Sep  8 08:24:30 2017                               |
+|  Created on: Wed Sep 13 00:58:56 2017                               |
 +---------------------------------------------------------------------+
 
 cond _condition_0: not valid packet_out_hdr
@@ -10,13 +10,13 @@
 cond _condition_0 can be gateway (1+0)x1
 cond !_condition_0 can be gateway (1+0)x1
 _condition_0 is gateway for table0
-cond _condition_2: ig_intr_md_for_tm.ucast_egress_port < 510
-     ig_intr_md_for_tm.ucast_egress_port < 510
-   ! ig_intr_md_for_tm.ucast_egress_port >= 510
+cond _condition_2: ig_intr_md_for_tm.ucast_egress_port < 512
+     ig_intr_md_for_tm.ucast_egress_port < 512
+   ! ig_intr_md_for_tm.ucast_egress_port >= 512
 cond _condition_2 can be gateway (9+0)x1
 cond !_condition_2 can be gateway (9+0)x1
 _condition_2 is gateway for ingress_port_count_table
-fields = OrderedSet([<p4_hlir.hlir.p4_headers.p4_field object at 0x7f555fea6d90>]) and and xor_fields is OrderedSet()
+fields = OrderedSet([<p4_hlir.hlir.p4_headers.p4_field object at 0x7ff9f1e46d10>]) and and xor_fields is OrderedSet()
 fields = OrderedSet() and and xor_fields is OrderedSet()
 cond _condition_0: not valid packet_out_hdr
      not valid packet_out_hdr
@@ -24,13 +24,13 @@
 cond _condition_0 can be gateway (1+0)x1
 cond !_condition_0 can be gateway (1+0)x1
 _condition_0 is gateway for table0
-cond _condition_2: ig_intr_md_for_tm.ucast_egress_port < 510
-     ig_intr_md_for_tm.ucast_egress_port < 510
-   ! ig_intr_md_for_tm.ucast_egress_port >= 510
+cond _condition_2: ig_intr_md_for_tm.ucast_egress_port < 512
+     ig_intr_md_for_tm.ucast_egress_port < 512
+   ! ig_intr_md_for_tm.ucast_egress_port >= 512
 cond _condition_2 can be gateway (9+0)x1
 cond !_condition_2 can be gateway (9+0)x1
 _condition_2 is gateway for ingress_port_count_table
-fields = OrderedSet([<p4_hlir.hlir.p4_headers.p4_field object at 0x7f555fea6d90>]) and and xor_fields is OrderedSet()
+fields = OrderedSet([<p4_hlir.hlir.p4_headers.p4_field object at 0x7ff9f1e46d10>]) and and xor_fields is OrderedSet()
 fields = OrderedSet() and and xor_fields is OrderedSet()
 cond _condition_0: not valid packet_out_hdr
      not valid packet_out_hdr
@@ -38,13 +38,13 @@
 cond _condition_0 can be gateway (1+0)x1
 cond !_condition_0 can be gateway (1+0)x1
 _condition_0 is gateway for table0
-cond _condition_2: ig_intr_md_for_tm.ucast_egress_port < 510
-     ig_intr_md_for_tm.ucast_egress_port < 510
-   ! ig_intr_md_for_tm.ucast_egress_port >= 510
+cond _condition_2: ig_intr_md_for_tm.ucast_egress_port < 512
+     ig_intr_md_for_tm.ucast_egress_port < 512
+   ! ig_intr_md_for_tm.ucast_egress_port >= 512
 cond _condition_2 can be gateway (9+0)x1
 cond !_condition_2 can be gateway (9+0)x1
 _condition_2 is gateway for ingress_port_count_table
-fields = OrderedSet([<p4_hlir.hlir.p4_headers.p4_field object at 0x7f555fea6d90>]) and and xor_fields is OrderedSet()
+fields = OrderedSet([<p4_hlir.hlir.p4_headers.p4_field object at 0x7ff9f1e46d10>]) and and xor_fields is OrderedSet()
 fields = OrderedSet() and and xor_fields is OrderedSet()
 cond _always_true: True == True
      True
@@ -66,12 +66,12 @@
 final.tcam: [(match=0 mask=0 T)], miss=False
 --> Stage Gateway Table for condition _condition_2 in stage 1
 T -> ingress_port_count_table(16),  F -> None(255)
-building tcam for GatewayTest('ig_intr_md_for_tm.ucast_egress_port < 510')
-  adding line (range=[ffff ffff 3fff] match=0 mask=0 T)
-  adding line (range=[ffff 7fff ffff] match=0 mask=0 T)
-  adding line (range=[1 ffff ffff] match=0 mask=0 T)
-tcam data: [(range=[ffff ffff 3fff] match=0 mask=0 T), (range=[ffff 7fff ffff] match=0 mask=0 T), (range=[1 ffff ffff] match=0 mask=0 T)]
-final.tcam: [(range=[ffff ffff 3fff] match=0 mask=0 T), (range=[ffff 7fff ffff] match=0 mask=0 T), (range=[1 ffff ffff] match=0 mask=0 T)], miss=False
+building tcam for GatewayTest('ig_intr_md_for_tm.ucast_egress_port < 512')
+  adding line (range=[ffff ffff 0] match=0 mask=0 T)
+  adding line (range=[ffff 0 ffff] match=0 mask=0 T)
+  adding line (range=[3 ffff ffff] match=0 mask=0 T)
+tcam data: [(range=[ffff ffff 0] match=0 mask=0 T), (range=[ffff 0 ffff] match=0 mask=0 T), (range=[3 ffff ffff] match=0 mask=0 T)]
+final.tcam: [(range=[ffff ffff 0] match=0 mask=0 T), (range=[ffff 0 ffff] match=0 mask=0 T), (range=[3 ffff ffff] match=0 mask=0 T)], miss=False
 --> Stage Gateway Table for condition egress_port_count_table_always_true_condition in stage 1
 T -> egress_port_count_table(17),  F -> egress_port_count_table(17)
 building tcam for GatewayTest('True')
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/logs/mau.log b/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/logs/mau.log
index 8e46412..7cf0b8d 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/logs/mau.log
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/logs/mau.log
@@ -1,7 +1,7 @@
 +---------------------------------------------------------------------+
 |  Log file: mau.log                                                  |
 |  Compiler version: 5.1.0 (fca32d1)                                  |
-|  Created on: Fri Sep  8 08:24:30 2017                               |
+|  Created on: Wed Sep 13 00:58:56 2017                               |
 +---------------------------------------------------------------------+
 
 Match Table table0 did not specify the number of entries required. A default value (512) will be used.
@@ -15,129 +15,7 @@
 Metadata bridge_ingress_intrinsic containers added between ingress/egress: [128]
 Match Entry Table table0 has already been associated with stat Table table0_counter.
 Match table ingress_port_count_table has no match key fields
-Cannot use hash-action for table ingress_port_count_table with no key because the number of entries required by side-effect table ingress_port_counter is not a power of 2 -- 510.
-
-##########################################
-  Call to decide_action_data_placement(stage=0, table=ingress_port_count_table)
-##########################################
-
-
-Max immediate bits used in any action is 0 bits.
-Overhead bit width for table ingress_port_count_table is 22 bits.
-Bits available in overhead for non-essential immediate data is 32 bits.
-~~~~~~~~~~~~~~~~~~~~~
- Examining placing 0 bits in match overhead
-Overhead bit width for table ingress_port_count_table is 22 bits.
-Overhead SRAMs to use = 97
-  Entries requested = 1024  and match entries get = 0
-ram_size_matrix = 
- (8, 8, False)  (8, 8, True)  (8, 32, False)  (16, 16, False)  (16, 16, True)  (16, 32, False)  (32, 32, False)  (32, 32, True) 
-       0              0              0               0                0               0                0                0        # 0
-
-immediate_size_matrix = 
- (8, 8, False)  (8, 8, True)  (8, 32, False)  (16, 16, False)  (16, 16, True)  (16, 32, False)  (32, 32, False)  (32, 32, True) 
-       0              0              0               0                0               0                0                0        # 0
-
-hash_to_phv_matrix = 
- (8, 8, False)  (8, 8, True)  (8, 32, False)  (16, 16, False)  (16, 16, True)  (16, 32, False)  (32, 32, False)  (32, 32, True) 
-       0              0              0               0                0               0                0                0        # 0
-
-total action ram packing size = [0, 0, 0]
-action_ram_packing:
-  action count_ingress has []
-total action ram packing size = [0, 0, 0]
-action_ram_packing:
-  action count_ingress has []
-total action ram packing size = [0, 0, 0]
-action_ram_packing:
-  action count_ingress has []
-byte_enables = []
-After allocation of 32s, available_slots is []
-final packing is []
-byte_enables = []
-After allocation of 32s, available_slots is []
-final packing is []
-byte_enables = []
-After allocation of 32s, available_slots is []
-final packing is []
-Action Data SRAMs to use = 0
-TODO: Total RAMs use when put 0 bits in match overhead: 97
-TODO: Total RAMs use when put 0 bits in match overhead: 97
-~~~~~~~~~~~~~~~~~~~~~
- Examining placing 8 bits in match overhead
-~~~~~~~~~~~~~~~~~~~~~
- Examining placing 16 bits in match overhead
-~~~~~~~~~~~~~~~~~~~~~
- Examining placing 24 bits in match overhead
-~~~~~~~~~~~~~~~~~~~~~
- Examining placing 32 bits in match overhead
-
-##########################################
-
-Best Ram Usage is 97 rams
-Best Immediate placement is 0 bits
 Match table egress_port_count_table has no match key fields
-Cannot use hash-action for table egress_port_count_table with no key because the number of entries required by side-effect table egress_port_counter is not a power of 2 -- 510.
-
-##########################################
-  Call to decide_action_data_placement(stage=0, table=egress_port_count_table)
-##########################################
-
-
-Max immediate bits used in any action is 0 bits.
-Overhead bit width for table egress_port_count_table is 20 bits.
-Bits available in overhead for non-essential immediate data is 32 bits.
-~~~~~~~~~~~~~~~~~~~~~
- Examining placing 0 bits in match overhead
-Overhead bit width for table egress_port_count_table is 20 bits.
-Overhead SRAMs to use = 97
-  Entries requested = 1024  and match entries get = 0
-ram_size_matrix = 
- (8, 8, False)  (8, 8, True)  (8, 32, False)  (16, 16, False)  (16, 16, True)  (16, 32, False)  (32, 32, False)  (32, 32, True) 
-       0              0              0               0                0               0                0                0        # 0
-
-immediate_size_matrix = 
- (8, 8, False)  (8, 8, True)  (8, 32, False)  (16, 16, False)  (16, 16, True)  (16, 32, False)  (32, 32, False)  (32, 32, True) 
-       0              0              0               0                0               0                0                0        # 0
-
-hash_to_phv_matrix = 
- (8, 8, False)  (8, 8, True)  (8, 32, False)  (16, 16, False)  (16, 16, True)  (16, 32, False)  (32, 32, False)  (32, 32, True) 
-       0              0              0               0                0               0                0                0        # 0
-
-total action ram packing size = [0, 0, 0]
-action_ram_packing:
-  action count_egress has []
-total action ram packing size = [0, 0, 0]
-action_ram_packing:
-  action count_egress has []
-total action ram packing size = [0, 0, 0]
-action_ram_packing:
-  action count_egress has []
-byte_enables = []
-After allocation of 32s, available_slots is []
-final packing is []
-byte_enables = []
-After allocation of 32s, available_slots is []
-final packing is []
-byte_enables = []
-After allocation of 32s, available_slots is []
-final packing is []
-Action Data SRAMs to use = 0
-TODO: Total RAMs use when put 0 bits in match overhead: 97
-TODO: Total RAMs use when put 0 bits in match overhead: 97
-~~~~~~~~~~~~~~~~~~~~~
- Examining placing 8 bits in match overhead
-~~~~~~~~~~~~~~~~~~~~~
- Examining placing 16 bits in match overhead
-~~~~~~~~~~~~~~~~~~~~~
- Examining placing 24 bits in match overhead
-~~~~~~~~~~~~~~~~~~~~~
- Examining placing 32 bits in match overhead
-
-##########################################
-
-Best Ram Usage is 97 rams
-Best Immediate placement is 0 bits
 
 ##########################################
   Call to decide_action_data_placement(stage=0, table=process_packet_out_table)
@@ -821,7 +699,7 @@
 Allocating Action Logical Table ID 0 in stage 1
 
 ----------------------------------------------
-Call to Allocate P4 Table with table ingress_port_counter, number_entries = 510, table id = None, and match type = exact
+Call to Allocate P4 Table with table ingress_port_counter, number_entries = 512, table id = None, and match type = exact
   Allocating in stage 1
 ----------------------------------------------
 
@@ -850,23 +728,185 @@
 Logical Table ID in stage 1 was not supplied by table placement for table ingress_port_count_table.
 Allocating Logical Table ID 0 in stage 1
 Allocating Table Type ID 0 of type exact in stage 1
-Match Overhead:
-  Field --version_valid-- [3:0] (4 bits)
-  Field --instruction_address-- [1:0] (2 bits)
-  Field --statistics_pointer-- [19:0] (20 bits)
+Too few bits (9) specified to address ingress_port_counter from table ingress_port_count_table.  10 are needed.
+The most significant 1 bit will be padded with zeros.
+----------------------------------------------
+ Call to allocate_hash_distribution_units with
+    hash_algorithm = identity
+    hash_output_width = 10
+    hash_bits_need = 10
+    output_hash_bit_start = 0
+    immediate_bit_positions = None
+    used_for = Statistics Address
+----------------------------------------------
+available_tuples_sorted_by_parity_bytes_available = [(0, 3, 0), (1, 3, 0)]
+available_tuples_split_sorted_by_parity_bytes_available = []
+Allocate fresh exact match group / hash group
+Allocating: Byte 0 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ig_intr_md.ingress_port[7:0]}.
+Allocating: Byte 1 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {unused[6:0], ig_intr_md.ingress_port[8:8]}.
+-------------------
+Call to _allocate_hash_distribution_and_hash_bits
+    p4_table = ingress_port_count_table
+    used_for = Statistics Address
+    hash_distribution_hash_id = 0
+    hash_group_id = 0
+    hash_bits_in_units = OrderedDict([(0, [0, 1, 2, 3, 4, 5, 6, 7, 8, 9])])
+    address_left_shift = 1
+-------------------
+Allocating Hash Distribution Group 0/0 for table ingress_port_count_table in stage 1.
+Allocating Hash Bit 0 in hash match group 0 for table ingress_port_count_table in stage 1.
+Allocating Hash Bit 1 in hash match group 0 for table ingress_port_count_table in stage 1.
+Allocating Hash Bit 2 in hash match group 0 for table ingress_port_count_table in stage 1.
+Allocating Hash Bit 3 in hash match group 0 for table ingress_port_count_table in stage 1.
+Allocating Hash Bit 4 in hash match group 0 for table ingress_port_count_table in stage 1.
+Allocating Hash Bit 5 in hash match group 0 for table ingress_port_count_table in stage 1.
+Allocating Hash Bit 6 in hash match group 0 for table ingress_port_count_table in stage 1.
+Allocating Hash Bit 7 in hash match group 0 for table ingress_port_count_table in stage 1.
+Allocating Hash Bit 8 in hash match group 0 for table ingress_port_count_table in stage 1.
+Allocating Hash Bit 9 in hash match group 0 for table ingress_port_count_table in stage 1.
+seed = 0x0
+set the seed to be [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
+Hash Function 0
+hash_bit_0 = ig_intr_md.ingress_port[0] ^ 0
+hash_bit_1 = ig_intr_md.ingress_port[1] ^ 0
+hash_bit_2 = ig_intr_md.ingress_port[2] ^ 0
+hash_bit_3 = ig_intr_md.ingress_port[3] ^ 0
+hash_bit_4 = ig_intr_md.ingress_port[4] ^ 0
+hash_bit_5 = ig_intr_md.ingress_port[5] ^ 0
+hash_bit_6 = ig_intr_md.ingress_port[6] ^ 0
+hash_bit_7 = ig_intr_md.ingress_port[7] ^ 0
+hash_bit_8 = ig_intr_md.ingress_port[8] ^ 0
+hash_bit_9 = 0
+hash_bit_10 = 0
+hash_bit_11 = 0
+hash_bit_12 = 0
+hash_bit_13 = 0
+hash_bit_14 = 0
+hash_bit_15 = 0
+hash_bit_16 = 0
+hash_bit_17 = 0
+hash_bit_18 = 0
+hash_bit_19 = 0
+hash_bit_20 = 0
+hash_bit_21 = 0
+hash_bit_22 = 0
+hash_bit_23 = 0
+hash_bit_24 = 0
+hash_bit_25 = 0
+hash_bit_26 = 0
+hash_bit_27 = 0
+hash_bit_28 = 0
+hash_bit_29 = 0
+hash_bit_30 = 0
+hash_bit_31 = 0
+hash_bit_32 = 0
+hash_bit_33 = 0
+hash_bit_34 = 0
+hash_bit_35 = 0
+hash_bit_36 = 0
+hash_bit_37 = 0
+hash_bit_38 = 0
+hash_bit_39 = 0
+hash_bit_40 = 0
+hash_bit_41 = 0
+hash_bit_42 = 0
+hash_bit_43 = 0
+hash_bit_44 = 0
+hash_bit_45 = 0
+hash_bit_46 = 0
+hash_bit_47 = 0
+hash_bit_48 = 0
+hash_bit_49 = 0
+hash_bit_50 = 0
+hash_bit_51 = 0
 
-Logical Table ID in stage 1 was not supplied by table placement for table ingress_port_count_table.
-Allocating Logical Table ID 0 in stage 1
-Allocating Table Type ID 0 of type exact in stage 1
-Allocating: Byte 0 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ig_intr_md_for_tm.ucast_egress_port[7:0]}.
-Allocating: Byte 1 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {unused[6:0], ig_intr_md_for_tm.ucast_egress_port[8:8]}.
+Allocating: Byte 2 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ig_intr_md_for_tm.ucast_egress_port[7:0]}.
+Allocating: Byte 3 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {unused[6:0], ig_intr_md_for_tm.ucast_egress_port[8:8]}.
 Match Table Resource Request is:
 SRAM Resource Request for table ingress_port_count_table (of type match), with 0 ways wants 0 rams.
-Allocating: Byte 0 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ig_intr_md_for_tm.ucast_egress_port[7:0]}.
-Allocating: Byte 1 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {unused[6:0], ig_intr_md_for_tm.ucast_egress_port[8:8]}.
+Allocating: Byte 2 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ig_intr_md_for_tm.ucast_egress_port[7:0]}.
+Allocating: Byte 3 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {unused[6:0], ig_intr_md_for_tm.ucast_egress_port[8:8]}.
 No micro instructions needed for action count_ingress executed from table ingress_port_count_table.
 Allocating Action ALU 0 (32 bits) in stage 1 for match table ingress_port_count_table's action count_ingress
 Allocating VLIW Instruction : 0 in stage 1 for match table ingress_port_count_table's action count_ingress
+My hash-action stage table is 
+StageHashActionTable
+  stage_number: 1
+  number_entries 1024
+  pack_format:
+    Pack Format:
+  table_word_width: 0
+  memory_word_width: 0
+  entries_per_table_word: 0
+  number_memory_units_per_table_word: 0
+  entry_list: [
+]
+
+  p4_table: 'ingress_port_count_table'
+  stage_table_handle: 0
+  stage_table_type_handle: 0
+  stage_gateway_table: StageGatewayTable
+  stage_number: 1
+  number_entries 0
+  memory_resource_allocation GatewayMemoryResourceAllocation:
+  memory_type: gateway
+  memory_units: [[15]]
+  home_row: -1
+  stateful_action_bus_output: None
+
+  p4_table: '_condition_2'
+
+  match_group_resource_allocation:
+  vliw_resource_allocation:
+   action handle 536870914 maps to:
+VliwResourceAllocation:
+  match_table_name: ingress_port_count_table
+  p4_action: count_ingress
+  address_to_use: 1
+  full_address: 64
+  vliw_instruction_number: 0
+  color: 0
+  direction: ingress
+  micro_instructions:
+
+  action_to_vliw_mapping:
+    action handle 536870914 maps to vliw instruction 0, color 0, and direction ingress and is found in instruction address 1
+  hash_distribution_usages:
+    MAU Hash Distribution Resource Usage for P4 table ingress_port_count_table
+  exact_match_group_resource_allocation : HashMatchGroupResourceAllocation:
+  match_groups: [(0, 16)]
+  match_group_key_bit_width: 9
+  match_group_phv_bit_scrambling: OrderedDict([(('ig_intr_md.ingress_port', 0), 0), (('ig_intr_md.ingress_port', 1), 1), (('ig_intr_md.ingress_port', 2), 2), (('ig_intr_md.ingress_port', 3), 3), (('ig_intr_md.ingress_port', 4), 4), (('ig_intr_md.ingress_port', 5), 5), (('ig_intr_md.ingress_port', 6), 6), (('ig_intr_md.ingress_port', 7), 7), (('ig_intr_md.ingress_port', 8), 8)])
+    ('ig_intr_md.ingress_port', 0) -> 0
+    ('ig_intr_md.ingress_port', 1) -> 1
+    ('ig_intr_md.ingress_port', 2) -> 2
+    ('ig_intr_md.ingress_port', 3) -> 3
+    ('ig_intr_md.ingress_port', 4) -> 4
+    ('ig_intr_md.ingress_port', 5) -> 5
+    ('ig_intr_md.ingress_port', 6) -> 6
+    ('ig_intr_md.ingress_port', 7) -> 7
+    ('ig_intr_md.ingress_port', 8) -> 8
+  hash_function_dictionary: OrderedDict([(0, <p4c_tofino.target.tofino.llir.mau.stage.resources.hash_function.HashFunction object at 0x7ff9ed76bcd0>)])
+  hash_group_id: 0
+  seed: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
+  table_direction: ingress
+
+  hash_distribution_resource_allocations :
+Hash Distribution:
+  source_hash_group : 0
+  hash_distribution_hash_id : 0
+  hash_distribution_group_id : 0
+  hash_distribution_used_for : Statistics Address
+  table_direction : ingress
+  bits_to_use : [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+  left_shift : 1
+  expanded_lo : False
+  expanded_hi : False
+  expanded_bit_width : 0
+  immediate_position : unused
+
+
+
 
 ----------------------------------------------
 Call to Allocate P4 Table with table egress_port_count_table__action__, number_entries = 1024, table id = None, and match type = exact
@@ -906,7 +946,7 @@
 Allocating Action Logical Table ID 1 in stage 1
 
 ----------------------------------------------
-Call to Allocate P4 Table with table egress_port_counter, number_entries = 510, table id = None, and match type = exact
+Call to Allocate P4 Table with table egress_port_counter, number_entries = 512, table id = None, and match type = exact
   Allocating in stage 1
 ----------------------------------------------
 
@@ -926,8 +966,8 @@
       ram_word_select_bits : 0
       ram_enable_select_bits : 0
 
-Allocating: Byte 0 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ig_intr_md_for_tm.ucast_egress_port[7:0]}.
-Allocating: Byte 1 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {unused[6:0], ig_intr_md_for_tm.ucast_egress_port[8:8]}.
+Allocating: Byte 2 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ig_intr_md_for_tm.ucast_egress_port[7:0]}.
+Allocating: Byte 3 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {unused[6:0], ig_intr_md_for_tm.ucast_egress_port[8:8]}.
 
 ----------------------------------------------
 Call to Allocate P4 Table with table egress_port_count_table, number_entries = 1024, table id = None, and match type = exact
@@ -937,22 +977,185 @@
 Logical Table ID in stage 1 was not supplied by table placement for table egress_port_count_table.
 Allocating Logical Table ID 1 in stage 1
 Allocating Table Type ID 1 of type exact in stage 1
-Match Overhead:
-  Field --version_valid-- [3:0] (4 bits)
-  Field --statistics_pointer-- [19:0] (20 bits)
+Too few bits (9) specified to address egress_port_counter from table egress_port_count_table.  10 are needed.
+The most significant 1 bit will be padded with zeros.
+----------------------------------------------
+ Call to allocate_hash_distribution_units with
+    hash_algorithm = identity
+    hash_output_width = 10
+    hash_bits_need = 10
+    output_hash_bit_start = 0
+    immediate_bit_positions = None
+    used_for = Statistics Address
+----------------------------------------------
+available_tuples_sorted_by_parity_bytes_available = [(1, 3, 0), (0, 2, 4)]
+available_tuples_split_sorted_by_parity_bytes_available = []
+Allocate fresh exact match group / hash group
+Allocating: Byte 8 is of type exact and member of group 0 (parity group 1) with 16 bytes. for {ig_intr_md_for_tm.ucast_egress_port[7:0]}.
+Allocating: Byte 9 is of type exact and member of group 0 (parity group 1) with 16 bytes. for {unused[6:0], ig_intr_md_for_tm.ucast_egress_port[8:8]}.
+-------------------
+Call to _allocate_hash_distribution_and_hash_bits
+    p4_table = egress_port_count_table
+    used_for = Statistics Address
+    hash_distribution_hash_id = 1
+    hash_group_id = 1
+    hash_bits_in_units = OrderedDict([(0, [0, 1, 2, 3, 4, 5, 6, 7, 8, 9])])
+    address_left_shift = 1
+-------------------
+Allocating Hash Distribution Group 1/0 for table egress_port_count_table in stage 1.
+Allocating Hash Bit 0 in hash match group 1 for table egress_port_count_table in stage 1.
+Allocating Hash Bit 1 in hash match group 1 for table egress_port_count_table in stage 1.
+Allocating Hash Bit 2 in hash match group 1 for table egress_port_count_table in stage 1.
+Allocating Hash Bit 3 in hash match group 1 for table egress_port_count_table in stage 1.
+Allocating Hash Bit 4 in hash match group 1 for table egress_port_count_table in stage 1.
+Allocating Hash Bit 5 in hash match group 1 for table egress_port_count_table in stage 1.
+Allocating Hash Bit 6 in hash match group 1 for table egress_port_count_table in stage 1.
+Allocating Hash Bit 7 in hash match group 1 for table egress_port_count_table in stage 1.
+Allocating Hash Bit 8 in hash match group 1 for table egress_port_count_table in stage 1.
+Allocating Hash Bit 9 in hash match group 1 for table egress_port_count_table in stage 1.
+seed = 0x0
+set the seed to be [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
+Hash Function 0
+hash_bit_0 = ig_intr_md_for_tm.ucast_egress_port[0] ^ 0
+hash_bit_1 = ig_intr_md_for_tm.ucast_egress_port[1] ^ 0
+hash_bit_2 = ig_intr_md_for_tm.ucast_egress_port[2] ^ 0
+hash_bit_3 = ig_intr_md_for_tm.ucast_egress_port[3] ^ 0
+hash_bit_4 = ig_intr_md_for_tm.ucast_egress_port[4] ^ 0
+hash_bit_5 = ig_intr_md_for_tm.ucast_egress_port[5] ^ 0
+hash_bit_6 = ig_intr_md_for_tm.ucast_egress_port[6] ^ 0
+hash_bit_7 = ig_intr_md_for_tm.ucast_egress_port[7] ^ 0
+hash_bit_8 = ig_intr_md_for_tm.ucast_egress_port[8] ^ 0
+hash_bit_9 = 0
+hash_bit_10 = 0
+hash_bit_11 = 0
+hash_bit_12 = 0
+hash_bit_13 = 0
+hash_bit_14 = 0
+hash_bit_15 = 0
+hash_bit_16 = 0
+hash_bit_17 = 0
+hash_bit_18 = 0
+hash_bit_19 = 0
+hash_bit_20 = 0
+hash_bit_21 = 0
+hash_bit_22 = 0
+hash_bit_23 = 0
+hash_bit_24 = 0
+hash_bit_25 = 0
+hash_bit_26 = 0
+hash_bit_27 = 0
+hash_bit_28 = 0
+hash_bit_29 = 0
+hash_bit_30 = 0
+hash_bit_31 = 0
+hash_bit_32 = 0
+hash_bit_33 = 0
+hash_bit_34 = 0
+hash_bit_35 = 0
+hash_bit_36 = 0
+hash_bit_37 = 0
+hash_bit_38 = 0
+hash_bit_39 = 0
+hash_bit_40 = 0
+hash_bit_41 = 0
+hash_bit_42 = 0
+hash_bit_43 = 0
+hash_bit_44 = 0
+hash_bit_45 = 0
+hash_bit_46 = 0
+hash_bit_47 = 0
+hash_bit_48 = 0
+hash_bit_49 = 0
+hash_bit_50 = 0
+hash_bit_51 = 0
 
-Logical Table ID in stage 1 was not supplied by table placement for table egress_port_count_table.
-Allocating Logical Table ID 1 in stage 1
-Allocating Table Type ID 1 of type exact in stage 1
-Allocating: Byte 0 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ig_intr_md_for_tm.ucast_egress_port[7:0]}.
-Allocating: Byte 1 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {unused[6:0], ig_intr_md_for_tm.ucast_egress_port[8:8]}.
+Allocating: Byte 2 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ig_intr_md_for_tm.ucast_egress_port[7:0]}.
+Allocating: Byte 3 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {unused[6:0], ig_intr_md_for_tm.ucast_egress_port[8:8]}.
 Match Table Resource Request is:
 SRAM Resource Request for table egress_port_count_table (of type match), with 0 ways wants 0 rams.
-Allocating: Byte 0 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ig_intr_md_for_tm.ucast_egress_port[7:0]}.
-Allocating: Byte 1 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {unused[6:0], ig_intr_md_for_tm.ucast_egress_port[8:8]}.
+Allocating: Byte 2 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ig_intr_md_for_tm.ucast_egress_port[7:0]}.
+Allocating: Byte 3 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {unused[6:0], ig_intr_md_for_tm.ucast_egress_port[8:8]}.
 No micro instructions needed for action count_egress executed from table egress_port_count_table.
 Allocating Action ALU 0 (32 bits) in stage 1 for match table egress_port_count_table's action count_egress
 Allocating VLIW Instruction : 0 in stage 1 for match table egress_port_count_table's action count_egress
+My hash-action stage table is 
+StageHashActionTable
+  stage_number: 1
+  number_entries 1024
+  pack_format:
+    Pack Format:
+  table_word_width: 0
+  memory_word_width: 0
+  entries_per_table_word: 0
+  number_memory_units_per_table_word: 0
+  entry_list: [
+]
+
+  p4_table: 'egress_port_count_table'
+  stage_table_handle: 1
+  stage_table_type_handle: 1
+  stage_gateway_table: StageGatewayTable
+  stage_number: 1
+  number_entries 0
+  memory_resource_allocation GatewayMemoryResourceAllocation:
+  memory_type: gateway
+  memory_units: [[14]]
+  home_row: -1
+  stateful_action_bus_output: None
+
+  p4_table: 'egress_port_count_table_always_true_condition'
+
+  match_group_resource_allocation:
+  vliw_resource_allocation:
+   action handle 536870916 maps to:
+VliwResourceAllocation:
+  match_table_name: egress_port_count_table
+  p4_action: count_egress
+  address_to_use: 0
+  full_address: 64
+  vliw_instruction_number: 0
+  color: 0
+  direction: ingress
+  micro_instructions:
+
+  action_to_vliw_mapping:
+    action handle 536870916 maps to vliw instruction 0, color 0, and direction ingress and is found in instruction address 0
+  hash_distribution_usages:
+    MAU Hash Distribution Resource Usage for P4 table egress_port_count_table
+  exact_match_group_resource_allocation : HashMatchGroupResourceAllocation:
+  match_groups: [(0, 16)]
+  match_group_key_bit_width: 73
+  match_group_phv_bit_scrambling: OrderedDict([(('ig_intr_md_for_tm.ucast_egress_port', 0), 64), (('ig_intr_md_for_tm.ucast_egress_port', 1), 65), (('ig_intr_md_for_tm.ucast_egress_port', 2), 66), (('ig_intr_md_for_tm.ucast_egress_port', 3), 67), (('ig_intr_md_for_tm.ucast_egress_port', 4), 68), (('ig_intr_md_for_tm.ucast_egress_port', 5), 69), (('ig_intr_md_for_tm.ucast_egress_port', 6), 70), (('ig_intr_md_for_tm.ucast_egress_port', 7), 71), (('ig_intr_md_for_tm.ucast_egress_port', 8), 72)])
+    ('ig_intr_md_for_tm.ucast_egress_port', 0) -> 64
+    ('ig_intr_md_for_tm.ucast_egress_port', 1) -> 65
+    ('ig_intr_md_for_tm.ucast_egress_port', 2) -> 66
+    ('ig_intr_md_for_tm.ucast_egress_port', 3) -> 67
+    ('ig_intr_md_for_tm.ucast_egress_port', 4) -> 68
+    ('ig_intr_md_for_tm.ucast_egress_port', 5) -> 69
+    ('ig_intr_md_for_tm.ucast_egress_port', 6) -> 70
+    ('ig_intr_md_for_tm.ucast_egress_port', 7) -> 71
+    ('ig_intr_md_for_tm.ucast_egress_port', 8) -> 72
+  hash_function_dictionary: OrderedDict([(0, <p4c_tofino.target.tofino.llir.mau.stage.resources.hash_function.HashFunction object at 0x7ff9ed752590>)])
+  hash_group_id: 1
+  seed: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
+  table_direction: ingress
+
+  hash_distribution_resource_allocations :
+Hash Distribution:
+  source_hash_group : 1
+  hash_distribution_hash_id : 1
+  hash_distribution_group_id : 0
+  hash_distribution_used_for : Statistics Address
+  table_direction : ingress
+  bits_to_use : [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+  left_shift : 1
+  expanded_lo : False
+  expanded_hi : False
+  expanded_bit_width : 0
+  immediate_position : unused
+
+
+
 Cannot find table object for 'process_packet_out_table_always_true_condition'.
 Cannot find table object for 'egress_port_count_table_always_true_condition'.
 Cannot find table object for 'process_packet_out_table_always_true_condition'.
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/logs/mau.resources.log b/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/logs/mau.resources.log
index 8fd4959..7ee6b09 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/logs/mau.resources.log
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/logs/mau.resources.log
@@ -1,7 +1,7 @@
 +---------------------------------------------------------------------+
 |  Log file: mau.resources.log                                        |
 |  Compiler version: 5.1.0 (fca32d1)                                  |
-|  Created on: Fri Sep  8 08:24:30 2017                               |
+|  Created on: Wed Sep 13 00:58:56 2017                               |
 +---------------------------------------------------------------------+
 
 
@@ -9,7 +9,7 @@
 | Stage Number | Exact Match Input xbar | Ternary Match Input xbar | Hash Bit | Hash Dist Unit | Gateway | SRAM | Map RAM | TCAM | VLIW Instr | Meter ALU | Stats ALU | Stash | Action Data Bus Bytes | 8-bit Action Slots | 16-bit Action Slots | 32-bit Action Slots | Logical TableID |
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 |      0       |           1            |            16            |    1     |       0        |    2    |  3   |    3    |  3   |     3      |     0     |     1     |   0   |           4           |         0          |          2          |          1          |        2        |
-|      1       |           2            |            0             |    9     |       0        |    2    |  4   |    4    |  0   |     1      |     0     |     2     |   0   |           0           |         0          |          0          |          0          |        2        |
+|      1       |           6            |            0             |    29    |       2        |    2    |  4   |    4    |  0   |     1      |     0     |     2     |   0   |           0           |         0          |          0          |          0          |        2        |
 |      2       |           0            |            0             |    0     |       0        |    0    |  0   |    0    |  0   |     0      |     0     |     0     |   0   |           0           |         0          |          0          |          0          |        0        |
 |      3       |           0            |            0             |    0     |       0        |    0    |  0   |    0    |  0   |     0      |     0     |     0     |   0   |           0           |         0          |          0          |          0          |        0        |
 |      4       |           0            |            0             |    0     |       0        |    0    |  0   |    0    |  0   |     0      |     0     |     0     |   0   |           0           |         0          |          0          |          0          |        0        |
@@ -21,7 +21,7 @@
 |      10      |           0            |            0             |    0     |       0        |    0    |  0   |    0    |  0   |     0      |     0     |     0     |   0   |           0           |         0          |          0          |          0          |        0        |
 |      11      |           0            |            0             |    0     |       0        |    0    |  0   |    0    |  0   |     0      |     0     |     0     |   0   |           0           |         0          |          0          |          0          |        0        |
 |              |                        |                          |          |                |         |      |         |      |            |           |           |       |                       |                    |                     |                     |                 |
-|    Totals    |           3            |            16            |    10    |       0        |    4    |  7   |    7    |  3   |     4      |     0     |     3     |   0   |           4           |         0          |          2          |          1          |        4        |
+|    Totals    |           7            |            16            |    30    |       2        |    4    |  7   |    7    |  3   |     4      |     0     |     3     |   0   |           4           |         0          |          2          |          1          |        4        |
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 
 
@@ -29,7 +29,7 @@
 | Stage Number | Exact Match Input xbar | Ternary Match Input xbar | Hash Bit | Hash Dist Unit | Gateway |  SRAM | Map RAM |  TCAM  | VLIW Instr | Meter ALU | Stats ALU | Stash | Action Data Bus Bytes | 8-bit Action Slots | 16-bit Action Slots | 32-bit Action Slots | Logical TableID |
 ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 |      0       |         0.78%          |          24.24%          |  0.24%   |     0.00%      |  12.50% | 3.75% |  6.25%  | 12.50% |   9.38%    |   0.00%   |   25.00%  | 0.00% |         3.12%         |       0.00%        |        6.25%        |        3.12%        |      12.50%     |
-|      1       |         1.56%          |          0.00%           |  2.16%   |     0.00%      |  12.50% | 5.00% |  8.33%  | 0.00%  |   3.12%    |   0.00%   |   50.00%  | 0.00% |         0.00%         |       0.00%        |        0.00%        |        0.00%        |      12.50%     |
+|      1       |         4.69%          |          0.00%           |  6.97%   |     33.33%     |  12.50% | 5.00% |  8.33%  | 0.00%  |   3.12%    |   0.00%   |   50.00%  | 0.00% |         0.00%         |       0.00%        |        0.00%        |        0.00%        |      12.50%     |
 |      2       |         0.00%          |          0.00%           |  0.00%   |     0.00%      |  0.00%  | 0.00% |  0.00%  | 0.00%  |   0.00%    |   0.00%   |   0.00%   | 0.00% |         0.00%         |       0.00%        |        0.00%        |        0.00%        |      0.00%      |
 |      3       |         0.00%          |          0.00%           |  0.00%   |     0.00%      |  0.00%  | 0.00% |  0.00%  | 0.00%  |   0.00%    |   0.00%   |   0.00%   | 0.00% |         0.00%         |       0.00%        |        0.00%        |        0.00%        |      0.00%      |
 |      4       |         0.00%          |          0.00%           |  0.00%   |     0.00%      |  0.00%  | 0.00% |  0.00%  | 0.00%  |   0.00%    |   0.00%   |   0.00%   | 0.00% |         0.00%         |       0.00%        |        0.00%        |        0.00%        |      0.00%      |
@@ -41,7 +41,7 @@
 |      10      |         0.00%          |          0.00%           |  0.00%   |     0.00%      |  0.00%  | 0.00% |  0.00%  | 0.00%  |   0.00%    |   0.00%   |   0.00%   | 0.00% |         0.00%         |       0.00%        |        0.00%        |        0.00%        |      0.00%      |
 |      11      |         0.00%          |          0.00%           |  0.00%   |     0.00%      |  0.00%  | 0.00% |  0.00%  | 0.00%  |   0.00%    |   0.00%   |   0.00%   | 0.00% |         0.00%         |       0.00%        |        0.00%        |        0.00%        |      0.00%      |
 |              |                        |                          |          |                |         |       |         |        |            |           |           |       |                       |                    |                     |                     |                 |
-|   Average    |         0.20%          |          2.02%           |  0.20%   |     0.00%      |  2.08%  | 0.73% |  1.22%  | 1.04%  |   1.04%    |   0.00%   |   6.25%   | 0.00% |         0.26%         |       0.00%        |        0.52%        |        0.26%        |      2.08%      |
+|   Average    |         0.46%          |          2.02%           |  0.60%   |     2.78%      |  2.08%  | 0.73% |  1.22%  | 1.04%  |   1.04%    |   0.00%   |   6.25%   | 0.00% |         0.26%         |       0.00%        |        0.52%        |        0.26%        |      2.08%      |
 ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 
 
@@ -60,9 +60,9 @@
 |           table0_counter           |   0    |    0     |  0   |    0     |  2   |   0   |  2   |   0    |   0   |
 |            _condition_2            |   1    |    2     |  9   |    1     |  0   |   0   |  0   |   0    |   0   |
 | ingress_port_count_table__action__ |   1    |    0     |  0   |    0     |  0   |   0   |  0   |   0    |   0   |
-|      ingress_port_count_table      |   1    |    0     |  0   |    0     |  0   |   0   |  0   |   0    |   1   |
+|      ingress_port_count_table      |   1    |    2     |  10  |    0     |  0   |   0   |  0   |   0    |   1   |
 | egress_port_count_table__action__  |   1    |    0     |  0   |    0     |  0   |   0   |  0   |   0    |   0   |
-|      egress_port_count_table       |   1    |    0     |  0   |    1     |  0   |   0   |  0   |   0    |   1   |
+|      egress_port_count_table       |   1    |    2     |  10  |    1     |  0   |   0   |  0   |   0    |   1   |
 |        ingress_port_counter        |   1    |    0     |  0   |    0     |  2   |   0   |  2   |   0    |   0   |
 |        egress_port_counter         |   1    |    0     |  0   |    0     |  2   |   0   |  2   |   0    |   0   |
 --------------------------------------------------------------------------------------------------------------------
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/logs/mau.rf.log b/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/logs/mau.rf.log
index 6c57767..4f65b6b 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/logs/mau.rf.log
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/logs/mau.rf.log
@@ -1,6 +1,6 @@
 +---------------------------------------------------------------------+
 |  Log file: mau.rf.log                                               |
 |  Compiler version: 5.1.0 (fca32d1)                                  |
-|  Created on: Fri Sep  8 08:24:30 2017                               |
+|  Created on: Wed Sep 13 00:58:56 2017                               |
 +---------------------------------------------------------------------+
 
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/logs/mau.sram.log b/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/logs/mau.sram.log
index cac1c83..606da50 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/logs/mau.sram.log
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/logs/mau.sram.log
@@ -1,7 +1,7 @@
 +---------------------------------------------------------------------+
 |  Log file: mau.sram.log                                             |
 |  Compiler version: 5.1.0 (fca32d1)                                  |
-|  Created on: Fri Sep  8 08:24:30 2017                               |
+|  Created on: Wed Sep 13 00:58:56 2017                               |
 +---------------------------------------------------------------------+
 
 
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/logs/mau.tcam.log b/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/logs/mau.tcam.log
index 355fc95..221e0cf 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/logs/mau.tcam.log
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/logs/mau.tcam.log
@@ -1,7 +1,7 @@
 +---------------------------------------------------------------------+
 |  Log file: mau.tcam.log                                             |
 |  Compiler version: 5.1.0 (fca32d1)                                  |
-|  Created on: Fri Sep  8 08:24:30 2017                               |
+|  Created on: Wed Sep 13 00:58:56 2017                               |
 +---------------------------------------------------------------------+
 
 
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/logs/mau.tp.log b/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/logs/mau.tp.log
index 44131b9..069309e 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/logs/mau.tp.log
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/logs/mau.tp.log
@@ -1,7 +1,7 @@
 +---------------------------------------------------------------------+
 |  Log file: mau.tp.log                                               |
 |  Compiler version: 5.1.0 (fca32d1)                                  |
-|  Created on: Fri Sep  8 08:24:30 2017                               |
+|  Created on: Wed Sep 13 00:58:56 2017                               |
 +---------------------------------------------------------------------+
 
 ----- Stage 0 ------
@@ -31,10 +31,10 @@
 ------------------------------------------
  Running Table Placement 4
 ------------------------------------------
-Cannot use hash action for table ingress_port_count_table.
-Cannot use hash-action for table ingress_port_count_table with no key because the number of entries required by side-effect table ingress_port_counter is not a power of 2 -- 510.
-Cannot use hash action for table egress_port_count_table.
-Cannot use hash-action for table egress_port_count_table with no key because the number of entries required by side-effect table egress_port_counter is not a power of 2 -- 510.
+Can use hash action for table ingress_port_count_table???  True
+Decided that match table ingress_port_count_table is more efficiently allocated using hash-action to ingress_port_counter.
+Can use hash action for table egress_port_count_table???  True
+Decided that match table egress_port_count_table is more efficiently allocated using hash-action to egress_port_counter.
 Cannot use hash action for table process_packet_out_table.
 Table process_packet_out_table has no side effect tables.
 Cannot use hash action for table table0.
@@ -42,8 +42,8 @@
 ------------------------------------------
  Table Groups
 ------------------------------------------
-Table Grouping (ingress) with match table ingress_port_count_table (1024) [ingress_port_count_table__action__ (1024), ingress_port_counter (510)]
-Table Grouping (ingress) with match table egress_port_count_table (1024) [egress_port_count_table__action__ (1024), egress_port_counter (510)]
+Table Grouping (ingress) with match table ingress_port_count_table (1024) [ingress_port_count_table__action__ (1024), ingress_port_counter (512)]
+Table Grouping (ingress) with match table egress_port_count_table (1024) [egress_port_count_table__action__ (1024), egress_port_counter (512)]
 Table Grouping (ingress) with match table process_packet_out_table (1024) [process_packet_out_table__action__ (1024)]
 Table Grouping (ingress) with match table table0 (512) [table0__action__ (512), table0_counter (512)]
 Table Grouping (ingress) with condition table _condition_0 (0) []
@@ -81,13 +81,13 @@
 
 Nodes could place:
   _condition_2 (4)
->> choose Table Grouping (ingress) with match table ingress_port_count_table (1024) [ingress_port_count_table__action__ (1024), ingress_port_counter (510)]
+>> choose Table Grouping (ingress) with match table ingress_port_count_table (1024) [ingress_port_count_table__action__ (1024), ingress_port_counter (512)]
 Earliest stage can place: 1
 Placing table: ingress_port_count_table__action__ with 1024 entries
-Placing table: ingress_port_counter with 510 entries
+Placing table: ingress_port_counter with 512 entries
 Table ingress_port_count_table__action__ with 0 entries is directly referenced
 Table ingress_port_counter with 4096 entries is indirectly referenced
-Match Table ingress_port_count_table has a total of 1 entries in stage 1
+Match Table ingress_port_count_table has a total of 1024 entries in stage 1
   Direct mapped table ingress_port_count_table__action__ has 0 entries
 >> set ingress_port_count_table (5) to placed
 >> set _condition_2 (4) to placed
@@ -96,15 +96,15 @@
   egress_port_count_table (6)
 egress_port_count_table and _condition_2 not mutually exclusive
 egress_port_count_table and ingress_port_count_table not mutually exclusive
->> choose Table Grouping (ingress) with match table egress_port_count_table (1024) [egress_port_count_table__action__ (1024), egress_port_counter (510)]
+>> choose Table Grouping (ingress) with match table egress_port_count_table (1024) [egress_port_count_table__action__ (1024), egress_port_counter (512)]
 Earliest stage can place: 1
 egress_port_count_table and _condition_2 not mutually exclusive
 egress_port_count_table and ingress_port_count_table not mutually exclusive
 Placing table: egress_port_count_table__action__ with 1024 entries
-Placing table: egress_port_counter with 510 entries
+Placing table: egress_port_counter with 512 entries
 Table egress_port_count_table__action__ with 0 entries is directly referenced
 Table egress_port_counter with 4096 entries is indirectly referenced
-Match Table egress_port_count_table has a total of 1 entries in stage 1
+Match Table egress_port_count_table has a total of 1024 entries in stage 1
   Direct mapped table egress_port_count_table__action__ has 0 entries
 >> set egress_port_count_table (6) to placed
 
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/logs/pa.characterize.log b/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/logs/pa.characterize.log
index fbedb72..e6b17ae 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/logs/pa.characterize.log
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/logs/pa.characterize.log
@@ -1,7 +1,7 @@
 +---------------------------------------------------------------------+
 |  Log file: pa.characterize.log                                      |
 |  Compiler version: 5.1.0 (fca32d1)                                  |
-|  Created on: Fri Sep  8 08:24:30 2017                               |
+|  Created on: Wed Sep 13 00:58:56 2017                               |
 +---------------------------------------------------------------------+
 
 Program: default
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/logs/pa.constraints.log b/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/logs/pa.constraints.log
index 0813a74..dabf298 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/logs/pa.constraints.log
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/logs/pa.constraints.log
@@ -1,7 +1,7 @@
 +---------------------------------------------------------------------+
 |  Log file: pa.constraints.log                                       |
 |  Compiler version: 5.1.0 (fca32d1)                                  |
-|  Created on: Fri Sep  8 08:24:30 2017                               |
+|  Created on: Wed Sep 13 00:58:56 2017                               |
 +---------------------------------------------------------------------+
 
 To populate this log file, include --print-pa-constraints as a compiler argument.
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/logs/pa.liveness.log b/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/logs/pa.liveness.log
index 35be00a..b01c3da 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/logs/pa.liveness.log
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/logs/pa.liveness.log
@@ -1,6 +1,6 @@
 +---------------------------------------------------------------------+
 |  Log file: pa.liveness.log                                          |
 |  Compiler version: 5.1.0 (fca32d1)                                  |
-|  Created on: Fri Sep  8 08:24:30 2017                               |
+|  Created on: Wed Sep 13 00:58:56 2017                               |
 +---------------------------------------------------------------------+
 
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/logs/pa.log b/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/logs/pa.log
index 0311aff..c36f6b92 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/logs/pa.log
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/logs/pa.log
@@ -1,7 +1,7 @@
 +---------------------------------------------------------------------+
 |  Log file: pa.log                                                   |
 |  Compiler version: 5.1.0 (fca32d1)                                  |
-|  Created on: Fri Sep  8 08:24:30 2017                               |
+|  Created on: Wed Sep 13 00:58:56 2017                               |
 +---------------------------------------------------------------------+
 
 HLIR Version: 0.10.5
@@ -549,7 +549,7 @@
   parse_pkt_in and parse_pkt_out are exclusive parse states
   parse_tcp and parse_udp are exclusive parse states
 
->>Event 'pa_init' at time 1504859072.87
+>>Event 'pa_init' at time 1505264338.44
    Took 0.01 seconds
 --------------------------------------------
 PHV MAU Groups: 90
@@ -827,7 +827,7 @@
   eg_intr_md.egress_cos <3 bits egress parsed imeta>
 
 
->>Event 'pa_resv' at time 1504859072.88
+>>Event 'pa_resv' at time 1505264338.44
    Took 0.00 seconds
 
 -----------------------------------------------
@@ -869,7 +869,7 @@
   Group 2 32 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 12 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv32
   Group 3 32 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 12 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv48
 Reserving 32-bit container for ingress: phv0
->>Event 'pa_bridge' at time 1504859072.91
+>>Event 'pa_bridge' at time 1505264338.48
    Took 0.04 seconds
 
 -----------------------------------------------
@@ -922,7 +922,7 @@
 |     Overall total      |    1 (0.30%)    | 32 (0.52%) |      6144      |
 ---------------------------------------------------------------------------
 
->>Event 'pa_phase0' at time 1504859072.92
+>>Event 'pa_phase0' at time 1505264338.48
    Took 0.00 seconds
 
 -----------------------------------------------
@@ -975,7 +975,7 @@
 |     Overall total      |    1 (0.30%)    | 32 (0.52%) |      6144      |
 ---------------------------------------------------------------------------
 
->>Event 'pa_critical' at time 1504859072.92
+>>Event 'pa_critical' at time 1505264338.49
    Took 0.00 seconds
 
 -----------------------------------------------
@@ -2023,8 +2023,8 @@
 |     Overall total      |   52 (15.48%)   | 968 (15.76%) |      6144      |
 -----------------------------------------------------------------------------
 
->>Event 'pa_overlay' at time 1504859082.02
-   Took 9.10 seconds
+>>Event 'pa_overlay' at time 1505264347.52
+   Took 9.03 seconds
 
 -----------------------------------------------
   Allocating remaining parsed fields
@@ -2288,8 +2288,8 @@
 |     Overall total      |    0 (0.00%)    | 0 (0.00%) |      6144      |
 --------------------------------------------------------------------------
 
->>Event 'pa_meta1' at time 1504859082.54
-   Took 0.52 seconds
+>>Event 'pa_meta1' at time 1505264348.03
+   Took 0.51 seconds
 
 -----------------------------------------------
   Allocating metadata (pass 1)
@@ -2433,7 +2433,7 @@
 --------------------------------------------------------------------------
 
 Sorted metadata field instances to allocate: 0 / 0 bits (0 ingress bits and 0 egress bits)
->>Event 'pa_pov' at time 1504859082.61
+>>Event 'pa_pov' at time 1505264348.10
    Took 0.07 seconds
 
 -----------------------------------------------
@@ -2590,7 +2590,7 @@
  egress
     phv81 (8 bits)
   >> 8 total bits
->>Event 'pa_meta2' at time 1504859082.73
+>>Event 'pa_meta2' at time 1505264348.22
    Took 0.12 seconds
 
 -----------------------------------------------
@@ -2733,7 +2733,7 @@
     final start_bit = 5
   (1) msb_offset = 8
 ***Allocating phv67[7:5] for ig_intr_md_for_tm.drop_ctl[2:0]
->>Event 'pa_meta_init' at time 1504859082.80
+>>Event 'pa_meta_init' at time 1505264348.28
    Took 0.06 seconds
 
 -----------------------------------------------
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/logs/pa.results.log b/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/logs/pa.results.log
index 2e8758a..ca2c03f 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/logs/pa.results.log
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/logs/pa.results.log
@@ -1,7 +1,7 @@
 +---------------------------------------------------------------------+
 |  Log file: pa.results.log                                           |
 |  Compiler version: 5.1.0 (fca32d1)                                  |
-|  Created on: Fri Sep  8 08:24:30 2017                               |
+|  Created on: Wed Sep 13 00:58:56 2017                               |
 +---------------------------------------------------------------------+
 
 Program: default
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/logs/parde.calcfields.log b/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/logs/parde.calcfields.log
index 4ee6b6a..5e040e1 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/logs/parde.calcfields.log
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/logs/parde.calcfields.log
@@ -1,7 +1,7 @@
 +---------------------------------------------------------------------+
 |  Log file: parde.calcfields.log                                     |
 |  Compiler version: 5.1.0 (fca32d1)                                  |
-|  Created on: Fri Sep  8 08:24:30 2017                               |
+|  Created on: Wed Sep 13 00:58:56 2017                               |
 +---------------------------------------------------------------------+
 
 Reserving 0 16-bit ingress tphvs for residual checksums
@@ -19,19 +19,19 @@
 Number of reachable states from state <POV initialization>_<Ingress intrinsic metadata>_<Phase 0> : 10
 Number of reachable states from state <Shim start state> : 11
 parser_state_calculations:[
-	parse_tcp_140004581269072
-	parse_tcp_140004588184656
-	parse_udp_140004588183696
-	parse_ipv4_140004588185488
-	parse_ethernet_140004582443984
-	parse_pkt_in_140004588185680
-	parse_pkt_out_140004588358736
-	default_parser_140004588358928
-	start_140004588186320
-	<Phase 0>_140004583263632
-	<Ingress intrinsic metadata>_140004583263312
-	<POV initialization>_140004583264016
-	<Shim start state>_140004583329936
+	parse_tcp_140711407463824
+	parse_tcp_140711409960016
+	parse_udp_140711409959056
+	parse_ipv4_140711409960848
+	parse_ethernet_140711405223056
+	parse_pkt_in_140711409961040
+	parse_pkt_out_140711409828752
+	default_parser_140711409828560
+	start_140711409961680
+	<Phase 0>_140711400881488
+	<Ingress intrinsic metadata>_140711400881168
+	<POV initialization>_140711400881872
+	<Shim start state>_140711400968272
 ]
 parser_calculations: [
 	
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/logs/parde.config.log b/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/logs/parde.config.log
index d59725b..faca781 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/logs/parde.config.log
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/logs/parde.config.log
@@ -1,7 +1,7 @@
 +---------------------------------------------------------------------+
 |  Log file: parde.config.log                                         |
 |  Compiler version: 5.1.0 (fca32d1)                                  |
-|  Created on: Fri Sep  8 08:24:30 2017                               |
+|  Created on: Wed Sep 13 00:58:56 2017                               |
 +---------------------------------------------------------------------+
 
 Configuring deparser.inp.iim.ii_phv_csum.csum_cfg[0].csum_cfg_entry[0].zero_m_s_b = 1
@@ -16399,5 +16399,5 @@
 [None]
 ---------------
 Deparse order:
-Ingress: ['metadata_bridge', '_bridged_intr_md_', 'packet_in_hdr', 'packet_out_hdr', 'ethernet', 'ipv4', 'udp', 'tcp']
-Egress:  ['packet_in_hdr', 'packet_out_hdr', 'ethernet', 'ipv4', 'udp', 'tcp']
+Ingress: ['metadata_bridge', '_bridged_intr_md_', 'packet_out_hdr', 'packet_in_hdr', 'ethernet', 'ipv4', 'udp', 'tcp']
+Egress:  ['packet_out_hdr', 'packet_in_hdr', 'ethernet', 'ipv4', 'udp', 'tcp']
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/logs/parde.error.log b/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/logs/parde.error.log
index cf3dfaa..8d9e1e5 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/logs/parde.error.log
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/logs/parde.error.log
@@ -1,6 +1,6 @@
 +---------------------------------------------------------------------+
 |  Log file: parde.error.log                                          |
 |  Compiler version: 5.1.0 (fca32d1)                                  |
-|  Created on: Fri Sep  8 08:24:30 2017                               |
+|  Created on: Wed Sep 13 00:58:56 2017                               |
 +---------------------------------------------------------------------+
 
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/logs/parde.log b/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/logs/parde.log
index f0bc0fc..e7c0177 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/logs/parde.log
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/logs/parde.log
@@ -1,7 +1,7 @@
 +---------------------------------------------------------------------+
 |  Log file: parde.log                                                |
 |  Compiler version: 5.1.0 (fca32d1)                                  |
-|  Created on: Fri Sep  8 08:24:30 2017                               |
+|  Created on: Wed Sep 13 00:58:56 2017                               |
 +---------------------------------------------------------------------+
 
 ># Begin digest init (pre-PHV)
@@ -18,14 +18,14 @@
 ># Begin unroll of HLIR parse graph
 >## Create shadow parse graph and find loops
 >## Entrypoint 'p4_parse_state.start'
-Creating shadow state: 'p4_parse_state.start' -> 'shadow_state (start, 140004582444624)'
-Creating shadow state: 'p4_parse_state.parse_pkt_in' -> 'shadow_state (parse_pkt_in, 140004582444432)'
-Creating shadow state: 'p4_parse_state.parse_ethernet' -> 'shadow_state (parse_ethernet, 140004582443856)'
-Creating shadow state: 'p4_parse_state.parse_ipv4' -> 'shadow_state (parse_ipv4, 140004582443728)'
-Creating shadow state: 'p4_parse_state.parse_tcp' -> 'shadow_state (parse_tcp, 140004582443600)'
-Creating shadow state: 'p4_parse_state.parse_udp' -> 'shadow_state (parse_udp, 140004582443664)'
-Creating shadow state: 'p4_parse_state.default_parser' -> 'shadow_state (default_parser, 140004582443536)'
-Creating shadow state: 'p4_parse_state.parse_pkt_out' -> 'shadow_state (parse_pkt_out, 140004582443344)'
+Creating shadow state: 'p4_parse_state.start' -> 'shadow_state (start, 140711405223504)'
+Creating shadow state: 'p4_parse_state.parse_pkt_in' -> 'shadow_state (parse_pkt_in, 140711405223312)'
+Creating shadow state: 'p4_parse_state.parse_ethernet' -> 'shadow_state (parse_ethernet, 140711405222736)'
+Creating shadow state: 'p4_parse_state.parse_ipv4' -> 'shadow_state (parse_ipv4, 140711405222608)'
+Creating shadow state: 'p4_parse_state.parse_tcp' -> 'shadow_state (parse_tcp, 140711405222480)'
+Creating shadow state: 'p4_parse_state.parse_udp' -> 'shadow_state (parse_udp, 140711405222544)'
+Creating shadow state: 'p4_parse_state.default_parser' -> 'shadow_state (default_parser, 140711405222416)'
+Creating shadow state: 'p4_parse_state.parse_pkt_out' -> 'shadow_state (parse_pkt_out, 140711405222352)'
 ># End unroll of HLIR parse graph
 ># Begin deparser init
 >## Create records for gress 0
@@ -43,8 +43,8 @@
 Created record for 'p4_header_instance.tcp'
 Created record for 'p4_header_instance.udp'
 >## Build record ordering for gress 0
->## Build field ordering for record 'packet_in_hdr'
 >## Build field ordering for record 'packet_out_hdr'
+>## Build field ordering for record 'packet_in_hdr'
 >## Build field ordering for record 'ethernet'
 >## Build field ordering for record 'ipv4'
 >## Build field ordering for record 'udp'
@@ -64,8 +64,8 @@
 Created record for 'p4_header_instance.tcp'
 Created record for 'p4_header_instance.udp'
 >## Build record ordering for gress 1
->## Build field ordering for record 'packet_in_hdr'
 >## Build field ordering for record 'packet_out_hdr'
+>## Build field ordering for record 'packet_in_hdr'
 >## Build field ordering for record 'ethernet'
 >## Build field ordering for record 'ipv4'
 >## Build field ordering for record 'udp'
@@ -89,13 +89,13 @@
 ># Begin scraping deparser POV allocation from raw PHV allocation
 PHV layout: [0, 0, 0, 0, 66, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None]
 >## Scraping individual POV records
-POV 33 -> packet_out_hdr
-POV 34 -> ethernet
 POV 35 -> ipv4
 POV 36 -> tcp
 POV 37 -> udp
-POV 38 -> pov_bmeta
 POV 32 -> packet_in_hdr
+POV 38 -> pov_bmeta
+POV 33 -> packet_out_hdr
+POV 34 -> ethernet
 >## Setting up array bits
 ># End scraping deparser POV allocation from raw PHV allocation
 ># Begin parser POV rewrite
@@ -116,12 +116,12 @@
 ># Begin scraping deparser POV allocation from raw PHV allocation
 PHV layout: [81, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None]
 >## Scraping individual POV records
-POV 1 -> packet_out_hdr
-POV 2 -> ethernet
 POV 3 -> ipv4
 POV 4 -> tcp
 POV 5 -> udp
 POV 0 -> packet_in_hdr
+POV 1 -> packet_out_hdr
+POV 2 -> ethernet
 >## Setting up array bits
 ># End scraping deparser POV allocation from raw PHV allocation
 ># Begin parser POV rewrite
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/logs/parser.characterize.log b/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/logs/parser.characterize.log
index 4d4e6e3..7542705 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/logs/parser.characterize.log
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/logs/parser.characterize.log
@@ -1,6 +1,6 @@
 +---------------------------------------------------------------------+
 |  Log file: parser.characterize.log                                  |
 |  Compiler version: 5.1.0 (fca32d1)                                  |
-|  Created on: Fri Sep  8 08:24:30 2017                               |
+|  Created on: Wed Sep 13 00:58:56 2017                               |
 +---------------------------------------------------------------------+
 
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/logs/transform.log b/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/logs/transform.log
index 6f53712..d589e9a 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/logs/transform.log
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/logs/transform.log
@@ -1,7 +1,7 @@
 +---------------------------------------------------------------------+
 |  Log file: transform.log                                            |
 |  Compiler version: 5.1.0 (fca32d1)                                  |
-|  Created on: Fri Sep  8 08:24:30 2017                               |
+|  Created on: Wed Sep 13 00:58:56 2017                               |
 +---------------------------------------------------------------------+
 
 -------------------------------
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/tofino.bin b/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/tofino.bin
index a11fd1e..ab65327 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/tofino.bin
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/tofino.bin
Binary files differ
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 3cd0e6e..54c0e30 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
@@ -163,7 +163,7 @@
         
 
         <tr class="fde_row_0">
-            <td style="border-right: 1px solid black">packet_in_hdr (32)</td>
+            <td style="border-right: 1px solid black">packet_out_hdr (33)</td>
             <td>129</td>
             <td>129</td>
             <td>-</td>
@@ -172,7 +172,7 @@
         
 
         <tr class="fde_row_1">
-            <td style="border-right: 1px solid black">packet_out_hdr (33)</td>
+            <td style="border-right: 1px solid black">packet_in_hdr (32)</td>
             <td>129</td>
             <td>129</td>
             <td>-</td>
@@ -400,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_in_hdr (0)</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>
@@ -409,7 +409,7 @@
         
 
         <tr class="fde_row_1">
-            <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>
@@ -569,7 +569,7 @@
 </div></div><br><br>
 </td></tr>
 </table>
-<br><i>Created on Fri Sep  8 08:24:46 2017</i>
+<br><i>Created on Wed Sep 13 00:59:12 2017</i>
 
 <br><i>Compiler version: 5.1.0 (fca32d1)</i>
 
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/visualization/mau.html b/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/visualization/mau.html
index 3adfa0d..ba6c17f 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/visualization/mau.html
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/visualization/mau.html
@@ -49,10 +49,10 @@
 </tr>
 <tr>
 <td align="center">1</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">3</td>
+<td align="center">7</td>
 <td align="center">16</td>
-<td align="center">10</td>
-<td align="center">0</td>
+<td align="center">30</td>
+<td align="center">2</td>
 <td align="center">4</td>
 <td align="center">7</td>
 <td align="center">7</td>
@@ -352,10 +352,10 @@
 </tr>
 <tr>
 <td align="center">1</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="#01fe00" >0.20%</td>
+<td align="center" bgcolor="#02fe00" >0.46%</td>
 <td align="center" bgcolor="#0afe00" >2.02%</td>
-<td align="center" bgcolor="#01fe00" >0.20%</td>
-<td align="center" bgcolor="#00c000" >0.00%</td>
+<td align="center" bgcolor="#03fe00" >0.60%</td>
+<td align="center" bgcolor="#0efe00" >2.78%</td>
 <td align="center" bgcolor="#0afe00" >2.08%</td>
 <td align="center" bgcolor="#03fe00" >0.73%</td>
 <td align="center" bgcolor="#06fe00" >1.22%</td>
@@ -3409,20 +3409,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:chartreuse""><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:chartreuse""><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:chartreuse""><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:chartreuse""><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:chocolate""><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:chocolate""><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>
@@ -3789,7 +3801,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:chocolate""><title>SRAM:
+<rect x="360" y="104" width="16" height="16" style="stroke:black; stroke-width:1; fill:coral""><title>SRAM:
  Row: 4  Col: 6
  Unit Number: 54
  Entry Bit Width: 128
@@ -3822,7 +3834,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:coral""><title>SRAM:
+<rect x="360" y="56" width="16" height="16" style="stroke:black; stroke-width:1; fill:cornflowerblue""><title>SRAM:
  Row: 6  Col: 6
  Unit Number: 78
  Entry Bit Width: 128
@@ -3875,7 +3887,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:chocolate""><title>SRAM:
+<rect x="384" y="104" width="16" height="16" style="stroke:black; stroke-width:1; fill:coral""><title>SRAM:
  Row: 4  Col: 7
  Unit Number: 55
  Entry Bit Width: 128
@@ -3908,7 +3920,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:coral""><title>SRAM:
+<rect x="384" y="56" width="16" height="16" style="stroke:black; stroke-width:1; fill:cornflowerblue""><title>SRAM:
  Row: 6  Col: 7
  Unit Number: 79
  Entry Bit Width: 128
@@ -4247,9 +4259,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:chartreuse""><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
@@ -4259,9 +4274,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:chocolate""><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
@@ -4272,16 +4290,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:chartreuse""><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:chartreuse""><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:chartreuse""><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:chartreuse""><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:chartreuse""><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:chartreuse""><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:chartreuse""><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:chartreuse""><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:chartreuse""><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:chartreuse""><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>
@@ -4333,16 +4361,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:chocolate""><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:chocolate""><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:chocolate""><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:chocolate""><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:chocolate""><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:chocolate""><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:chocolate""><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:chocolate""><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:chocolate""><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:chocolate""><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>
@@ -4754,7 +4792,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:cornflowerblue""><title>Gateway Table Gateway:
+<rect x="72" y="40" width="8" height="8" style="stroke:black; stroke-width:1; fill:crimson""><title>Gateway Table Gateway:
  Unit: 14
  Entry Bit Width: 44
  Depth: 4
@@ -4966,7 +5004,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:chocolate""><title>Map RAM:
+<rect x="280" y="104" width="8" height="8" style="stroke:black; stroke-width:1; fill:coral""><title>Map RAM:
  Row: 4  Unit: 0
  Unit Number: 24
  Entry Bit Width: 11
@@ -4974,7 +5012,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:chocolate""><title>Map RAM:
+<rect x="288" y="104" width="8" height="8" style="stroke:black; stroke-width:1; fill:coral""><title>Map RAM:
  Row: 4  Unit: 1
  Unit Number: 25
  Entry Bit Width: 11
@@ -5032,7 +5070,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:coral""><title>Map RAM:
+<rect x="280" y="56" width="8" height="8" style="stroke:black; stroke-width:1; fill:cornflowerblue""><title>Map RAM:
  Row: 6  Unit: 0
  Unit Number: 36
  Entry Bit Width: 11
@@ -5040,7 +5078,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:coral""><title>Map RAM:
+<rect x="288" y="56" width="8" height="8" style="stroke:black; stroke-width:1; fill:cornflowerblue""><title>Map RAM:
  Row: 6  Unit: 1
  Unit Number: 37
  Entry Bit Width: 11
@@ -5103,10 +5141,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:chocolate""><title>128-bit Statistics ALU:
+<rect x="336" y="104" width="8" height="8" style="stroke:black; stroke-width:1; fill:coral""><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:coral""><title>128-bit Statistics ALU:
+<rect x="336" y="56" width="8" height="8" style="stroke:black; stroke-width:1; fill:cornflowerblue""><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:
@@ -5578,7 +5616,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:crimson""><title>Logical Table ID:
+<rect x="192" y="600" width="8" height="8" style="stroke:black; stroke-width:1; fill:chocolate""><title>Logical Table ID:
  ID: 1
 
  Occupied By: egress_port_count_table</title></rect>
@@ -5625,7 +5663,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:crimson""><title>32-bit ALU:
+<rect x="560" y="48" width="8" height="8" style="stroke:black; stroke-width:1; fill:chocolate""><title>32-bit ALU:
  Unit: 0
  Occupied By:
 For Match Table ingress_port_count_table's action count_ingress:
@@ -6084,13 +6122,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:crimson""><title>egress_port_count_table</title></rect>
+<rect x="720" y="64" width="16" height="16" style="stroke:black; stroke-width:1; fill:chocolate""><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:coral""><title>egress_port_counter</title></rect>
+<rect x="720" y="88" width="16" height="16" style="stroke:black; stroke-width:1; fill:cornflowerblue""><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:chartreuse""><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:chocolate""><title>ingress_port_counter</title></rect>
+<rect x="720" y="136" width="16" height="16" style="stroke:black; stroke-width:1; fill:coral""><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>
 
@@ -6101,13 +6139,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>
@@ -31964,7 +32002,7 @@
 </svg><br>
 
 
-<br><i>Created on Fri Sep  8 08:24:43 2017</i>
+<br><i>Created on Wed Sep 13 00:59:09 2017</i>
 <br><i>Compiler version: 5.1.0 (fca32d1)</i>
 </div>
 </body>
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/visualization/parser.egress.html b/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/visualization/parser.egress.html
index b086e4f..5db9132 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/visualization/parser.egress.html
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/visualization/parser.egress.html
@@ -6639,7 +6639,7 @@
 <br></td></tr>
 
 </table>
-<br><i>Created on Fri Sep  8 08:24:46 2017</i>
+<br><i>Created on Wed Sep 13 00:59:12 2017</i>
 
 <br><i>Compiler version: 5.1.0 (fca32d1)</i>
 
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/visualization/parser.ingress.html b/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/visualization/parser.ingress.html
index 892950e..79553ab 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/visualization/parser.ingress.html
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/visualization/parser.ingress.html
@@ -7420,7 +7420,7 @@
 <br></td></tr>
 
 </table>
-<br><i>Created on Fri Sep  8 08:24:46 2017</i>
+<br><i>Created on Wed Sep 13 00:59:12 2017</i>
 
 <br><i>Compiler version: 5.1.0 (fca32d1)</i>
 
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/visualization/phv_allocation.html b/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/visualization/phv_allocation.html
index 579b829..5998f62 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/visualization/phv_allocation.html
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/visualization/phv_allocation.html
@@ -3648,6 +3648,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
@@ -3661,6 +3663,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:darkseagreen""><title>PHV Group: 8
@@ -3682,6 +3686,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
@@ -3692,6 +3698,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:limegreen""><title>PHV Group: 8
@@ -31204,7 +31212,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 Fri Sep  8 08:24:44 2017</i>
+<br><i>Created on Wed Sep 13 00:59:09 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/default/montara/visualization/table_placement.html b/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/visualization/table_placement.html
index eb8ba85..d754d6b 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/visualization/table_placement.html
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/default/montara/visualization/table_placement.html
@@ -110,10 +110,10 @@
 <rect x="91" y="195" width="13" height="13" style="stroke:black; stroke-width:1; fill:white""><title>TCAM</title></rect>
 <rect x="0" y="26" width="104" height="182" style="stroke:black; stroke-width:2; fill:none""></rect>
 <text x="41" y="245" textLength="24" lengthAdjust="spacingAndGlyphs" textHeight="24" heightAdjust="spacingAndGlyphs" style="fill:black;">0</text>
-<rect x="117" y="26" width="13" height="13" style="stroke:black; stroke-width:1; fill:chocolate""><title>SRAM for ingress_port_counter</title></rect>
-<rect x="130" y="26" width="13" height="13" style="stroke:black; stroke-width:1; fill:chocolate""><title>SRAM for ingress_port_counter</title></rect>
-<rect x="143" y="26" width="13" height="13" style="stroke:black; stroke-width:1; fill:coral""><title>SRAM for egress_port_counter</title></rect>
-<rect x="156" y="26" width="13" height="13" style="stroke:black; stroke-width:1; fill:coral""><title>SRAM for egress_port_counter</title></rect>
+<rect x="117" y="26" width="13" height="13" style="stroke:black; stroke-width:1; fill:coral""><title>SRAM for ingress_port_counter</title></rect>
+<rect x="130" y="26" width="13" height="13" style="stroke:black; stroke-width:1; fill:coral""><title>SRAM for ingress_port_counter</title></rect>
+<rect x="143" y="26" width="13" height="13" style="stroke:black; stroke-width:1; fill:cornflowerblue""><title>SRAM for egress_port_counter</title></rect>
+<rect x="156" y="26" width="13" height="13" style="stroke:black; stroke-width:1; fill:cornflowerblue""><title>SRAM for egress_port_counter</title></rect>
 <rect x="169" y="26" width="13" height="13" style="stroke:black; stroke-width:1; fill:white""><title>SRAM</title></rect>
 <rect x="182" y="26" width="13" height="13" style="stroke:black; stroke-width:1; fill:white""><title>SRAM</title></rect>
 <rect x="195" y="26" width="13" height="13" style="stroke:black; stroke-width:1; fill:white""><title>SRAM</title></rect>
@@ -1277,9 +1277,9 @@
 <rect x="585" y="260" width="104" height="182" style="stroke:black; stroke-width:2; fill:none""></rect>
 <text x="626" y="479" textLength="24" lengthAdjust="spacingAndGlyphs" textHeight="24" heightAdjust="spacingAndGlyphs" style="fill:black;">11</text>
 <text x="834" y="89"   style="fill:black; font-weight:bold;">Legend</text>
-<rect x="832" y="104" width="26" height="26" style="stroke:black; stroke-width:1; fill:coral""><title>egress_port_counter</title></rect>
+<rect x="832" y="104" width="26" height="26" style="stroke:black; stroke-width:1; fill:cornflowerblue""><title>egress_port_counter</title></rect>
 <text x="860" y="128"   style="fill:black;">egress_port_counter</text>
-<rect x="832" y="143" width="26" height="26" style="stroke:black; stroke-width:1; fill:chocolate""><title>ingress_port_counter</title></rect>
+<rect x="832" y="143" width="26" height="26" style="stroke:black; stroke-width:1; fill:coral""><title>ingress_port_counter</title></rect>
 <text x="860" y="167"   style="fill:black;">ingress_port_counter</text>
 <rect x="832" y="182" width="26" height="26" style="stroke:black; stroke-width:1; fill:aquamarine""><title>table0</title></rect>
 <text x="860" y="206"   style="fill:black;">table0</text>
@@ -1401,8 +1401,8 @@
 <tr>
 <td align="center">ingress_port_count_table</td>
 <td align="center">1</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>
@@ -1425,8 +1425,8 @@
 <tr>
 <td align="center">egress_port_count_table</td>
 <td align="center">1</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>
@@ -1459,7 +1459,7 @@
 <td align="center">0</td>
 </tr>
 </table>
-<br><i>Created on Fri Sep  8 08:24:43 2017</i>
+<br><i>Created on Wed Sep 13 00:59:09 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/mavericks/context/context.json b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/context/context.json
index a5dccdb..9663dae 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/context/context.json
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/context/context.json
@@ -1,5 +1,5 @@
 {
-    "build_date": "Tue Sep 12 11:16:13 2017", 
+    "build_date": "Wed Sep 13 00:59:57 2017", 
     "phv_allocation": [
         {
             "ingress": [
@@ -84,6 +84,35 @@
                     "records": [
                         {
                             "word_bit_width": 32, 
+                            "position_offset": 33, 
+                            "phv_lsb": 24, 
+                            "is_pov": false, 
+                            "field_msb": 7, 
+                            "phv_msb": 31, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_dstPort", 
+                            "field_width": 2, 
+                            "field_lsb": 0
+                        }, 
+                        {
+                            "word_bit_width": 32, 
+                            "position_offset": 76, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 31, 
+                            "phv_msb": 23, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_seqNo", 
+                            "field_width": 4, 
+                            "field_lsb": 8
+                        }
+                    ]
+                }, 
+                {
+                    "phv_number": 4, 
+                    "records": [
+                        {
+                            "word_bit_width": 32, 
                             "position_offset": 20, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
@@ -97,7 +126,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 4, 
+                    "phv_number": 5, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -114,35 +143,6 @@
                     ]
                 }, 
                 {
-                    "phv_number": 5, 
-                    "records": [
-                        {
-                            "word_bit_width": 32, 
-                            "position_offset": 66, 
-                            "phv_lsb": 16, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 31, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_srcPort", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }, 
-                        {
-                            "word_bit_width": 32, 
-                            "position_offset": 55, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_dstPort", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
                     "phv_number": 64, 
                     "records": [
                         {
@@ -164,6 +164,35 @@
                     "records": [
                         {
                             "word_bit_width": 8, 
+                            "position_offset": 38, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 7, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_srcPort", 
+                            "field_width": 2, 
+                            "field_lsb": 8
+                        }, 
+                        {
+                            "word_bit_width": 8, 
+                            "position_offset": 66, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 7, 
+                            "phv_msb": 7, 
+                            "is_compiler_generated": false, 
+                            "field_name": "udp_srcPort", 
+                            "field_width": 2, 
+                            "field_lsb": 0
+                        }
+                    ]
+                }, 
+                {
+                    "phv_number": 66, 
+                    "records": [
+                        {
+                            "word_bit_width": 8, 
                             "position_offset": 20, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
@@ -177,7 +206,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 66, 
+                    "phv_number": 67, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -194,7 +223,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 67, 
+                    "phv_number": 68, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -249,7 +278,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 68, 
+                    "phv_number": 69, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -362,6 +391,35 @@
                     "records": [
                         {
                             "word_bit_width": 16, 
+                            "position_offset": 38, 
+                            "phv_lsb": 8, 
+                            "is_pov": false, 
+                            "field_msb": 7, 
+                            "phv_msb": 15, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_srcPort", 
+                            "field_width": 2, 
+                            "field_lsb": 0
+                        }, 
+                        {
+                            "word_bit_width": 16, 
+                            "position_offset": 33, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 7, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_dstPort", 
+                            "field_width": 2, 
+                            "field_lsb": 8
+                        }
+                    ]
+                }, 
+                {
+                    "phv_number": 133, 
+                    "records": [
+                        {
+                            "word_bit_width": 16, 
                             "position_offset": 20, 
                             "phv_lsb": 8, 
                             "is_pov": false, 
@@ -387,7 +445,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 133, 
+                    "phv_number": 134, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -404,7 +462,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 134, 
+                    "phv_number": 135, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -421,7 +479,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 135, 
+                    "phv_number": 136, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -552,6 +610,30 @@
                             "field_name": "tcp_window", 
                             "field_width": 2, 
                             "field_lsb": 0
+                        }, 
+                        {
+                            "word_bit_width": 32, 
+                            "position_offset": 17, 
+                            "phv_lsb": 16, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 31, 
+                            "is_compiler_generated": false, 
+                            "field_name": "udp_length_", 
+                            "field_width": 2, 
+                            "field_lsb": 0
+                        }, 
+                        {
+                            "word_bit_width": 32, 
+                            "position_offset": 68, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 15, 
+                            "is_compiler_generated": false, 
+                            "field_name": "udp_checksum", 
+                            "field_width": 2, 
+                            "field_lsb": 0
                         }
                     ]
                 }, 
@@ -618,94 +700,31 @@
                     "records": [
                         {
                             "word_bit_width": 8, 
-                            "position_offset": 38, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 7, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_srcPort", 
-                            "field_width": 2, 
-                            "field_lsb": 8
-                        }, 
-                        {
-                            "word_bit_width": 8, 
-                            "position_offset": 17, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 7, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_length_", 
-                            "field_width": 2, 
-                            "field_lsb": 8
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 290, 
-                    "records": [
-                        {
-                            "word_bit_width": 8, 
-                            "position_offset": 38, 
+                            "position_offset": 76, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 7, 
                             "phv_msb": 7, 
                             "is_compiler_generated": false, 
-                            "field_name": "tcp_srcPort", 
-                            "field_width": 2, 
+                            "field_name": "tcp_seqNo", 
+                            "field_width": 4, 
                             "field_lsb": 0
                         }, 
                         {
                             "word_bit_width": 8, 
-                            "position_offset": 17, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 7, 
-                            "phv_msb": 7, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_length_", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 291, 
-                    "records": [
-                        {
-                            "word_bit_width": 8, 
-                            "position_offset": 33, 
+                            "position_offset": 66, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 15, 
                             "phv_msb": 7, 
                             "is_compiler_generated": false, 
-                            "field_name": "tcp_dstPort", 
+                            "field_name": "udp_srcPort", 
                             "field_width": 2, 
                             "field_lsb": 8
                         }
                     ]
                 }, 
                 {
-                    "phv_number": 292, 
-                    "records": [
-                        {
-                            "word_bit_width": 8, 
-                            "position_offset": 33, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 7, 
-                            "phv_msb": 7, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_dstPort", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
                     "phv_number": 320, 
                     "records": [
                         {
@@ -768,52 +787,6 @@
                     "records": [
                         {
                             "word_bit_width": 16, 
-                            "position_offset": 76, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 31, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_seqNo", 
-                            "field_width": 4, 
-                            "field_lsb": 16
-                        }, 
-                        {
-                            "word_bit_width": 16, 
-                            "position_offset": 68, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_checksum", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 323, 
-                    "records": [
-                        {
-                            "word_bit_width": 16, 
-                            "position_offset": 76, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_seqNo", 
-                            "field_width": 4, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 324, 
-                    "records": [
-                        {
-                            "word_bit_width": 16, 
                             "position_offset": 26, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
@@ -823,11 +796,23 @@
                             "field_name": "tcp_ackNo", 
                             "field_width": 4, 
                             "field_lsb": 16
+                        }, 
+                        {
+                            "word_bit_width": 16, 
+                            "position_offset": 55, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 15, 
+                            "is_compiler_generated": false, 
+                            "field_name": "udp_dstPort", 
+                            "field_width": 2, 
+                            "field_lsb": 0
                         }
                     ]
                 }, 
                 {
-                    "phv_number": 325, 
+                    "phv_number": 323, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -935,7 +920,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 264, 
+                    "phv_number": 260, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -976,7 +961,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 265, 
+                    "phv_number": 261, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -993,7 +978,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 266, 
+                    "phv_number": 262, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -1010,7 +995,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 267, 
+                    "phv_number": 263, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -1051,7 +1036,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 268, 
+                    "phv_number": 264, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -1116,7 +1101,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 269, 
+                    "phv_number": 265, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -1145,7 +1130,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 270, 
+                    "phv_number": 266, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -1162,7 +1147,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 271, 
+                    "phv_number": 267, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -1179,7 +1164,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 296, 
+                    "phv_number": 292, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -1208,7 +1193,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 297, 
+                    "phv_number": 293, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -1225,7 +1210,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 298, 
+                    "phv_number": 294, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -1254,7 +1239,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 299, 
+                    "phv_number": 295, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -1283,7 +1268,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 300, 
+                    "phv_number": 296, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -1300,7 +1285,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 301, 
+                    "phv_number": 297, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -1317,7 +1302,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 332, 
+                    "phv_number": 326, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -1334,7 +1319,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 333, 
+                    "phv_number": 327, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -1351,7 +1336,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 334, 
+                    "phv_number": 328, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -1380,7 +1365,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 335, 
+                    "phv_number": 329, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -1393,23 +1378,6 @@
                             "field_name": "tcp_dstPort", 
                             "field_width": 2, 
                             "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 336, 
-                    "records": [
-                        {
-                            "word_bit_width": 16, 
-                            "position_offset": 69, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 31, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_seqNo", 
-                            "field_width": 4, 
-                            "field_lsb": 16
                         }, 
                         {
                             "word_bit_width": 16, 
@@ -1426,7 +1394,24 @@
                     ]
                 }, 
                 {
-                    "phv_number": 337, 
+                    "phv_number": 330, 
+                    "records": [
+                        {
+                            "word_bit_width": 16, 
+                            "position_offset": 69, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 31, 
+                            "phv_msb": 15, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_seqNo", 
+                            "field_width": 4, 
+                            "field_lsb": 16
+                        }
+                    ]
+                }, 
+                {
+                    "phv_number": 331, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -1443,7 +1428,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 338, 
+                    "phv_number": 332, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -1472,7 +1457,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 339, 
+                    "phv_number": 333, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -1489,7 +1474,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 340, 
+                    "phv_number": 334, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -1603,6 +1588,35 @@
                     "records": [
                         {
                             "word_bit_width": 32, 
+                            "position_offset": 33, 
+                            "phv_lsb": 24, 
+                            "is_pov": false, 
+                            "field_msb": 7, 
+                            "phv_msb": 31, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_dstPort", 
+                            "field_width": 2, 
+                            "field_lsb": 0
+                        }, 
+                        {
+                            "word_bit_width": 32, 
+                            "position_offset": 76, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 31, 
+                            "phv_msb": 23, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_seqNo", 
+                            "field_width": 4, 
+                            "field_lsb": 8
+                        }
+                    ]
+                }, 
+                {
+                    "phv_number": 4, 
+                    "records": [
+                        {
+                            "word_bit_width": 32, 
                             "position_offset": 20, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
@@ -1616,7 +1630,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 4, 
+                    "phv_number": 5, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -1633,35 +1647,6 @@
                     ]
                 }, 
                 {
-                    "phv_number": 5, 
-                    "records": [
-                        {
-                            "word_bit_width": 32, 
-                            "position_offset": 66, 
-                            "phv_lsb": 16, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 31, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_srcPort", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }, 
-                        {
-                            "word_bit_width": 32, 
-                            "position_offset": 55, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_dstPort", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
                     "phv_number": 64, 
                     "records": [
                         {
@@ -1683,6 +1668,35 @@
                     "records": [
                         {
                             "word_bit_width": 8, 
+                            "position_offset": 38, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 7, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_srcPort", 
+                            "field_width": 2, 
+                            "field_lsb": 8
+                        }, 
+                        {
+                            "word_bit_width": 8, 
+                            "position_offset": 66, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 7, 
+                            "phv_msb": 7, 
+                            "is_compiler_generated": false, 
+                            "field_name": "udp_srcPort", 
+                            "field_width": 2, 
+                            "field_lsb": 0
+                        }
+                    ]
+                }, 
+                {
+                    "phv_number": 66, 
+                    "records": [
+                        {
+                            "word_bit_width": 8, 
                             "position_offset": 20, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
@@ -1696,7 +1710,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 66, 
+                    "phv_number": 67, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -1713,7 +1727,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 67, 
+                    "phv_number": 68, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -1768,7 +1782,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 68, 
+                    "phv_number": 69, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -1881,6 +1895,35 @@
                     "records": [
                         {
                             "word_bit_width": 16, 
+                            "position_offset": 38, 
+                            "phv_lsb": 8, 
+                            "is_pov": false, 
+                            "field_msb": 7, 
+                            "phv_msb": 15, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_srcPort", 
+                            "field_width": 2, 
+                            "field_lsb": 0
+                        }, 
+                        {
+                            "word_bit_width": 16, 
+                            "position_offset": 33, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 7, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_dstPort", 
+                            "field_width": 2, 
+                            "field_lsb": 8
+                        }
+                    ]
+                }, 
+                {
+                    "phv_number": 133, 
+                    "records": [
+                        {
+                            "word_bit_width": 16, 
                             "position_offset": 20, 
                             "phv_lsb": 8, 
                             "is_pov": false, 
@@ -1906,7 +1949,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 133, 
+                    "phv_number": 134, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -1923,7 +1966,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 134, 
+                    "phv_number": 135, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -1940,7 +1983,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 135, 
+                    "phv_number": 136, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -2071,6 +2114,30 @@
                             "field_name": "tcp_window", 
                             "field_width": 2, 
                             "field_lsb": 0
+                        }, 
+                        {
+                            "word_bit_width": 32, 
+                            "position_offset": 17, 
+                            "phv_lsb": 16, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 31, 
+                            "is_compiler_generated": false, 
+                            "field_name": "udp_length_", 
+                            "field_width": 2, 
+                            "field_lsb": 0
+                        }, 
+                        {
+                            "word_bit_width": 32, 
+                            "position_offset": 68, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 15, 
+                            "is_compiler_generated": false, 
+                            "field_name": "udp_checksum", 
+                            "field_width": 2, 
+                            "field_lsb": 0
                         }
                     ]
                 }, 
@@ -2137,94 +2204,31 @@
                     "records": [
                         {
                             "word_bit_width": 8, 
-                            "position_offset": 38, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 7, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_srcPort", 
-                            "field_width": 2, 
-                            "field_lsb": 8
-                        }, 
-                        {
-                            "word_bit_width": 8, 
-                            "position_offset": 17, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 7, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_length_", 
-                            "field_width": 2, 
-                            "field_lsb": 8
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 290, 
-                    "records": [
-                        {
-                            "word_bit_width": 8, 
-                            "position_offset": 38, 
+                            "position_offset": 76, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 7, 
                             "phv_msb": 7, 
                             "is_compiler_generated": false, 
-                            "field_name": "tcp_srcPort", 
-                            "field_width": 2, 
+                            "field_name": "tcp_seqNo", 
+                            "field_width": 4, 
                             "field_lsb": 0
                         }, 
                         {
                             "word_bit_width": 8, 
-                            "position_offset": 17, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 7, 
-                            "phv_msb": 7, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_length_", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 291, 
-                    "records": [
-                        {
-                            "word_bit_width": 8, 
-                            "position_offset": 33, 
+                            "position_offset": 66, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 15, 
                             "phv_msb": 7, 
                             "is_compiler_generated": false, 
-                            "field_name": "tcp_dstPort", 
+                            "field_name": "udp_srcPort", 
                             "field_width": 2, 
                             "field_lsb": 8
                         }
                     ]
                 }, 
                 {
-                    "phv_number": 292, 
-                    "records": [
-                        {
-                            "word_bit_width": 8, 
-                            "position_offset": 33, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 7, 
-                            "phv_msb": 7, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_dstPort", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
                     "phv_number": 320, 
                     "records": [
                         {
@@ -2287,52 +2291,6 @@
                     "records": [
                         {
                             "word_bit_width": 16, 
-                            "position_offset": 76, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 31, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_seqNo", 
-                            "field_width": 4, 
-                            "field_lsb": 16
-                        }, 
-                        {
-                            "word_bit_width": 16, 
-                            "position_offset": 68, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_checksum", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 323, 
-                    "records": [
-                        {
-                            "word_bit_width": 16, 
-                            "position_offset": 76, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_seqNo", 
-                            "field_width": 4, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 324, 
-                    "records": [
-                        {
-                            "word_bit_width": 16, 
                             "position_offset": 26, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
@@ -2342,11 +2300,23 @@
                             "field_name": "tcp_ackNo", 
                             "field_width": 4, 
                             "field_lsb": 16
+                        }, 
+                        {
+                            "word_bit_width": 16, 
+                            "position_offset": 55, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 15, 
+                            "is_compiler_generated": false, 
+                            "field_name": "udp_dstPort", 
+                            "field_width": 2, 
+                            "field_lsb": 0
                         }
                     ]
                 }, 
                 {
-                    "phv_number": 325, 
+                    "phv_number": 323, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -2454,7 +2424,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 264, 
+                    "phv_number": 260, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -2495,7 +2465,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 265, 
+                    "phv_number": 261, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -2512,7 +2482,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 266, 
+                    "phv_number": 262, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -2529,7 +2499,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 267, 
+                    "phv_number": 263, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -2570,7 +2540,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 268, 
+                    "phv_number": 264, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -2635,7 +2605,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 269, 
+                    "phv_number": 265, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -2664,7 +2634,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 270, 
+                    "phv_number": 266, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -2681,7 +2651,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 271, 
+                    "phv_number": 267, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -2698,7 +2668,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 296, 
+                    "phv_number": 292, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -2727,7 +2697,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 297, 
+                    "phv_number": 293, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -2744,7 +2714,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 298, 
+                    "phv_number": 294, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -2773,7 +2743,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 299, 
+                    "phv_number": 295, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -2802,7 +2772,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 300, 
+                    "phv_number": 296, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -2819,7 +2789,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 301, 
+                    "phv_number": 297, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -2836,7 +2806,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 332, 
+                    "phv_number": 326, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -2853,7 +2823,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 333, 
+                    "phv_number": 327, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -2870,7 +2840,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 334, 
+                    "phv_number": 328, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -2899,7 +2869,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 335, 
+                    "phv_number": 329, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -2912,23 +2882,6 @@
                             "field_name": "tcp_dstPort", 
                             "field_width": 2, 
                             "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 336, 
-                    "records": [
-                        {
-                            "word_bit_width": 16, 
-                            "position_offset": 69, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 31, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_seqNo", 
-                            "field_width": 4, 
-                            "field_lsb": 16
                         }, 
                         {
                             "word_bit_width": 16, 
@@ -2945,7 +2898,24 @@
                     ]
                 }, 
                 {
-                    "phv_number": 337, 
+                    "phv_number": 330, 
+                    "records": [
+                        {
+                            "word_bit_width": 16, 
+                            "position_offset": 69, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 31, 
+                            "phv_msb": 15, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_seqNo", 
+                            "field_width": 4, 
+                            "field_lsb": 16
+                        }
+                    ]
+                }, 
+                {
+                    "phv_number": 331, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -2962,7 +2932,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 338, 
+                    "phv_number": 332, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -2991,7 +2961,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 339, 
+                    "phv_number": 333, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -3008,7 +2978,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 340, 
+                    "phv_number": 334, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -3122,6 +3092,35 @@
                     "records": [
                         {
                             "word_bit_width": 32, 
+                            "position_offset": 33, 
+                            "phv_lsb": 24, 
+                            "is_pov": false, 
+                            "field_msb": 7, 
+                            "phv_msb": 31, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_dstPort", 
+                            "field_width": 2, 
+                            "field_lsb": 0
+                        }, 
+                        {
+                            "word_bit_width": 32, 
+                            "position_offset": 76, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 31, 
+                            "phv_msb": 23, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_seqNo", 
+                            "field_width": 4, 
+                            "field_lsb": 8
+                        }
+                    ]
+                }, 
+                {
+                    "phv_number": 4, 
+                    "records": [
+                        {
+                            "word_bit_width": 32, 
                             "position_offset": 20, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
@@ -3135,7 +3134,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 4, 
+                    "phv_number": 5, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -3152,35 +3151,6 @@
                     ]
                 }, 
                 {
-                    "phv_number": 5, 
-                    "records": [
-                        {
-                            "word_bit_width": 32, 
-                            "position_offset": 66, 
-                            "phv_lsb": 16, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 31, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_srcPort", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }, 
-                        {
-                            "word_bit_width": 32, 
-                            "position_offset": 55, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_dstPort", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
                     "phv_number": 64, 
                     "records": [
                         {
@@ -3202,6 +3172,35 @@
                     "records": [
                         {
                             "word_bit_width": 8, 
+                            "position_offset": 38, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 7, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_srcPort", 
+                            "field_width": 2, 
+                            "field_lsb": 8
+                        }, 
+                        {
+                            "word_bit_width": 8, 
+                            "position_offset": 66, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 7, 
+                            "phv_msb": 7, 
+                            "is_compiler_generated": false, 
+                            "field_name": "udp_srcPort", 
+                            "field_width": 2, 
+                            "field_lsb": 0
+                        }
+                    ]
+                }, 
+                {
+                    "phv_number": 66, 
+                    "records": [
+                        {
+                            "word_bit_width": 8, 
                             "position_offset": 20, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
@@ -3215,7 +3214,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 66, 
+                    "phv_number": 67, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -3232,7 +3231,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 67, 
+                    "phv_number": 68, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -3287,7 +3286,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 68, 
+                    "phv_number": 69, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -3400,6 +3399,35 @@
                     "records": [
                         {
                             "word_bit_width": 16, 
+                            "position_offset": 38, 
+                            "phv_lsb": 8, 
+                            "is_pov": false, 
+                            "field_msb": 7, 
+                            "phv_msb": 15, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_srcPort", 
+                            "field_width": 2, 
+                            "field_lsb": 0
+                        }, 
+                        {
+                            "word_bit_width": 16, 
+                            "position_offset": 33, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 7, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_dstPort", 
+                            "field_width": 2, 
+                            "field_lsb": 8
+                        }
+                    ]
+                }, 
+                {
+                    "phv_number": 133, 
+                    "records": [
+                        {
+                            "word_bit_width": 16, 
                             "position_offset": 20, 
                             "phv_lsb": 8, 
                             "is_pov": false, 
@@ -3425,7 +3453,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 133, 
+                    "phv_number": 134, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -3442,7 +3470,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 134, 
+                    "phv_number": 135, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -3459,7 +3487,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 135, 
+                    "phv_number": 136, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -3590,6 +3618,30 @@
                             "field_name": "tcp_window", 
                             "field_width": 2, 
                             "field_lsb": 0
+                        }, 
+                        {
+                            "word_bit_width": 32, 
+                            "position_offset": 17, 
+                            "phv_lsb": 16, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 31, 
+                            "is_compiler_generated": false, 
+                            "field_name": "udp_length_", 
+                            "field_width": 2, 
+                            "field_lsb": 0
+                        }, 
+                        {
+                            "word_bit_width": 32, 
+                            "position_offset": 68, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 15, 
+                            "is_compiler_generated": false, 
+                            "field_name": "udp_checksum", 
+                            "field_width": 2, 
+                            "field_lsb": 0
                         }
                     ]
                 }, 
@@ -3656,94 +3708,31 @@
                     "records": [
                         {
                             "word_bit_width": 8, 
-                            "position_offset": 38, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 7, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_srcPort", 
-                            "field_width": 2, 
-                            "field_lsb": 8
-                        }, 
-                        {
-                            "word_bit_width": 8, 
-                            "position_offset": 17, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 7, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_length_", 
-                            "field_width": 2, 
-                            "field_lsb": 8
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 290, 
-                    "records": [
-                        {
-                            "word_bit_width": 8, 
-                            "position_offset": 38, 
+                            "position_offset": 76, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 7, 
                             "phv_msb": 7, 
                             "is_compiler_generated": false, 
-                            "field_name": "tcp_srcPort", 
-                            "field_width": 2, 
+                            "field_name": "tcp_seqNo", 
+                            "field_width": 4, 
                             "field_lsb": 0
                         }, 
                         {
                             "word_bit_width": 8, 
-                            "position_offset": 17, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 7, 
-                            "phv_msb": 7, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_length_", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 291, 
-                    "records": [
-                        {
-                            "word_bit_width": 8, 
-                            "position_offset": 33, 
+                            "position_offset": 66, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 15, 
                             "phv_msb": 7, 
                             "is_compiler_generated": false, 
-                            "field_name": "tcp_dstPort", 
+                            "field_name": "udp_srcPort", 
                             "field_width": 2, 
                             "field_lsb": 8
                         }
                     ]
                 }, 
                 {
-                    "phv_number": 292, 
-                    "records": [
-                        {
-                            "word_bit_width": 8, 
-                            "position_offset": 33, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 7, 
-                            "phv_msb": 7, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_dstPort", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
                     "phv_number": 320, 
                     "records": [
                         {
@@ -3806,52 +3795,6 @@
                     "records": [
                         {
                             "word_bit_width": 16, 
-                            "position_offset": 76, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 31, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_seqNo", 
-                            "field_width": 4, 
-                            "field_lsb": 16
-                        }, 
-                        {
-                            "word_bit_width": 16, 
-                            "position_offset": 68, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_checksum", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 323, 
-                    "records": [
-                        {
-                            "word_bit_width": 16, 
-                            "position_offset": 76, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_seqNo", 
-                            "field_width": 4, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 324, 
-                    "records": [
-                        {
-                            "word_bit_width": 16, 
                             "position_offset": 26, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
@@ -3861,11 +3804,23 @@
                             "field_name": "tcp_ackNo", 
                             "field_width": 4, 
                             "field_lsb": 16
+                        }, 
+                        {
+                            "word_bit_width": 16, 
+                            "position_offset": 55, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 15, 
+                            "is_compiler_generated": false, 
+                            "field_name": "udp_dstPort", 
+                            "field_width": 2, 
+                            "field_lsb": 0
                         }
                     ]
                 }, 
                 {
-                    "phv_number": 325, 
+                    "phv_number": 323, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -3973,7 +3928,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 264, 
+                    "phv_number": 260, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -4014,7 +3969,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 265, 
+                    "phv_number": 261, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -4031,7 +3986,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 266, 
+                    "phv_number": 262, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -4048,7 +4003,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 267, 
+                    "phv_number": 263, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -4089,7 +4044,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 268, 
+                    "phv_number": 264, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -4154,7 +4109,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 269, 
+                    "phv_number": 265, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -4183,7 +4138,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 270, 
+                    "phv_number": 266, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -4200,7 +4155,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 271, 
+                    "phv_number": 267, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -4217,7 +4172,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 296, 
+                    "phv_number": 292, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -4246,7 +4201,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 297, 
+                    "phv_number": 293, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -4263,7 +4218,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 298, 
+                    "phv_number": 294, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -4292,7 +4247,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 299, 
+                    "phv_number": 295, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -4321,7 +4276,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 300, 
+                    "phv_number": 296, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -4338,7 +4293,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 301, 
+                    "phv_number": 297, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -4355,7 +4310,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 332, 
+                    "phv_number": 326, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -4372,7 +4327,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 333, 
+                    "phv_number": 327, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -4389,7 +4344,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 334, 
+                    "phv_number": 328, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -4418,7 +4373,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 335, 
+                    "phv_number": 329, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -4431,23 +4386,6 @@
                             "field_name": "tcp_dstPort", 
                             "field_width": 2, 
                             "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 336, 
-                    "records": [
-                        {
-                            "word_bit_width": 16, 
-                            "position_offset": 69, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 31, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_seqNo", 
-                            "field_width": 4, 
-                            "field_lsb": 16
                         }, 
                         {
                             "word_bit_width": 16, 
@@ -4464,7 +4402,24 @@
                     ]
                 }, 
                 {
-                    "phv_number": 337, 
+                    "phv_number": 330, 
+                    "records": [
+                        {
+                            "word_bit_width": 16, 
+                            "position_offset": 69, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 31, 
+                            "phv_msb": 15, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_seqNo", 
+                            "field_width": 4, 
+                            "field_lsb": 16
+                        }
+                    ]
+                }, 
+                {
+                    "phv_number": 331, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -4481,7 +4436,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 338, 
+                    "phv_number": 332, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -4510,7 +4465,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 339, 
+                    "phv_number": 333, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -4527,7 +4482,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 340, 
+                    "phv_number": 334, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -4641,6 +4596,35 @@
                     "records": [
                         {
                             "word_bit_width": 32, 
+                            "position_offset": 33, 
+                            "phv_lsb": 24, 
+                            "is_pov": false, 
+                            "field_msb": 7, 
+                            "phv_msb": 31, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_dstPort", 
+                            "field_width": 2, 
+                            "field_lsb": 0
+                        }, 
+                        {
+                            "word_bit_width": 32, 
+                            "position_offset": 76, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 31, 
+                            "phv_msb": 23, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_seqNo", 
+                            "field_width": 4, 
+                            "field_lsb": 8
+                        }
+                    ]
+                }, 
+                {
+                    "phv_number": 4, 
+                    "records": [
+                        {
+                            "word_bit_width": 32, 
                             "position_offset": 20, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
@@ -4654,7 +4638,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 4, 
+                    "phv_number": 5, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -4671,35 +4655,6 @@
                     ]
                 }, 
                 {
-                    "phv_number": 5, 
-                    "records": [
-                        {
-                            "word_bit_width": 32, 
-                            "position_offset": 66, 
-                            "phv_lsb": 16, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 31, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_srcPort", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }, 
-                        {
-                            "word_bit_width": 32, 
-                            "position_offset": 55, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_dstPort", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
                     "phv_number": 64, 
                     "records": [
                         {
@@ -4721,6 +4676,35 @@
                     "records": [
                         {
                             "word_bit_width": 8, 
+                            "position_offset": 38, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 7, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_srcPort", 
+                            "field_width": 2, 
+                            "field_lsb": 8
+                        }, 
+                        {
+                            "word_bit_width": 8, 
+                            "position_offset": 66, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 7, 
+                            "phv_msb": 7, 
+                            "is_compiler_generated": false, 
+                            "field_name": "udp_srcPort", 
+                            "field_width": 2, 
+                            "field_lsb": 0
+                        }
+                    ]
+                }, 
+                {
+                    "phv_number": 66, 
+                    "records": [
+                        {
+                            "word_bit_width": 8, 
                             "position_offset": 20, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
@@ -4734,7 +4718,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 66, 
+                    "phv_number": 67, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -4751,7 +4735,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 67, 
+                    "phv_number": 68, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -4806,7 +4790,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 68, 
+                    "phv_number": 69, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -4919,6 +4903,35 @@
                     "records": [
                         {
                             "word_bit_width": 16, 
+                            "position_offset": 38, 
+                            "phv_lsb": 8, 
+                            "is_pov": false, 
+                            "field_msb": 7, 
+                            "phv_msb": 15, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_srcPort", 
+                            "field_width": 2, 
+                            "field_lsb": 0
+                        }, 
+                        {
+                            "word_bit_width": 16, 
+                            "position_offset": 33, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 7, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_dstPort", 
+                            "field_width": 2, 
+                            "field_lsb": 8
+                        }
+                    ]
+                }, 
+                {
+                    "phv_number": 133, 
+                    "records": [
+                        {
+                            "word_bit_width": 16, 
                             "position_offset": 20, 
                             "phv_lsb": 8, 
                             "is_pov": false, 
@@ -4944,7 +4957,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 133, 
+                    "phv_number": 134, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -4961,7 +4974,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 134, 
+                    "phv_number": 135, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -4978,7 +4991,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 135, 
+                    "phv_number": 136, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -5109,6 +5122,30 @@
                             "field_name": "tcp_window", 
                             "field_width": 2, 
                             "field_lsb": 0
+                        }, 
+                        {
+                            "word_bit_width": 32, 
+                            "position_offset": 17, 
+                            "phv_lsb": 16, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 31, 
+                            "is_compiler_generated": false, 
+                            "field_name": "udp_length_", 
+                            "field_width": 2, 
+                            "field_lsb": 0
+                        }, 
+                        {
+                            "word_bit_width": 32, 
+                            "position_offset": 68, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 15, 
+                            "is_compiler_generated": false, 
+                            "field_name": "udp_checksum", 
+                            "field_width": 2, 
+                            "field_lsb": 0
                         }
                     ]
                 }, 
@@ -5175,94 +5212,31 @@
                     "records": [
                         {
                             "word_bit_width": 8, 
-                            "position_offset": 38, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 7, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_srcPort", 
-                            "field_width": 2, 
-                            "field_lsb": 8
-                        }, 
-                        {
-                            "word_bit_width": 8, 
-                            "position_offset": 17, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 7, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_length_", 
-                            "field_width": 2, 
-                            "field_lsb": 8
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 290, 
-                    "records": [
-                        {
-                            "word_bit_width": 8, 
-                            "position_offset": 38, 
+                            "position_offset": 76, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 7, 
                             "phv_msb": 7, 
                             "is_compiler_generated": false, 
-                            "field_name": "tcp_srcPort", 
-                            "field_width": 2, 
+                            "field_name": "tcp_seqNo", 
+                            "field_width": 4, 
                             "field_lsb": 0
                         }, 
                         {
                             "word_bit_width": 8, 
-                            "position_offset": 17, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 7, 
-                            "phv_msb": 7, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_length_", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 291, 
-                    "records": [
-                        {
-                            "word_bit_width": 8, 
-                            "position_offset": 33, 
+                            "position_offset": 66, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 15, 
                             "phv_msb": 7, 
                             "is_compiler_generated": false, 
-                            "field_name": "tcp_dstPort", 
+                            "field_name": "udp_srcPort", 
                             "field_width": 2, 
                             "field_lsb": 8
                         }
                     ]
                 }, 
                 {
-                    "phv_number": 292, 
-                    "records": [
-                        {
-                            "word_bit_width": 8, 
-                            "position_offset": 33, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 7, 
-                            "phv_msb": 7, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_dstPort", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
                     "phv_number": 320, 
                     "records": [
                         {
@@ -5325,52 +5299,6 @@
                     "records": [
                         {
                             "word_bit_width": 16, 
-                            "position_offset": 76, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 31, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_seqNo", 
-                            "field_width": 4, 
-                            "field_lsb": 16
-                        }, 
-                        {
-                            "word_bit_width": 16, 
-                            "position_offset": 68, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_checksum", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 323, 
-                    "records": [
-                        {
-                            "word_bit_width": 16, 
-                            "position_offset": 76, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_seqNo", 
-                            "field_width": 4, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 324, 
-                    "records": [
-                        {
-                            "word_bit_width": 16, 
                             "position_offset": 26, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
@@ -5380,11 +5308,23 @@
                             "field_name": "tcp_ackNo", 
                             "field_width": 4, 
                             "field_lsb": 16
+                        }, 
+                        {
+                            "word_bit_width": 16, 
+                            "position_offset": 55, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 15, 
+                            "is_compiler_generated": false, 
+                            "field_name": "udp_dstPort", 
+                            "field_width": 2, 
+                            "field_lsb": 0
                         }
                     ]
                 }, 
                 {
-                    "phv_number": 325, 
+                    "phv_number": 323, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -5492,7 +5432,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 264, 
+                    "phv_number": 260, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -5533,7 +5473,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 265, 
+                    "phv_number": 261, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -5550,7 +5490,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 266, 
+                    "phv_number": 262, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -5567,7 +5507,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 267, 
+                    "phv_number": 263, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -5608,7 +5548,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 268, 
+                    "phv_number": 264, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -5673,7 +5613,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 269, 
+                    "phv_number": 265, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -5702,7 +5642,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 270, 
+                    "phv_number": 266, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -5719,7 +5659,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 271, 
+                    "phv_number": 267, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -5736,7 +5676,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 296, 
+                    "phv_number": 292, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -5765,7 +5705,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 297, 
+                    "phv_number": 293, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -5782,7 +5722,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 298, 
+                    "phv_number": 294, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -5811,7 +5751,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 299, 
+                    "phv_number": 295, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -5840,7 +5780,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 300, 
+                    "phv_number": 296, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -5857,7 +5797,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 301, 
+                    "phv_number": 297, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -5874,7 +5814,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 332, 
+                    "phv_number": 326, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -5891,7 +5831,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 333, 
+                    "phv_number": 327, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -5908,7 +5848,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 334, 
+                    "phv_number": 328, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -5937,7 +5877,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 335, 
+                    "phv_number": 329, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -5950,23 +5890,6 @@
                             "field_name": "tcp_dstPort", 
                             "field_width": 2, 
                             "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 336, 
-                    "records": [
-                        {
-                            "word_bit_width": 16, 
-                            "position_offset": 69, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 31, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_seqNo", 
-                            "field_width": 4, 
-                            "field_lsb": 16
                         }, 
                         {
                             "word_bit_width": 16, 
@@ -5983,7 +5906,24 @@
                     ]
                 }, 
                 {
-                    "phv_number": 337, 
+                    "phv_number": 330, 
+                    "records": [
+                        {
+                            "word_bit_width": 16, 
+                            "position_offset": 69, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 31, 
+                            "phv_msb": 15, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_seqNo", 
+                            "field_width": 4, 
+                            "field_lsb": 16
+                        }
+                    ]
+                }, 
+                {
+                    "phv_number": 331, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -6000,7 +5940,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 338, 
+                    "phv_number": 332, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -6029,7 +5969,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 339, 
+                    "phv_number": 333, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -6046,7 +5986,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 340, 
+                    "phv_number": 334, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -6160,6 +6100,35 @@
                     "records": [
                         {
                             "word_bit_width": 32, 
+                            "position_offset": 33, 
+                            "phv_lsb": 24, 
+                            "is_pov": false, 
+                            "field_msb": 7, 
+                            "phv_msb": 31, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_dstPort", 
+                            "field_width": 2, 
+                            "field_lsb": 0
+                        }, 
+                        {
+                            "word_bit_width": 32, 
+                            "position_offset": 76, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 31, 
+                            "phv_msb": 23, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_seqNo", 
+                            "field_width": 4, 
+                            "field_lsb": 8
+                        }
+                    ]
+                }, 
+                {
+                    "phv_number": 4, 
+                    "records": [
+                        {
+                            "word_bit_width": 32, 
                             "position_offset": 20, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
@@ -6173,7 +6142,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 4, 
+                    "phv_number": 5, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -6190,35 +6159,6 @@
                     ]
                 }, 
                 {
-                    "phv_number": 5, 
-                    "records": [
-                        {
-                            "word_bit_width": 32, 
-                            "position_offset": 66, 
-                            "phv_lsb": 16, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 31, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_srcPort", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }, 
-                        {
-                            "word_bit_width": 32, 
-                            "position_offset": 55, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_dstPort", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
                     "phv_number": 64, 
                     "records": [
                         {
@@ -6240,6 +6180,35 @@
                     "records": [
                         {
                             "word_bit_width": 8, 
+                            "position_offset": 38, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 7, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_srcPort", 
+                            "field_width": 2, 
+                            "field_lsb": 8
+                        }, 
+                        {
+                            "word_bit_width": 8, 
+                            "position_offset": 66, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 7, 
+                            "phv_msb": 7, 
+                            "is_compiler_generated": false, 
+                            "field_name": "udp_srcPort", 
+                            "field_width": 2, 
+                            "field_lsb": 0
+                        }
+                    ]
+                }, 
+                {
+                    "phv_number": 66, 
+                    "records": [
+                        {
+                            "word_bit_width": 8, 
                             "position_offset": 20, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
@@ -6253,7 +6222,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 66, 
+                    "phv_number": 67, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -6270,7 +6239,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 67, 
+                    "phv_number": 68, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -6325,7 +6294,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 68, 
+                    "phv_number": 69, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -6438,6 +6407,35 @@
                     "records": [
                         {
                             "word_bit_width": 16, 
+                            "position_offset": 38, 
+                            "phv_lsb": 8, 
+                            "is_pov": false, 
+                            "field_msb": 7, 
+                            "phv_msb": 15, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_srcPort", 
+                            "field_width": 2, 
+                            "field_lsb": 0
+                        }, 
+                        {
+                            "word_bit_width": 16, 
+                            "position_offset": 33, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 7, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_dstPort", 
+                            "field_width": 2, 
+                            "field_lsb": 8
+                        }
+                    ]
+                }, 
+                {
+                    "phv_number": 133, 
+                    "records": [
+                        {
+                            "word_bit_width": 16, 
                             "position_offset": 20, 
                             "phv_lsb": 8, 
                             "is_pov": false, 
@@ -6463,7 +6461,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 133, 
+                    "phv_number": 134, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -6480,7 +6478,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 134, 
+                    "phv_number": 135, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -6497,7 +6495,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 135, 
+                    "phv_number": 136, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -6628,6 +6626,30 @@
                             "field_name": "tcp_window", 
                             "field_width": 2, 
                             "field_lsb": 0
+                        }, 
+                        {
+                            "word_bit_width": 32, 
+                            "position_offset": 17, 
+                            "phv_lsb": 16, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 31, 
+                            "is_compiler_generated": false, 
+                            "field_name": "udp_length_", 
+                            "field_width": 2, 
+                            "field_lsb": 0
+                        }, 
+                        {
+                            "word_bit_width": 32, 
+                            "position_offset": 68, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 15, 
+                            "is_compiler_generated": false, 
+                            "field_name": "udp_checksum", 
+                            "field_width": 2, 
+                            "field_lsb": 0
                         }
                     ]
                 }, 
@@ -6694,94 +6716,31 @@
                     "records": [
                         {
                             "word_bit_width": 8, 
-                            "position_offset": 38, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 7, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_srcPort", 
-                            "field_width": 2, 
-                            "field_lsb": 8
-                        }, 
-                        {
-                            "word_bit_width": 8, 
-                            "position_offset": 17, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 7, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_length_", 
-                            "field_width": 2, 
-                            "field_lsb": 8
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 290, 
-                    "records": [
-                        {
-                            "word_bit_width": 8, 
-                            "position_offset": 38, 
+                            "position_offset": 76, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 7, 
                             "phv_msb": 7, 
                             "is_compiler_generated": false, 
-                            "field_name": "tcp_srcPort", 
-                            "field_width": 2, 
+                            "field_name": "tcp_seqNo", 
+                            "field_width": 4, 
                             "field_lsb": 0
                         }, 
                         {
                             "word_bit_width": 8, 
-                            "position_offset": 17, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 7, 
-                            "phv_msb": 7, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_length_", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 291, 
-                    "records": [
-                        {
-                            "word_bit_width": 8, 
-                            "position_offset": 33, 
+                            "position_offset": 66, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 15, 
                             "phv_msb": 7, 
                             "is_compiler_generated": false, 
-                            "field_name": "tcp_dstPort", 
+                            "field_name": "udp_srcPort", 
                             "field_width": 2, 
                             "field_lsb": 8
                         }
                     ]
                 }, 
                 {
-                    "phv_number": 292, 
-                    "records": [
-                        {
-                            "word_bit_width": 8, 
-                            "position_offset": 33, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 7, 
-                            "phv_msb": 7, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_dstPort", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
                     "phv_number": 320, 
                     "records": [
                         {
@@ -6844,52 +6803,6 @@
                     "records": [
                         {
                             "word_bit_width": 16, 
-                            "position_offset": 76, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 31, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_seqNo", 
-                            "field_width": 4, 
-                            "field_lsb": 16
-                        }, 
-                        {
-                            "word_bit_width": 16, 
-                            "position_offset": 68, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_checksum", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 323, 
-                    "records": [
-                        {
-                            "word_bit_width": 16, 
-                            "position_offset": 76, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_seqNo", 
-                            "field_width": 4, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 324, 
-                    "records": [
-                        {
-                            "word_bit_width": 16, 
                             "position_offset": 26, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
@@ -6899,11 +6812,23 @@
                             "field_name": "tcp_ackNo", 
                             "field_width": 4, 
                             "field_lsb": 16
+                        }, 
+                        {
+                            "word_bit_width": 16, 
+                            "position_offset": 55, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 15, 
+                            "is_compiler_generated": false, 
+                            "field_name": "udp_dstPort", 
+                            "field_width": 2, 
+                            "field_lsb": 0
                         }
                     ]
                 }, 
                 {
-                    "phv_number": 325, 
+                    "phv_number": 323, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -7011,7 +6936,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 264, 
+                    "phv_number": 260, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -7052,7 +6977,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 265, 
+                    "phv_number": 261, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -7069,7 +6994,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 266, 
+                    "phv_number": 262, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -7086,7 +7011,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 267, 
+                    "phv_number": 263, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -7127,7 +7052,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 268, 
+                    "phv_number": 264, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -7192,7 +7117,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 269, 
+                    "phv_number": 265, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -7221,7 +7146,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 270, 
+                    "phv_number": 266, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -7238,7 +7163,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 271, 
+                    "phv_number": 267, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -7255,7 +7180,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 296, 
+                    "phv_number": 292, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -7284,7 +7209,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 297, 
+                    "phv_number": 293, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -7301,7 +7226,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 298, 
+                    "phv_number": 294, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -7330,7 +7255,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 299, 
+                    "phv_number": 295, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -7359,7 +7284,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 300, 
+                    "phv_number": 296, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -7376,7 +7301,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 301, 
+                    "phv_number": 297, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -7393,7 +7318,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 332, 
+                    "phv_number": 326, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -7410,7 +7335,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 333, 
+                    "phv_number": 327, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -7427,7 +7352,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 334, 
+                    "phv_number": 328, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -7456,7 +7381,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 335, 
+                    "phv_number": 329, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -7469,23 +7394,6 @@
                             "field_name": "tcp_dstPort", 
                             "field_width": 2, 
                             "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 336, 
-                    "records": [
-                        {
-                            "word_bit_width": 16, 
-                            "position_offset": 69, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 31, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_seqNo", 
-                            "field_width": 4, 
-                            "field_lsb": 16
                         }, 
                         {
                             "word_bit_width": 16, 
@@ -7502,7 +7410,24 @@
                     ]
                 }, 
                 {
-                    "phv_number": 337, 
+                    "phv_number": 330, 
+                    "records": [
+                        {
+                            "word_bit_width": 16, 
+                            "position_offset": 69, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 31, 
+                            "phv_msb": 15, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_seqNo", 
+                            "field_width": 4, 
+                            "field_lsb": 16
+                        }
+                    ]
+                }, 
+                {
+                    "phv_number": 331, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -7519,7 +7444,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 338, 
+                    "phv_number": 332, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -7548,7 +7473,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 339, 
+                    "phv_number": 333, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -7565,7 +7490,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 340, 
+                    "phv_number": 334, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -7679,6 +7604,35 @@
                     "records": [
                         {
                             "word_bit_width": 32, 
+                            "position_offset": 33, 
+                            "phv_lsb": 24, 
+                            "is_pov": false, 
+                            "field_msb": 7, 
+                            "phv_msb": 31, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_dstPort", 
+                            "field_width": 2, 
+                            "field_lsb": 0
+                        }, 
+                        {
+                            "word_bit_width": 32, 
+                            "position_offset": 76, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 31, 
+                            "phv_msb": 23, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_seqNo", 
+                            "field_width": 4, 
+                            "field_lsb": 8
+                        }
+                    ]
+                }, 
+                {
+                    "phv_number": 4, 
+                    "records": [
+                        {
+                            "word_bit_width": 32, 
                             "position_offset": 20, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
@@ -7692,7 +7646,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 4, 
+                    "phv_number": 5, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -7709,35 +7663,6 @@
                     ]
                 }, 
                 {
-                    "phv_number": 5, 
-                    "records": [
-                        {
-                            "word_bit_width": 32, 
-                            "position_offset": 66, 
-                            "phv_lsb": 16, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 31, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_srcPort", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }, 
-                        {
-                            "word_bit_width": 32, 
-                            "position_offset": 55, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_dstPort", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
                     "phv_number": 64, 
                     "records": [
                         {
@@ -7759,6 +7684,35 @@
                     "records": [
                         {
                             "word_bit_width": 8, 
+                            "position_offset": 38, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 7, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_srcPort", 
+                            "field_width": 2, 
+                            "field_lsb": 8
+                        }, 
+                        {
+                            "word_bit_width": 8, 
+                            "position_offset": 66, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 7, 
+                            "phv_msb": 7, 
+                            "is_compiler_generated": false, 
+                            "field_name": "udp_srcPort", 
+                            "field_width": 2, 
+                            "field_lsb": 0
+                        }
+                    ]
+                }, 
+                {
+                    "phv_number": 66, 
+                    "records": [
+                        {
+                            "word_bit_width": 8, 
                             "position_offset": 20, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
@@ -7772,7 +7726,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 66, 
+                    "phv_number": 67, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -7789,7 +7743,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 67, 
+                    "phv_number": 68, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -7844,7 +7798,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 68, 
+                    "phv_number": 69, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -7957,6 +7911,35 @@
                     "records": [
                         {
                             "word_bit_width": 16, 
+                            "position_offset": 38, 
+                            "phv_lsb": 8, 
+                            "is_pov": false, 
+                            "field_msb": 7, 
+                            "phv_msb": 15, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_srcPort", 
+                            "field_width": 2, 
+                            "field_lsb": 0
+                        }, 
+                        {
+                            "word_bit_width": 16, 
+                            "position_offset": 33, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 7, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_dstPort", 
+                            "field_width": 2, 
+                            "field_lsb": 8
+                        }
+                    ]
+                }, 
+                {
+                    "phv_number": 133, 
+                    "records": [
+                        {
+                            "word_bit_width": 16, 
                             "position_offset": 20, 
                             "phv_lsb": 8, 
                             "is_pov": false, 
@@ -7982,7 +7965,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 133, 
+                    "phv_number": 134, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -7999,7 +7982,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 134, 
+                    "phv_number": 135, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -8016,7 +7999,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 135, 
+                    "phv_number": 136, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -8147,6 +8130,30 @@
                             "field_name": "tcp_window", 
                             "field_width": 2, 
                             "field_lsb": 0
+                        }, 
+                        {
+                            "word_bit_width": 32, 
+                            "position_offset": 17, 
+                            "phv_lsb": 16, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 31, 
+                            "is_compiler_generated": false, 
+                            "field_name": "udp_length_", 
+                            "field_width": 2, 
+                            "field_lsb": 0
+                        }, 
+                        {
+                            "word_bit_width": 32, 
+                            "position_offset": 68, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 15, 
+                            "is_compiler_generated": false, 
+                            "field_name": "udp_checksum", 
+                            "field_width": 2, 
+                            "field_lsb": 0
                         }
                     ]
                 }, 
@@ -8213,94 +8220,31 @@
                     "records": [
                         {
                             "word_bit_width": 8, 
-                            "position_offset": 38, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 7, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_srcPort", 
-                            "field_width": 2, 
-                            "field_lsb": 8
-                        }, 
-                        {
-                            "word_bit_width": 8, 
-                            "position_offset": 17, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 7, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_length_", 
-                            "field_width": 2, 
-                            "field_lsb": 8
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 290, 
-                    "records": [
-                        {
-                            "word_bit_width": 8, 
-                            "position_offset": 38, 
+                            "position_offset": 76, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 7, 
                             "phv_msb": 7, 
                             "is_compiler_generated": false, 
-                            "field_name": "tcp_srcPort", 
-                            "field_width": 2, 
+                            "field_name": "tcp_seqNo", 
+                            "field_width": 4, 
                             "field_lsb": 0
                         }, 
                         {
                             "word_bit_width": 8, 
-                            "position_offset": 17, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 7, 
-                            "phv_msb": 7, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_length_", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 291, 
-                    "records": [
-                        {
-                            "word_bit_width": 8, 
-                            "position_offset": 33, 
+                            "position_offset": 66, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 15, 
                             "phv_msb": 7, 
                             "is_compiler_generated": false, 
-                            "field_name": "tcp_dstPort", 
+                            "field_name": "udp_srcPort", 
                             "field_width": 2, 
                             "field_lsb": 8
                         }
                     ]
                 }, 
                 {
-                    "phv_number": 292, 
-                    "records": [
-                        {
-                            "word_bit_width": 8, 
-                            "position_offset": 33, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 7, 
-                            "phv_msb": 7, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_dstPort", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
                     "phv_number": 320, 
                     "records": [
                         {
@@ -8363,52 +8307,6 @@
                     "records": [
                         {
                             "word_bit_width": 16, 
-                            "position_offset": 76, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 31, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_seqNo", 
-                            "field_width": 4, 
-                            "field_lsb": 16
-                        }, 
-                        {
-                            "word_bit_width": 16, 
-                            "position_offset": 68, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_checksum", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 323, 
-                    "records": [
-                        {
-                            "word_bit_width": 16, 
-                            "position_offset": 76, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_seqNo", 
-                            "field_width": 4, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 324, 
-                    "records": [
-                        {
-                            "word_bit_width": 16, 
                             "position_offset": 26, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
@@ -8418,11 +8316,23 @@
                             "field_name": "tcp_ackNo", 
                             "field_width": 4, 
                             "field_lsb": 16
+                        }, 
+                        {
+                            "word_bit_width": 16, 
+                            "position_offset": 55, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 15, 
+                            "is_compiler_generated": false, 
+                            "field_name": "udp_dstPort", 
+                            "field_width": 2, 
+                            "field_lsb": 0
                         }
                     ]
                 }, 
                 {
-                    "phv_number": 325, 
+                    "phv_number": 323, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -8530,7 +8440,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 264, 
+                    "phv_number": 260, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -8571,7 +8481,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 265, 
+                    "phv_number": 261, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -8588,7 +8498,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 266, 
+                    "phv_number": 262, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -8605,7 +8515,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 267, 
+                    "phv_number": 263, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -8646,7 +8556,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 268, 
+                    "phv_number": 264, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -8711,7 +8621,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 269, 
+                    "phv_number": 265, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -8740,7 +8650,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 270, 
+                    "phv_number": 266, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -8757,7 +8667,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 271, 
+                    "phv_number": 267, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -8774,7 +8684,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 296, 
+                    "phv_number": 292, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -8803,7 +8713,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 297, 
+                    "phv_number": 293, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -8820,7 +8730,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 298, 
+                    "phv_number": 294, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -8849,7 +8759,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 299, 
+                    "phv_number": 295, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -8878,7 +8788,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 300, 
+                    "phv_number": 296, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -8895,7 +8805,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 301, 
+                    "phv_number": 297, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -8912,7 +8822,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 332, 
+                    "phv_number": 326, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -8929,7 +8839,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 333, 
+                    "phv_number": 327, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -8946,7 +8856,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 334, 
+                    "phv_number": 328, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -8975,7 +8885,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 335, 
+                    "phv_number": 329, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -8988,23 +8898,6 @@
                             "field_name": "tcp_dstPort", 
                             "field_width": 2, 
                             "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 336, 
-                    "records": [
-                        {
-                            "word_bit_width": 16, 
-                            "position_offset": 69, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 31, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_seqNo", 
-                            "field_width": 4, 
-                            "field_lsb": 16
                         }, 
                         {
                             "word_bit_width": 16, 
@@ -9021,7 +8914,24 @@
                     ]
                 }, 
                 {
-                    "phv_number": 337, 
+                    "phv_number": 330, 
+                    "records": [
+                        {
+                            "word_bit_width": 16, 
+                            "position_offset": 69, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 31, 
+                            "phv_msb": 15, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_seqNo", 
+                            "field_width": 4, 
+                            "field_lsb": 16
+                        }
+                    ]
+                }, 
+                {
+                    "phv_number": 331, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -9038,7 +8948,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 338, 
+                    "phv_number": 332, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -9067,7 +8977,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 339, 
+                    "phv_number": 333, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -9084,7 +8994,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 340, 
+                    "phv_number": 334, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -9198,6 +9108,35 @@
                     "records": [
                         {
                             "word_bit_width": 32, 
+                            "position_offset": 33, 
+                            "phv_lsb": 24, 
+                            "is_pov": false, 
+                            "field_msb": 7, 
+                            "phv_msb": 31, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_dstPort", 
+                            "field_width": 2, 
+                            "field_lsb": 0
+                        }, 
+                        {
+                            "word_bit_width": 32, 
+                            "position_offset": 76, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 31, 
+                            "phv_msb": 23, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_seqNo", 
+                            "field_width": 4, 
+                            "field_lsb": 8
+                        }
+                    ]
+                }, 
+                {
+                    "phv_number": 4, 
+                    "records": [
+                        {
+                            "word_bit_width": 32, 
                             "position_offset": 20, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
@@ -9211,7 +9150,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 4, 
+                    "phv_number": 5, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -9228,35 +9167,6 @@
                     ]
                 }, 
                 {
-                    "phv_number": 5, 
-                    "records": [
-                        {
-                            "word_bit_width": 32, 
-                            "position_offset": 66, 
-                            "phv_lsb": 16, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 31, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_srcPort", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }, 
-                        {
-                            "word_bit_width": 32, 
-                            "position_offset": 55, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_dstPort", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
                     "phv_number": 64, 
                     "records": [
                         {
@@ -9278,6 +9188,35 @@
                     "records": [
                         {
                             "word_bit_width": 8, 
+                            "position_offset": 38, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 7, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_srcPort", 
+                            "field_width": 2, 
+                            "field_lsb": 8
+                        }, 
+                        {
+                            "word_bit_width": 8, 
+                            "position_offset": 66, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 7, 
+                            "phv_msb": 7, 
+                            "is_compiler_generated": false, 
+                            "field_name": "udp_srcPort", 
+                            "field_width": 2, 
+                            "field_lsb": 0
+                        }
+                    ]
+                }, 
+                {
+                    "phv_number": 66, 
+                    "records": [
+                        {
+                            "word_bit_width": 8, 
                             "position_offset": 20, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
@@ -9291,7 +9230,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 66, 
+                    "phv_number": 67, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -9308,7 +9247,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 67, 
+                    "phv_number": 68, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -9363,7 +9302,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 68, 
+                    "phv_number": 69, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -9476,6 +9415,35 @@
                     "records": [
                         {
                             "word_bit_width": 16, 
+                            "position_offset": 38, 
+                            "phv_lsb": 8, 
+                            "is_pov": false, 
+                            "field_msb": 7, 
+                            "phv_msb": 15, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_srcPort", 
+                            "field_width": 2, 
+                            "field_lsb": 0
+                        }, 
+                        {
+                            "word_bit_width": 16, 
+                            "position_offset": 33, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 7, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_dstPort", 
+                            "field_width": 2, 
+                            "field_lsb": 8
+                        }
+                    ]
+                }, 
+                {
+                    "phv_number": 133, 
+                    "records": [
+                        {
+                            "word_bit_width": 16, 
                             "position_offset": 20, 
                             "phv_lsb": 8, 
                             "is_pov": false, 
@@ -9501,7 +9469,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 133, 
+                    "phv_number": 134, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -9518,7 +9486,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 134, 
+                    "phv_number": 135, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -9535,7 +9503,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 135, 
+                    "phv_number": 136, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -9666,6 +9634,30 @@
                             "field_name": "tcp_window", 
                             "field_width": 2, 
                             "field_lsb": 0
+                        }, 
+                        {
+                            "word_bit_width": 32, 
+                            "position_offset": 17, 
+                            "phv_lsb": 16, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 31, 
+                            "is_compiler_generated": false, 
+                            "field_name": "udp_length_", 
+                            "field_width": 2, 
+                            "field_lsb": 0
+                        }, 
+                        {
+                            "word_bit_width": 32, 
+                            "position_offset": 68, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 15, 
+                            "is_compiler_generated": false, 
+                            "field_name": "udp_checksum", 
+                            "field_width": 2, 
+                            "field_lsb": 0
                         }
                     ]
                 }, 
@@ -9732,94 +9724,31 @@
                     "records": [
                         {
                             "word_bit_width": 8, 
-                            "position_offset": 38, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 7, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_srcPort", 
-                            "field_width": 2, 
-                            "field_lsb": 8
-                        }, 
-                        {
-                            "word_bit_width": 8, 
-                            "position_offset": 17, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 7, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_length_", 
-                            "field_width": 2, 
-                            "field_lsb": 8
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 290, 
-                    "records": [
-                        {
-                            "word_bit_width": 8, 
-                            "position_offset": 38, 
+                            "position_offset": 76, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 7, 
                             "phv_msb": 7, 
                             "is_compiler_generated": false, 
-                            "field_name": "tcp_srcPort", 
-                            "field_width": 2, 
+                            "field_name": "tcp_seqNo", 
+                            "field_width": 4, 
                             "field_lsb": 0
                         }, 
                         {
                             "word_bit_width": 8, 
-                            "position_offset": 17, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 7, 
-                            "phv_msb": 7, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_length_", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 291, 
-                    "records": [
-                        {
-                            "word_bit_width": 8, 
-                            "position_offset": 33, 
+                            "position_offset": 66, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 15, 
                             "phv_msb": 7, 
                             "is_compiler_generated": false, 
-                            "field_name": "tcp_dstPort", 
+                            "field_name": "udp_srcPort", 
                             "field_width": 2, 
                             "field_lsb": 8
                         }
                     ]
                 }, 
                 {
-                    "phv_number": 292, 
-                    "records": [
-                        {
-                            "word_bit_width": 8, 
-                            "position_offset": 33, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 7, 
-                            "phv_msb": 7, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_dstPort", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
                     "phv_number": 320, 
                     "records": [
                         {
@@ -9882,52 +9811,6 @@
                     "records": [
                         {
                             "word_bit_width": 16, 
-                            "position_offset": 76, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 31, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_seqNo", 
-                            "field_width": 4, 
-                            "field_lsb": 16
-                        }, 
-                        {
-                            "word_bit_width": 16, 
-                            "position_offset": 68, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_checksum", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 323, 
-                    "records": [
-                        {
-                            "word_bit_width": 16, 
-                            "position_offset": 76, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_seqNo", 
-                            "field_width": 4, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 324, 
-                    "records": [
-                        {
-                            "word_bit_width": 16, 
                             "position_offset": 26, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
@@ -9937,11 +9820,23 @@
                             "field_name": "tcp_ackNo", 
                             "field_width": 4, 
                             "field_lsb": 16
+                        }, 
+                        {
+                            "word_bit_width": 16, 
+                            "position_offset": 55, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 15, 
+                            "is_compiler_generated": false, 
+                            "field_name": "udp_dstPort", 
+                            "field_width": 2, 
+                            "field_lsb": 0
                         }
                     ]
                 }, 
                 {
-                    "phv_number": 325, 
+                    "phv_number": 323, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -10049,7 +9944,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 264, 
+                    "phv_number": 260, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -10090,7 +9985,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 265, 
+                    "phv_number": 261, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -10107,7 +10002,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 266, 
+                    "phv_number": 262, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -10124,7 +10019,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 267, 
+                    "phv_number": 263, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -10165,7 +10060,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 268, 
+                    "phv_number": 264, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -10230,7 +10125,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 269, 
+                    "phv_number": 265, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -10259,7 +10154,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 270, 
+                    "phv_number": 266, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -10276,7 +10171,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 271, 
+                    "phv_number": 267, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -10293,7 +10188,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 296, 
+                    "phv_number": 292, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -10322,7 +10217,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 297, 
+                    "phv_number": 293, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -10339,7 +10234,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 298, 
+                    "phv_number": 294, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -10368,7 +10263,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 299, 
+                    "phv_number": 295, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -10397,7 +10292,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 300, 
+                    "phv_number": 296, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -10414,7 +10309,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 301, 
+                    "phv_number": 297, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -10431,7 +10326,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 332, 
+                    "phv_number": 326, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -10448,7 +10343,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 333, 
+                    "phv_number": 327, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -10465,7 +10360,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 334, 
+                    "phv_number": 328, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -10494,7 +10389,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 335, 
+                    "phv_number": 329, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -10507,23 +10402,6 @@
                             "field_name": "tcp_dstPort", 
                             "field_width": 2, 
                             "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 336, 
-                    "records": [
-                        {
-                            "word_bit_width": 16, 
-                            "position_offset": 69, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 31, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_seqNo", 
-                            "field_width": 4, 
-                            "field_lsb": 16
                         }, 
                         {
                             "word_bit_width": 16, 
@@ -10540,7 +10418,24 @@
                     ]
                 }, 
                 {
-                    "phv_number": 337, 
+                    "phv_number": 330, 
+                    "records": [
+                        {
+                            "word_bit_width": 16, 
+                            "position_offset": 69, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 31, 
+                            "phv_msb": 15, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_seqNo", 
+                            "field_width": 4, 
+                            "field_lsb": 16
+                        }
+                    ]
+                }, 
+                {
+                    "phv_number": 331, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -10557,7 +10452,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 338, 
+                    "phv_number": 332, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -10586,7 +10481,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 339, 
+                    "phv_number": 333, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -10603,7 +10498,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 340, 
+                    "phv_number": 334, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -10717,6 +10612,35 @@
                     "records": [
                         {
                             "word_bit_width": 32, 
+                            "position_offset": 33, 
+                            "phv_lsb": 24, 
+                            "is_pov": false, 
+                            "field_msb": 7, 
+                            "phv_msb": 31, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_dstPort", 
+                            "field_width": 2, 
+                            "field_lsb": 0
+                        }, 
+                        {
+                            "word_bit_width": 32, 
+                            "position_offset": 76, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 31, 
+                            "phv_msb": 23, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_seqNo", 
+                            "field_width": 4, 
+                            "field_lsb": 8
+                        }
+                    ]
+                }, 
+                {
+                    "phv_number": 4, 
+                    "records": [
+                        {
+                            "word_bit_width": 32, 
                             "position_offset": 20, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
@@ -10730,7 +10654,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 4, 
+                    "phv_number": 5, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -10747,35 +10671,6 @@
                     ]
                 }, 
                 {
-                    "phv_number": 5, 
-                    "records": [
-                        {
-                            "word_bit_width": 32, 
-                            "position_offset": 66, 
-                            "phv_lsb": 16, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 31, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_srcPort", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }, 
-                        {
-                            "word_bit_width": 32, 
-                            "position_offset": 55, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_dstPort", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
                     "phv_number": 64, 
                     "records": [
                         {
@@ -10797,6 +10692,35 @@
                     "records": [
                         {
                             "word_bit_width": 8, 
+                            "position_offset": 38, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 7, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_srcPort", 
+                            "field_width": 2, 
+                            "field_lsb": 8
+                        }, 
+                        {
+                            "word_bit_width": 8, 
+                            "position_offset": 66, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 7, 
+                            "phv_msb": 7, 
+                            "is_compiler_generated": false, 
+                            "field_name": "udp_srcPort", 
+                            "field_width": 2, 
+                            "field_lsb": 0
+                        }
+                    ]
+                }, 
+                {
+                    "phv_number": 66, 
+                    "records": [
+                        {
+                            "word_bit_width": 8, 
                             "position_offset": 20, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
@@ -10810,7 +10734,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 66, 
+                    "phv_number": 67, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -10827,7 +10751,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 67, 
+                    "phv_number": 68, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -10882,7 +10806,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 68, 
+                    "phv_number": 69, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -10995,6 +10919,35 @@
                     "records": [
                         {
                             "word_bit_width": 16, 
+                            "position_offset": 38, 
+                            "phv_lsb": 8, 
+                            "is_pov": false, 
+                            "field_msb": 7, 
+                            "phv_msb": 15, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_srcPort", 
+                            "field_width": 2, 
+                            "field_lsb": 0
+                        }, 
+                        {
+                            "word_bit_width": 16, 
+                            "position_offset": 33, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 7, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_dstPort", 
+                            "field_width": 2, 
+                            "field_lsb": 8
+                        }
+                    ]
+                }, 
+                {
+                    "phv_number": 133, 
+                    "records": [
+                        {
+                            "word_bit_width": 16, 
                             "position_offset": 20, 
                             "phv_lsb": 8, 
                             "is_pov": false, 
@@ -11020,7 +10973,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 133, 
+                    "phv_number": 134, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -11037,7 +10990,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 134, 
+                    "phv_number": 135, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -11054,7 +11007,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 135, 
+                    "phv_number": 136, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -11185,6 +11138,30 @@
                             "field_name": "tcp_window", 
                             "field_width": 2, 
                             "field_lsb": 0
+                        }, 
+                        {
+                            "word_bit_width": 32, 
+                            "position_offset": 17, 
+                            "phv_lsb": 16, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 31, 
+                            "is_compiler_generated": false, 
+                            "field_name": "udp_length_", 
+                            "field_width": 2, 
+                            "field_lsb": 0
+                        }, 
+                        {
+                            "word_bit_width": 32, 
+                            "position_offset": 68, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 15, 
+                            "is_compiler_generated": false, 
+                            "field_name": "udp_checksum", 
+                            "field_width": 2, 
+                            "field_lsb": 0
                         }
                     ]
                 }, 
@@ -11251,94 +11228,31 @@
                     "records": [
                         {
                             "word_bit_width": 8, 
-                            "position_offset": 38, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 7, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_srcPort", 
-                            "field_width": 2, 
-                            "field_lsb": 8
-                        }, 
-                        {
-                            "word_bit_width": 8, 
-                            "position_offset": 17, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 7, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_length_", 
-                            "field_width": 2, 
-                            "field_lsb": 8
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 290, 
-                    "records": [
-                        {
-                            "word_bit_width": 8, 
-                            "position_offset": 38, 
+                            "position_offset": 76, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 7, 
                             "phv_msb": 7, 
                             "is_compiler_generated": false, 
-                            "field_name": "tcp_srcPort", 
-                            "field_width": 2, 
+                            "field_name": "tcp_seqNo", 
+                            "field_width": 4, 
                             "field_lsb": 0
                         }, 
                         {
                             "word_bit_width": 8, 
-                            "position_offset": 17, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 7, 
-                            "phv_msb": 7, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_length_", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 291, 
-                    "records": [
-                        {
-                            "word_bit_width": 8, 
-                            "position_offset": 33, 
+                            "position_offset": 66, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 15, 
                             "phv_msb": 7, 
                             "is_compiler_generated": false, 
-                            "field_name": "tcp_dstPort", 
+                            "field_name": "udp_srcPort", 
                             "field_width": 2, 
                             "field_lsb": 8
                         }
                     ]
                 }, 
                 {
-                    "phv_number": 292, 
-                    "records": [
-                        {
-                            "word_bit_width": 8, 
-                            "position_offset": 33, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 7, 
-                            "phv_msb": 7, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_dstPort", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
                     "phv_number": 320, 
                     "records": [
                         {
@@ -11401,52 +11315,6 @@
                     "records": [
                         {
                             "word_bit_width": 16, 
-                            "position_offset": 76, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 31, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_seqNo", 
-                            "field_width": 4, 
-                            "field_lsb": 16
-                        }, 
-                        {
-                            "word_bit_width": 16, 
-                            "position_offset": 68, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_checksum", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 323, 
-                    "records": [
-                        {
-                            "word_bit_width": 16, 
-                            "position_offset": 76, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_seqNo", 
-                            "field_width": 4, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 324, 
-                    "records": [
-                        {
-                            "word_bit_width": 16, 
                             "position_offset": 26, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
@@ -11456,11 +11324,23 @@
                             "field_name": "tcp_ackNo", 
                             "field_width": 4, 
                             "field_lsb": 16
+                        }, 
+                        {
+                            "word_bit_width": 16, 
+                            "position_offset": 55, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 15, 
+                            "is_compiler_generated": false, 
+                            "field_name": "udp_dstPort", 
+                            "field_width": 2, 
+                            "field_lsb": 0
                         }
                     ]
                 }, 
                 {
-                    "phv_number": 325, 
+                    "phv_number": 323, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -11568,7 +11448,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 264, 
+                    "phv_number": 260, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -11609,7 +11489,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 265, 
+                    "phv_number": 261, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -11626,7 +11506,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 266, 
+                    "phv_number": 262, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -11643,7 +11523,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 267, 
+                    "phv_number": 263, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -11684,7 +11564,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 268, 
+                    "phv_number": 264, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -11749,7 +11629,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 269, 
+                    "phv_number": 265, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -11778,7 +11658,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 270, 
+                    "phv_number": 266, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -11795,7 +11675,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 271, 
+                    "phv_number": 267, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -11812,7 +11692,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 296, 
+                    "phv_number": 292, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -11841,7 +11721,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 297, 
+                    "phv_number": 293, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -11858,7 +11738,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 298, 
+                    "phv_number": 294, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -11887,7 +11767,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 299, 
+                    "phv_number": 295, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -11916,7 +11796,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 300, 
+                    "phv_number": 296, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -11933,7 +11813,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 301, 
+                    "phv_number": 297, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -11950,7 +11830,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 332, 
+                    "phv_number": 326, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -11967,7 +11847,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 333, 
+                    "phv_number": 327, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -11984,7 +11864,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 334, 
+                    "phv_number": 328, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -12013,7 +11893,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 335, 
+                    "phv_number": 329, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -12026,23 +11906,6 @@
                             "field_name": "tcp_dstPort", 
                             "field_width": 2, 
                             "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 336, 
-                    "records": [
-                        {
-                            "word_bit_width": 16, 
-                            "position_offset": 69, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 31, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_seqNo", 
-                            "field_width": 4, 
-                            "field_lsb": 16
                         }, 
                         {
                             "word_bit_width": 16, 
@@ -12059,7 +11922,24 @@
                     ]
                 }, 
                 {
-                    "phv_number": 337, 
+                    "phv_number": 330, 
+                    "records": [
+                        {
+                            "word_bit_width": 16, 
+                            "position_offset": 69, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 31, 
+                            "phv_msb": 15, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_seqNo", 
+                            "field_width": 4, 
+                            "field_lsb": 16
+                        }
+                    ]
+                }, 
+                {
+                    "phv_number": 331, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -12076,7 +11956,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 338, 
+                    "phv_number": 332, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -12105,7 +11985,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 339, 
+                    "phv_number": 333, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -12122,7 +12002,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 340, 
+                    "phv_number": 334, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -12236,6 +12116,35 @@
                     "records": [
                         {
                             "word_bit_width": 32, 
+                            "position_offset": 33, 
+                            "phv_lsb": 24, 
+                            "is_pov": false, 
+                            "field_msb": 7, 
+                            "phv_msb": 31, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_dstPort", 
+                            "field_width": 2, 
+                            "field_lsb": 0
+                        }, 
+                        {
+                            "word_bit_width": 32, 
+                            "position_offset": 76, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 31, 
+                            "phv_msb": 23, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_seqNo", 
+                            "field_width": 4, 
+                            "field_lsb": 8
+                        }
+                    ]
+                }, 
+                {
+                    "phv_number": 4, 
+                    "records": [
+                        {
+                            "word_bit_width": 32, 
                             "position_offset": 20, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
@@ -12249,7 +12158,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 4, 
+                    "phv_number": 5, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -12266,35 +12175,6 @@
                     ]
                 }, 
                 {
-                    "phv_number": 5, 
-                    "records": [
-                        {
-                            "word_bit_width": 32, 
-                            "position_offset": 66, 
-                            "phv_lsb": 16, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 31, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_srcPort", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }, 
-                        {
-                            "word_bit_width": 32, 
-                            "position_offset": 55, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_dstPort", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
                     "phv_number": 64, 
                     "records": [
                         {
@@ -12316,6 +12196,35 @@
                     "records": [
                         {
                             "word_bit_width": 8, 
+                            "position_offset": 38, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 7, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_srcPort", 
+                            "field_width": 2, 
+                            "field_lsb": 8
+                        }, 
+                        {
+                            "word_bit_width": 8, 
+                            "position_offset": 66, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 7, 
+                            "phv_msb": 7, 
+                            "is_compiler_generated": false, 
+                            "field_name": "udp_srcPort", 
+                            "field_width": 2, 
+                            "field_lsb": 0
+                        }
+                    ]
+                }, 
+                {
+                    "phv_number": 66, 
+                    "records": [
+                        {
+                            "word_bit_width": 8, 
                             "position_offset": 20, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
@@ -12329,7 +12238,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 66, 
+                    "phv_number": 67, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -12346,7 +12255,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 67, 
+                    "phv_number": 68, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -12401,7 +12310,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 68, 
+                    "phv_number": 69, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -12514,6 +12423,35 @@
                     "records": [
                         {
                             "word_bit_width": 16, 
+                            "position_offset": 38, 
+                            "phv_lsb": 8, 
+                            "is_pov": false, 
+                            "field_msb": 7, 
+                            "phv_msb": 15, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_srcPort", 
+                            "field_width": 2, 
+                            "field_lsb": 0
+                        }, 
+                        {
+                            "word_bit_width": 16, 
+                            "position_offset": 33, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 7, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_dstPort", 
+                            "field_width": 2, 
+                            "field_lsb": 8
+                        }
+                    ]
+                }, 
+                {
+                    "phv_number": 133, 
+                    "records": [
+                        {
+                            "word_bit_width": 16, 
                             "position_offset": 20, 
                             "phv_lsb": 8, 
                             "is_pov": false, 
@@ -12539,7 +12477,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 133, 
+                    "phv_number": 134, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -12556,7 +12494,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 134, 
+                    "phv_number": 135, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -12573,7 +12511,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 135, 
+                    "phv_number": 136, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -12704,6 +12642,30 @@
                             "field_name": "tcp_window", 
                             "field_width": 2, 
                             "field_lsb": 0
+                        }, 
+                        {
+                            "word_bit_width": 32, 
+                            "position_offset": 17, 
+                            "phv_lsb": 16, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 31, 
+                            "is_compiler_generated": false, 
+                            "field_name": "udp_length_", 
+                            "field_width": 2, 
+                            "field_lsb": 0
+                        }, 
+                        {
+                            "word_bit_width": 32, 
+                            "position_offset": 68, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 15, 
+                            "is_compiler_generated": false, 
+                            "field_name": "udp_checksum", 
+                            "field_width": 2, 
+                            "field_lsb": 0
                         }
                     ]
                 }, 
@@ -12770,94 +12732,31 @@
                     "records": [
                         {
                             "word_bit_width": 8, 
-                            "position_offset": 38, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 7, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_srcPort", 
-                            "field_width": 2, 
-                            "field_lsb": 8
-                        }, 
-                        {
-                            "word_bit_width": 8, 
-                            "position_offset": 17, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 7, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_length_", 
-                            "field_width": 2, 
-                            "field_lsb": 8
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 290, 
-                    "records": [
-                        {
-                            "word_bit_width": 8, 
-                            "position_offset": 38, 
+                            "position_offset": 76, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 7, 
                             "phv_msb": 7, 
                             "is_compiler_generated": false, 
-                            "field_name": "tcp_srcPort", 
-                            "field_width": 2, 
+                            "field_name": "tcp_seqNo", 
+                            "field_width": 4, 
                             "field_lsb": 0
                         }, 
                         {
                             "word_bit_width": 8, 
-                            "position_offset": 17, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 7, 
-                            "phv_msb": 7, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_length_", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 291, 
-                    "records": [
-                        {
-                            "word_bit_width": 8, 
-                            "position_offset": 33, 
+                            "position_offset": 66, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 15, 
                             "phv_msb": 7, 
                             "is_compiler_generated": false, 
-                            "field_name": "tcp_dstPort", 
+                            "field_name": "udp_srcPort", 
                             "field_width": 2, 
                             "field_lsb": 8
                         }
                     ]
                 }, 
                 {
-                    "phv_number": 292, 
-                    "records": [
-                        {
-                            "word_bit_width": 8, 
-                            "position_offset": 33, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 7, 
-                            "phv_msb": 7, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_dstPort", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
                     "phv_number": 320, 
                     "records": [
                         {
@@ -12920,52 +12819,6 @@
                     "records": [
                         {
                             "word_bit_width": 16, 
-                            "position_offset": 76, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 31, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_seqNo", 
-                            "field_width": 4, 
-                            "field_lsb": 16
-                        }, 
-                        {
-                            "word_bit_width": 16, 
-                            "position_offset": 68, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_checksum", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 323, 
-                    "records": [
-                        {
-                            "word_bit_width": 16, 
-                            "position_offset": 76, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_seqNo", 
-                            "field_width": 4, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 324, 
-                    "records": [
-                        {
-                            "word_bit_width": 16, 
                             "position_offset": 26, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
@@ -12975,11 +12828,23 @@
                             "field_name": "tcp_ackNo", 
                             "field_width": 4, 
                             "field_lsb": 16
+                        }, 
+                        {
+                            "word_bit_width": 16, 
+                            "position_offset": 55, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 15, 
+                            "is_compiler_generated": false, 
+                            "field_name": "udp_dstPort", 
+                            "field_width": 2, 
+                            "field_lsb": 0
                         }
                     ]
                 }, 
                 {
-                    "phv_number": 325, 
+                    "phv_number": 323, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -13087,7 +12952,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 264, 
+                    "phv_number": 260, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -13128,7 +12993,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 265, 
+                    "phv_number": 261, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -13145,7 +13010,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 266, 
+                    "phv_number": 262, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -13162,7 +13027,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 267, 
+                    "phv_number": 263, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -13203,7 +13068,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 268, 
+                    "phv_number": 264, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -13268,7 +13133,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 269, 
+                    "phv_number": 265, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -13297,7 +13162,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 270, 
+                    "phv_number": 266, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -13314,7 +13179,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 271, 
+                    "phv_number": 267, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -13331,7 +13196,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 296, 
+                    "phv_number": 292, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -13360,7 +13225,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 297, 
+                    "phv_number": 293, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -13377,7 +13242,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 298, 
+                    "phv_number": 294, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -13406,7 +13271,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 299, 
+                    "phv_number": 295, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -13435,7 +13300,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 300, 
+                    "phv_number": 296, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -13452,7 +13317,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 301, 
+                    "phv_number": 297, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -13469,7 +13334,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 332, 
+                    "phv_number": 326, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -13486,7 +13351,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 333, 
+                    "phv_number": 327, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -13503,7 +13368,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 334, 
+                    "phv_number": 328, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -13532,7 +13397,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 335, 
+                    "phv_number": 329, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -13545,23 +13410,6 @@
                             "field_name": "tcp_dstPort", 
                             "field_width": 2, 
                             "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 336, 
-                    "records": [
-                        {
-                            "word_bit_width": 16, 
-                            "position_offset": 69, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 31, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_seqNo", 
-                            "field_width": 4, 
-                            "field_lsb": 16
                         }, 
                         {
                             "word_bit_width": 16, 
@@ -13578,7 +13426,24 @@
                     ]
                 }, 
                 {
-                    "phv_number": 337, 
+                    "phv_number": 330, 
+                    "records": [
+                        {
+                            "word_bit_width": 16, 
+                            "position_offset": 69, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 31, 
+                            "phv_msb": 15, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_seqNo", 
+                            "field_width": 4, 
+                            "field_lsb": 16
+                        }
+                    ]
+                }, 
+                {
+                    "phv_number": 331, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -13595,7 +13460,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 338, 
+                    "phv_number": 332, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -13624,7 +13489,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 339, 
+                    "phv_number": 333, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -13641,7 +13506,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 340, 
+                    "phv_number": 334, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -13755,6 +13620,35 @@
                     "records": [
                         {
                             "word_bit_width": 32, 
+                            "position_offset": 33, 
+                            "phv_lsb": 24, 
+                            "is_pov": false, 
+                            "field_msb": 7, 
+                            "phv_msb": 31, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_dstPort", 
+                            "field_width": 2, 
+                            "field_lsb": 0
+                        }, 
+                        {
+                            "word_bit_width": 32, 
+                            "position_offset": 76, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 31, 
+                            "phv_msb": 23, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_seqNo", 
+                            "field_width": 4, 
+                            "field_lsb": 8
+                        }
+                    ]
+                }, 
+                {
+                    "phv_number": 4, 
+                    "records": [
+                        {
+                            "word_bit_width": 32, 
                             "position_offset": 20, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
@@ -13768,7 +13662,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 4, 
+                    "phv_number": 5, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -13785,35 +13679,6 @@
                     ]
                 }, 
                 {
-                    "phv_number": 5, 
-                    "records": [
-                        {
-                            "word_bit_width": 32, 
-                            "position_offset": 66, 
-                            "phv_lsb": 16, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 31, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_srcPort", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }, 
-                        {
-                            "word_bit_width": 32, 
-                            "position_offset": 55, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_dstPort", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
                     "phv_number": 64, 
                     "records": [
                         {
@@ -13835,6 +13700,35 @@
                     "records": [
                         {
                             "word_bit_width": 8, 
+                            "position_offset": 38, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 7, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_srcPort", 
+                            "field_width": 2, 
+                            "field_lsb": 8
+                        }, 
+                        {
+                            "word_bit_width": 8, 
+                            "position_offset": 66, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 7, 
+                            "phv_msb": 7, 
+                            "is_compiler_generated": false, 
+                            "field_name": "udp_srcPort", 
+                            "field_width": 2, 
+                            "field_lsb": 0
+                        }
+                    ]
+                }, 
+                {
+                    "phv_number": 66, 
+                    "records": [
+                        {
+                            "word_bit_width": 8, 
                             "position_offset": 20, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
@@ -13848,7 +13742,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 66, 
+                    "phv_number": 67, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -13865,7 +13759,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 67, 
+                    "phv_number": 68, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -13920,7 +13814,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 68, 
+                    "phv_number": 69, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -14033,6 +13927,35 @@
                     "records": [
                         {
                             "word_bit_width": 16, 
+                            "position_offset": 38, 
+                            "phv_lsb": 8, 
+                            "is_pov": false, 
+                            "field_msb": 7, 
+                            "phv_msb": 15, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_srcPort", 
+                            "field_width": 2, 
+                            "field_lsb": 0
+                        }, 
+                        {
+                            "word_bit_width": 16, 
+                            "position_offset": 33, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 7, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_dstPort", 
+                            "field_width": 2, 
+                            "field_lsb": 8
+                        }
+                    ]
+                }, 
+                {
+                    "phv_number": 133, 
+                    "records": [
+                        {
+                            "word_bit_width": 16, 
                             "position_offset": 20, 
                             "phv_lsb": 8, 
                             "is_pov": false, 
@@ -14058,7 +13981,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 133, 
+                    "phv_number": 134, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -14075,7 +13998,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 134, 
+                    "phv_number": 135, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -14092,7 +14015,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 135, 
+                    "phv_number": 136, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -14223,6 +14146,30 @@
                             "field_name": "tcp_window", 
                             "field_width": 2, 
                             "field_lsb": 0
+                        }, 
+                        {
+                            "word_bit_width": 32, 
+                            "position_offset": 17, 
+                            "phv_lsb": 16, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 31, 
+                            "is_compiler_generated": false, 
+                            "field_name": "udp_length_", 
+                            "field_width": 2, 
+                            "field_lsb": 0
+                        }, 
+                        {
+                            "word_bit_width": 32, 
+                            "position_offset": 68, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 15, 
+                            "is_compiler_generated": false, 
+                            "field_name": "udp_checksum", 
+                            "field_width": 2, 
+                            "field_lsb": 0
                         }
                     ]
                 }, 
@@ -14289,94 +14236,31 @@
                     "records": [
                         {
                             "word_bit_width": 8, 
-                            "position_offset": 38, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 7, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_srcPort", 
-                            "field_width": 2, 
-                            "field_lsb": 8
-                        }, 
-                        {
-                            "word_bit_width": 8, 
-                            "position_offset": 17, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 7, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_length_", 
-                            "field_width": 2, 
-                            "field_lsb": 8
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 290, 
-                    "records": [
-                        {
-                            "word_bit_width": 8, 
-                            "position_offset": 38, 
+                            "position_offset": 76, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 7, 
                             "phv_msb": 7, 
                             "is_compiler_generated": false, 
-                            "field_name": "tcp_srcPort", 
-                            "field_width": 2, 
+                            "field_name": "tcp_seqNo", 
+                            "field_width": 4, 
                             "field_lsb": 0
                         }, 
                         {
                             "word_bit_width": 8, 
-                            "position_offset": 17, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 7, 
-                            "phv_msb": 7, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_length_", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 291, 
-                    "records": [
-                        {
-                            "word_bit_width": 8, 
-                            "position_offset": 33, 
+                            "position_offset": 66, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 15, 
                             "phv_msb": 7, 
                             "is_compiler_generated": false, 
-                            "field_name": "tcp_dstPort", 
+                            "field_name": "udp_srcPort", 
                             "field_width": 2, 
                             "field_lsb": 8
                         }
                     ]
                 }, 
                 {
-                    "phv_number": 292, 
-                    "records": [
-                        {
-                            "word_bit_width": 8, 
-                            "position_offset": 33, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 7, 
-                            "phv_msb": 7, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_dstPort", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
                     "phv_number": 320, 
                     "records": [
                         {
@@ -14439,52 +14323,6 @@
                     "records": [
                         {
                             "word_bit_width": 16, 
-                            "position_offset": 76, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 31, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_seqNo", 
-                            "field_width": 4, 
-                            "field_lsb": 16
-                        }, 
-                        {
-                            "word_bit_width": 16, 
-                            "position_offset": 68, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_checksum", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 323, 
-                    "records": [
-                        {
-                            "word_bit_width": 16, 
-                            "position_offset": 76, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_seqNo", 
-                            "field_width": 4, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 324, 
-                    "records": [
-                        {
-                            "word_bit_width": 16, 
                             "position_offset": 26, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
@@ -14494,11 +14332,23 @@
                             "field_name": "tcp_ackNo", 
                             "field_width": 4, 
                             "field_lsb": 16
+                        }, 
+                        {
+                            "word_bit_width": 16, 
+                            "position_offset": 55, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 15, 
+                            "is_compiler_generated": false, 
+                            "field_name": "udp_dstPort", 
+                            "field_width": 2, 
+                            "field_lsb": 0
                         }
                     ]
                 }, 
                 {
-                    "phv_number": 325, 
+                    "phv_number": 323, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -14606,7 +14456,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 264, 
+                    "phv_number": 260, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -14647,7 +14497,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 265, 
+                    "phv_number": 261, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -14664,7 +14514,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 266, 
+                    "phv_number": 262, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -14681,7 +14531,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 267, 
+                    "phv_number": 263, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -14722,7 +14572,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 268, 
+                    "phv_number": 264, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -14787,7 +14637,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 269, 
+                    "phv_number": 265, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -14816,7 +14666,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 270, 
+                    "phv_number": 266, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -14833,7 +14683,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 271, 
+                    "phv_number": 267, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -14850,7 +14700,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 296, 
+                    "phv_number": 292, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -14879,7 +14729,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 297, 
+                    "phv_number": 293, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -14896,7 +14746,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 298, 
+                    "phv_number": 294, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -14925,7 +14775,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 299, 
+                    "phv_number": 295, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -14954,7 +14804,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 300, 
+                    "phv_number": 296, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -14971,7 +14821,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 301, 
+                    "phv_number": 297, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -14988,7 +14838,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 332, 
+                    "phv_number": 326, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -15005,7 +14855,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 333, 
+                    "phv_number": 327, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -15022,7 +14872,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 334, 
+                    "phv_number": 328, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -15051,7 +14901,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 335, 
+                    "phv_number": 329, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -15064,23 +14914,6 @@
                             "field_name": "tcp_dstPort", 
                             "field_width": 2, 
                             "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 336, 
-                    "records": [
-                        {
-                            "word_bit_width": 16, 
-                            "position_offset": 69, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 31, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_seqNo", 
-                            "field_width": 4, 
-                            "field_lsb": 16
                         }, 
                         {
                             "word_bit_width": 16, 
@@ -15097,7 +14930,24 @@
                     ]
                 }, 
                 {
-                    "phv_number": 337, 
+                    "phv_number": 330, 
+                    "records": [
+                        {
+                            "word_bit_width": 16, 
+                            "position_offset": 69, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 31, 
+                            "phv_msb": 15, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_seqNo", 
+                            "field_width": 4, 
+                            "field_lsb": 16
+                        }
+                    ]
+                }, 
+                {
+                    "phv_number": 331, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -15114,7 +14964,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 338, 
+                    "phv_number": 332, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -15143,7 +14993,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 339, 
+                    "phv_number": 333, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -15160,7 +15010,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 340, 
+                    "phv_number": 334, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -15274,6 +15124,35 @@
                     "records": [
                         {
                             "word_bit_width": 32, 
+                            "position_offset": 33, 
+                            "phv_lsb": 24, 
+                            "is_pov": false, 
+                            "field_msb": 7, 
+                            "phv_msb": 31, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_dstPort", 
+                            "field_width": 2, 
+                            "field_lsb": 0
+                        }, 
+                        {
+                            "word_bit_width": 32, 
+                            "position_offset": 76, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 31, 
+                            "phv_msb": 23, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_seqNo", 
+                            "field_width": 4, 
+                            "field_lsb": 8
+                        }
+                    ]
+                }, 
+                {
+                    "phv_number": 4, 
+                    "records": [
+                        {
+                            "word_bit_width": 32, 
                             "position_offset": 20, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
@@ -15287,7 +15166,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 4, 
+                    "phv_number": 5, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -15304,35 +15183,6 @@
                     ]
                 }, 
                 {
-                    "phv_number": 5, 
-                    "records": [
-                        {
-                            "word_bit_width": 32, 
-                            "position_offset": 66, 
-                            "phv_lsb": 16, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 31, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_srcPort", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }, 
-                        {
-                            "word_bit_width": 32, 
-                            "position_offset": 55, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_dstPort", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
                     "phv_number": 64, 
                     "records": [
                         {
@@ -15354,6 +15204,35 @@
                     "records": [
                         {
                             "word_bit_width": 8, 
+                            "position_offset": 38, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 7, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_srcPort", 
+                            "field_width": 2, 
+                            "field_lsb": 8
+                        }, 
+                        {
+                            "word_bit_width": 8, 
+                            "position_offset": 66, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 7, 
+                            "phv_msb": 7, 
+                            "is_compiler_generated": false, 
+                            "field_name": "udp_srcPort", 
+                            "field_width": 2, 
+                            "field_lsb": 0
+                        }
+                    ]
+                }, 
+                {
+                    "phv_number": 66, 
+                    "records": [
+                        {
+                            "word_bit_width": 8, 
                             "position_offset": 20, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
@@ -15367,7 +15246,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 66, 
+                    "phv_number": 67, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -15384,7 +15263,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 67, 
+                    "phv_number": 68, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -15439,7 +15318,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 68, 
+                    "phv_number": 69, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -15552,6 +15431,35 @@
                     "records": [
                         {
                             "word_bit_width": 16, 
+                            "position_offset": 38, 
+                            "phv_lsb": 8, 
+                            "is_pov": false, 
+                            "field_msb": 7, 
+                            "phv_msb": 15, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_srcPort", 
+                            "field_width": 2, 
+                            "field_lsb": 0
+                        }, 
+                        {
+                            "word_bit_width": 16, 
+                            "position_offset": 33, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 7, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_dstPort", 
+                            "field_width": 2, 
+                            "field_lsb": 8
+                        }
+                    ]
+                }, 
+                {
+                    "phv_number": 133, 
+                    "records": [
+                        {
+                            "word_bit_width": 16, 
                             "position_offset": 20, 
                             "phv_lsb": 8, 
                             "is_pov": false, 
@@ -15577,7 +15485,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 133, 
+                    "phv_number": 134, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -15594,7 +15502,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 134, 
+                    "phv_number": 135, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -15611,7 +15519,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 135, 
+                    "phv_number": 136, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -15742,6 +15650,30 @@
                             "field_name": "tcp_window", 
                             "field_width": 2, 
                             "field_lsb": 0
+                        }, 
+                        {
+                            "word_bit_width": 32, 
+                            "position_offset": 17, 
+                            "phv_lsb": 16, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 31, 
+                            "is_compiler_generated": false, 
+                            "field_name": "udp_length_", 
+                            "field_width": 2, 
+                            "field_lsb": 0
+                        }, 
+                        {
+                            "word_bit_width": 32, 
+                            "position_offset": 68, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 15, 
+                            "is_compiler_generated": false, 
+                            "field_name": "udp_checksum", 
+                            "field_width": 2, 
+                            "field_lsb": 0
                         }
                     ]
                 }, 
@@ -15808,94 +15740,31 @@
                     "records": [
                         {
                             "word_bit_width": 8, 
-                            "position_offset": 38, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 7, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_srcPort", 
-                            "field_width": 2, 
-                            "field_lsb": 8
-                        }, 
-                        {
-                            "word_bit_width": 8, 
-                            "position_offset": 17, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 7, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_length_", 
-                            "field_width": 2, 
-                            "field_lsb": 8
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 290, 
-                    "records": [
-                        {
-                            "word_bit_width": 8, 
-                            "position_offset": 38, 
+                            "position_offset": 76, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 7, 
                             "phv_msb": 7, 
                             "is_compiler_generated": false, 
-                            "field_name": "tcp_srcPort", 
-                            "field_width": 2, 
+                            "field_name": "tcp_seqNo", 
+                            "field_width": 4, 
                             "field_lsb": 0
                         }, 
                         {
                             "word_bit_width": 8, 
-                            "position_offset": 17, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 7, 
-                            "phv_msb": 7, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_length_", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 291, 
-                    "records": [
-                        {
-                            "word_bit_width": 8, 
-                            "position_offset": 33, 
+                            "position_offset": 66, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 15, 
                             "phv_msb": 7, 
                             "is_compiler_generated": false, 
-                            "field_name": "tcp_dstPort", 
+                            "field_name": "udp_srcPort", 
                             "field_width": 2, 
                             "field_lsb": 8
                         }
                     ]
                 }, 
                 {
-                    "phv_number": 292, 
-                    "records": [
-                        {
-                            "word_bit_width": 8, 
-                            "position_offset": 33, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 7, 
-                            "phv_msb": 7, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_dstPort", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
                     "phv_number": 320, 
                     "records": [
                         {
@@ -15958,52 +15827,6 @@
                     "records": [
                         {
                             "word_bit_width": 16, 
-                            "position_offset": 76, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 31, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_seqNo", 
-                            "field_width": 4, 
-                            "field_lsb": 16
-                        }, 
-                        {
-                            "word_bit_width": 16, 
-                            "position_offset": 68, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_checksum", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 323, 
-                    "records": [
-                        {
-                            "word_bit_width": 16, 
-                            "position_offset": 76, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_seqNo", 
-                            "field_width": 4, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 324, 
-                    "records": [
-                        {
-                            "word_bit_width": 16, 
                             "position_offset": 26, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
@@ -16013,11 +15836,23 @@
                             "field_name": "tcp_ackNo", 
                             "field_width": 4, 
                             "field_lsb": 16
+                        }, 
+                        {
+                            "word_bit_width": 16, 
+                            "position_offset": 55, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 15, 
+                            "is_compiler_generated": false, 
+                            "field_name": "udp_dstPort", 
+                            "field_width": 2, 
+                            "field_lsb": 0
                         }
                     ]
                 }, 
                 {
-                    "phv_number": 325, 
+                    "phv_number": 323, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -16125,7 +15960,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 264, 
+                    "phv_number": 260, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -16166,7 +16001,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 265, 
+                    "phv_number": 261, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -16183,7 +16018,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 266, 
+                    "phv_number": 262, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -16200,7 +16035,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 267, 
+                    "phv_number": 263, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -16241,7 +16076,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 268, 
+                    "phv_number": 264, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -16306,7 +16141,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 269, 
+                    "phv_number": 265, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -16335,7 +16170,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 270, 
+                    "phv_number": 266, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -16352,7 +16187,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 271, 
+                    "phv_number": 267, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -16369,7 +16204,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 296, 
+                    "phv_number": 292, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -16398,7 +16233,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 297, 
+                    "phv_number": 293, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -16415,7 +16250,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 298, 
+                    "phv_number": 294, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -16444,7 +16279,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 299, 
+                    "phv_number": 295, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -16473,7 +16308,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 300, 
+                    "phv_number": 296, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -16490,7 +16325,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 301, 
+                    "phv_number": 297, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -16507,7 +16342,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 332, 
+                    "phv_number": 326, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -16524,7 +16359,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 333, 
+                    "phv_number": 327, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -16541,7 +16376,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 334, 
+                    "phv_number": 328, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -16570,7 +16405,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 335, 
+                    "phv_number": 329, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -16583,23 +16418,6 @@
                             "field_name": "tcp_dstPort", 
                             "field_width": 2, 
                             "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 336, 
-                    "records": [
-                        {
-                            "word_bit_width": 16, 
-                            "position_offset": 69, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 31, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_seqNo", 
-                            "field_width": 4, 
-                            "field_lsb": 16
                         }, 
                         {
                             "word_bit_width": 16, 
@@ -16616,7 +16434,24 @@
                     ]
                 }, 
                 {
-                    "phv_number": 337, 
+                    "phv_number": 330, 
+                    "records": [
+                        {
+                            "word_bit_width": 16, 
+                            "position_offset": 69, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 31, 
+                            "phv_msb": 15, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_seqNo", 
+                            "field_width": 4, 
+                            "field_lsb": 16
+                        }
+                    ]
+                }, 
+                {
+                    "phv_number": 331, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -16633,7 +16468,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 338, 
+                    "phv_number": 332, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -16662,7 +16497,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 339, 
+                    "phv_number": 333, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -16679,7 +16514,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 340, 
+                    "phv_number": 334, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -16793,6 +16628,35 @@
                     "records": [
                         {
                             "word_bit_width": 32, 
+                            "position_offset": 33, 
+                            "phv_lsb": 24, 
+                            "is_pov": false, 
+                            "field_msb": 7, 
+                            "phv_msb": 31, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_dstPort", 
+                            "field_width": 2, 
+                            "field_lsb": 0
+                        }, 
+                        {
+                            "word_bit_width": 32, 
+                            "position_offset": 76, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 31, 
+                            "phv_msb": 23, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_seqNo", 
+                            "field_width": 4, 
+                            "field_lsb": 8
+                        }
+                    ]
+                }, 
+                {
+                    "phv_number": 4, 
+                    "records": [
+                        {
+                            "word_bit_width": 32, 
                             "position_offset": 20, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
@@ -16806,7 +16670,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 4, 
+                    "phv_number": 5, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -16823,35 +16687,6 @@
                     ]
                 }, 
                 {
-                    "phv_number": 5, 
-                    "records": [
-                        {
-                            "word_bit_width": 32, 
-                            "position_offset": 66, 
-                            "phv_lsb": 16, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 31, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_srcPort", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }, 
-                        {
-                            "word_bit_width": 32, 
-                            "position_offset": 55, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_dstPort", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
                     "phv_number": 64, 
                     "records": [
                         {
@@ -16873,6 +16708,35 @@
                     "records": [
                         {
                             "word_bit_width": 8, 
+                            "position_offset": 38, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 7, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_srcPort", 
+                            "field_width": 2, 
+                            "field_lsb": 8
+                        }, 
+                        {
+                            "word_bit_width": 8, 
+                            "position_offset": 66, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 7, 
+                            "phv_msb": 7, 
+                            "is_compiler_generated": false, 
+                            "field_name": "udp_srcPort", 
+                            "field_width": 2, 
+                            "field_lsb": 0
+                        }
+                    ]
+                }, 
+                {
+                    "phv_number": 66, 
+                    "records": [
+                        {
+                            "word_bit_width": 8, 
                             "position_offset": 20, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
@@ -16886,7 +16750,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 66, 
+                    "phv_number": 67, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -16903,7 +16767,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 67, 
+                    "phv_number": 68, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -16958,7 +16822,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 68, 
+                    "phv_number": 69, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -17071,6 +16935,35 @@
                     "records": [
                         {
                             "word_bit_width": 16, 
+                            "position_offset": 38, 
+                            "phv_lsb": 8, 
+                            "is_pov": false, 
+                            "field_msb": 7, 
+                            "phv_msb": 15, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_srcPort", 
+                            "field_width": 2, 
+                            "field_lsb": 0
+                        }, 
+                        {
+                            "word_bit_width": 16, 
+                            "position_offset": 33, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 7, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_dstPort", 
+                            "field_width": 2, 
+                            "field_lsb": 8
+                        }
+                    ]
+                }, 
+                {
+                    "phv_number": 133, 
+                    "records": [
+                        {
+                            "word_bit_width": 16, 
                             "position_offset": 20, 
                             "phv_lsb": 8, 
                             "is_pov": false, 
@@ -17096,7 +16989,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 133, 
+                    "phv_number": 134, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -17113,7 +17006,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 134, 
+                    "phv_number": 135, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -17130,7 +17023,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 135, 
+                    "phv_number": 136, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -17261,6 +17154,30 @@
                             "field_name": "tcp_window", 
                             "field_width": 2, 
                             "field_lsb": 0
+                        }, 
+                        {
+                            "word_bit_width": 32, 
+                            "position_offset": 17, 
+                            "phv_lsb": 16, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 31, 
+                            "is_compiler_generated": false, 
+                            "field_name": "udp_length_", 
+                            "field_width": 2, 
+                            "field_lsb": 0
+                        }, 
+                        {
+                            "word_bit_width": 32, 
+                            "position_offset": 68, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 15, 
+                            "is_compiler_generated": false, 
+                            "field_name": "udp_checksum", 
+                            "field_width": 2, 
+                            "field_lsb": 0
                         }
                     ]
                 }, 
@@ -17327,94 +17244,31 @@
                     "records": [
                         {
                             "word_bit_width": 8, 
-                            "position_offset": 38, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 7, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_srcPort", 
-                            "field_width": 2, 
-                            "field_lsb": 8
-                        }, 
-                        {
-                            "word_bit_width": 8, 
-                            "position_offset": 17, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 7, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_length_", 
-                            "field_width": 2, 
-                            "field_lsb": 8
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 290, 
-                    "records": [
-                        {
-                            "word_bit_width": 8, 
-                            "position_offset": 38, 
+                            "position_offset": 76, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 7, 
                             "phv_msb": 7, 
                             "is_compiler_generated": false, 
-                            "field_name": "tcp_srcPort", 
-                            "field_width": 2, 
+                            "field_name": "tcp_seqNo", 
+                            "field_width": 4, 
                             "field_lsb": 0
                         }, 
                         {
                             "word_bit_width": 8, 
-                            "position_offset": 17, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 7, 
-                            "phv_msb": 7, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_length_", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 291, 
-                    "records": [
-                        {
-                            "word_bit_width": 8, 
-                            "position_offset": 33, 
+                            "position_offset": 66, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 15, 
                             "phv_msb": 7, 
                             "is_compiler_generated": false, 
-                            "field_name": "tcp_dstPort", 
+                            "field_name": "udp_srcPort", 
                             "field_width": 2, 
                             "field_lsb": 8
                         }
                     ]
                 }, 
                 {
-                    "phv_number": 292, 
-                    "records": [
-                        {
-                            "word_bit_width": 8, 
-                            "position_offset": 33, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 7, 
-                            "phv_msb": 7, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_dstPort", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
                     "phv_number": 320, 
                     "records": [
                         {
@@ -17477,52 +17331,6 @@
                     "records": [
                         {
                             "word_bit_width": 16, 
-                            "position_offset": 76, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 31, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_seqNo", 
-                            "field_width": 4, 
-                            "field_lsb": 16
-                        }, 
-                        {
-                            "word_bit_width": 16, 
-                            "position_offset": 68, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_checksum", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 323, 
-                    "records": [
-                        {
-                            "word_bit_width": 16, 
-                            "position_offset": 76, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_seqNo", 
-                            "field_width": 4, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 324, 
-                    "records": [
-                        {
-                            "word_bit_width": 16, 
                             "position_offset": 26, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
@@ -17532,11 +17340,23 @@
                             "field_name": "tcp_ackNo", 
                             "field_width": 4, 
                             "field_lsb": 16
+                        }, 
+                        {
+                            "word_bit_width": 16, 
+                            "position_offset": 55, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 15, 
+                            "is_compiler_generated": false, 
+                            "field_name": "udp_dstPort", 
+                            "field_width": 2, 
+                            "field_lsb": 0
                         }
                     ]
                 }, 
                 {
-                    "phv_number": 325, 
+                    "phv_number": 323, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -17644,7 +17464,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 264, 
+                    "phv_number": 260, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -17685,7 +17505,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 265, 
+                    "phv_number": 261, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -17702,7 +17522,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 266, 
+                    "phv_number": 262, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -17719,7 +17539,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 267, 
+                    "phv_number": 263, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -17760,7 +17580,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 268, 
+                    "phv_number": 264, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -17825,7 +17645,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 269, 
+                    "phv_number": 265, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -17854,7 +17674,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 270, 
+                    "phv_number": 266, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -17871,7 +17691,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 271, 
+                    "phv_number": 267, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -17888,7 +17708,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 296, 
+                    "phv_number": 292, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -17917,7 +17737,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 297, 
+                    "phv_number": 293, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -17934,7 +17754,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 298, 
+                    "phv_number": 294, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -17963,7 +17783,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 299, 
+                    "phv_number": 295, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -17992,7 +17812,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 300, 
+                    "phv_number": 296, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -18009,7 +17829,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 301, 
+                    "phv_number": 297, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -18026,7 +17846,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 332, 
+                    "phv_number": 326, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -18043,7 +17863,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 333, 
+                    "phv_number": 327, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -18060,7 +17880,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 334, 
+                    "phv_number": 328, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -18089,7 +17909,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 335, 
+                    "phv_number": 329, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -18102,23 +17922,6 @@
                             "field_name": "tcp_dstPort", 
                             "field_width": 2, 
                             "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 336, 
-                    "records": [
-                        {
-                            "word_bit_width": 16, 
-                            "position_offset": 69, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 31, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_seqNo", 
-                            "field_width": 4, 
-                            "field_lsb": 16
                         }, 
                         {
                             "word_bit_width": 16, 
@@ -18135,7 +17938,24 @@
                     ]
                 }, 
                 {
-                    "phv_number": 337, 
+                    "phv_number": 330, 
+                    "records": [
+                        {
+                            "word_bit_width": 16, 
+                            "position_offset": 69, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 31, 
+                            "phv_msb": 15, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_seqNo", 
+                            "field_width": 4, 
+                            "field_lsb": 16
+                        }
+                    ]
+                }, 
+                {
+                    "phv_number": 331, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -18152,7 +17972,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 338, 
+                    "phv_number": 332, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -18181,7 +18001,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 339, 
+                    "phv_number": 333, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -18198,7 +18018,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 340, 
+                    "phv_number": 334, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -18273,12 +18093,13 @@
             "actions": [
                 {
                     "p4_parameters": [], 
+                    "disallowed_as_default_action_reason": "USES_HASH_DIST", 
                     "handle": 536870914, 
                     "name": "count_ingress", 
                     "indirect_resources": [], 
                     "override_stat_full_addr": 0, 
                     "override_meter_addr_pfe": false, 
-                    "allowed_as_default_action": true, 
+                    "allowed_as_default_action": false, 
                     "override_stat_addr_pfe": true, 
                     "override_stateful_addr_pfe": false, 
                     "override_meter_full_addr": 0, 
@@ -18308,12 +18129,13 @@
             "actions": [
                 {
                     "p4_parameters": [], 
+                    "disallowed_as_default_action_reason": "USES_HASH_DIST", 
                     "handle": 536870914, 
                     "name": "count_ingress", 
                     "indirect_resources": [], 
                     "override_stat_full_addr": 0, 
                     "override_meter_addr_pfe": false, 
-                    "allowed_as_default_action": true, 
+                    "allowed_as_default_action": false, 
                     "override_stat_addr_pfe": true, 
                     "override_stateful_addr_pfe": false, 
                     "override_meter_full_addr": 0, 
@@ -18346,18 +18168,24 @@
                         "pack_format": [
                             {
                                 "memory_word_width": 0, 
-                                "entries_per_table_word": 1, 
+                                "entries_per_table_word": 0, 
                                 "table_word_width": 0, 
                                 "number_memory_units_per_table_word": 0
                             }
                         ], 
+                        "hash_functions": [
+                            {
+                                "hash_function_number": 0, 
+                                "hash_bits": []
+                            }
+                        ], 
                         "result_physical_buses": [
                             1
                         ], 
                         "logical_table_id": 0, 
                         "stage_number": 2, 
                         "stage_table_type": "match_with_no_key", 
-                        "size": 1
+                        "size": 1024
                     }
                 ], 
                 "match_type": "match_with_no_key"
@@ -18410,12 +18238,13 @@
             "actions": [
                 {
                     "p4_parameters": [], 
+                    "disallowed_as_default_action_reason": "USES_HASH_DIST", 
                     "handle": 536870916, 
                     "name": "count_egress", 
                     "indirect_resources": [], 
                     "override_stat_full_addr": 0, 
                     "override_meter_addr_pfe": false, 
-                    "allowed_as_default_action": true, 
+                    "allowed_as_default_action": false, 
                     "override_stat_addr_pfe": true, 
                     "override_stateful_addr_pfe": false, 
                     "override_meter_full_addr": 0, 
@@ -18445,12 +18274,13 @@
             "actions": [
                 {
                     "p4_parameters": [], 
+                    "disallowed_as_default_action_reason": "USES_HASH_DIST", 
                     "handle": 536870916, 
                     "name": "count_egress", 
                     "indirect_resources": [], 
                     "override_stat_full_addr": 0, 
                     "override_meter_addr_pfe": false, 
-                    "allowed_as_default_action": true, 
+                    "allowed_as_default_action": false, 
                     "override_stat_addr_pfe": true, 
                     "override_stateful_addr_pfe": false, 
                     "override_meter_full_addr": 0, 
@@ -18483,18 +18313,24 @@
                         "pack_format": [
                             {
                                 "memory_word_width": 0, 
-                                "entries_per_table_word": 1, 
+                                "entries_per_table_word": 0, 
                                 "table_word_width": 0, 
                                 "number_memory_units_per_table_word": 0
                             }
                         ], 
+                        "hash_functions": [
+                            {
+                                "hash_function_number": 0, 
+                                "hash_bits": []
+                            }
+                        ], 
                         "result_physical_buses": [
                             0
                         ], 
                         "logical_table_id": 1, 
                         "stage_number": 2, 
                         "stage_table_type": "match_with_no_key", 
-                        "size": 1
+                        "size": 1024
                     }
                 ], 
                 "match_type": "match_with_no_key"
@@ -23238,7 +23074,7 @@
             "packet_counter_resolution": 32, 
             "pfe_bit_position": 19, 
             "how_referenced": "indirect", 
-            "size": 510
+            "size": 512
         }, 
         {
             "direction": "ingress", 
@@ -23281,7 +23117,7 @@
             "packet_counter_resolution": 32, 
             "pfe_bit_position": 19, 
             "how_referenced": "indirect", 
-            "size": 510
+            "size": 512
         }, 
         {
             "direction": "ingress", 
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/context/mau.context.json b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/context/mau.context.json
index 91ad565..f4b8f76 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/context/mau.context.json
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/context/mau.context.json
@@ -1,13 +1,74 @@
 {
   "ProgramInfo": {
     "ProgramName": "ecmp", 
-    "BuildDate": "Tue Sep 12 11:16:12 2017", 
+    "BuildDate": "Wed Sep 13 00:59:57 2017", 
     "CompilerVersion": "5.1.0"
   }, 
   "HashJsonNode": {
-    "TableCount": 1, 
+    "TableCount": 3, 
     "ProxyTables": {}, 
     "AllTables": {
+      "ingress_port_count_table": {
+        "2": [
+          {
+            "0": [
+              {}, 
+              {
+                "seed": 0
+              }
+            ], 
+            "1": [
+              {}, 
+              {
+                "seed": 0
+              }
+            ], 
+            "2": [
+              {}, 
+              {
+                "seed": 0
+              }
+            ], 
+            "3": [
+              {}, 
+              {
+                "seed": 0
+              }
+            ], 
+            "4": [
+              {}, 
+              {
+                "seed": 0
+              }
+            ], 
+            "5": [
+              {}, 
+              {
+                "seed": 0
+              }
+            ], 
+            "6": [
+              {}, 
+              {
+                "seed": 0
+              }
+            ], 
+            "7": [
+              {}, 
+              {
+                "seed": 0
+              }
+            ], 
+            "8": [
+              {}, 
+              {
+                "seed": 0
+              }
+            ]
+          }
+        ], 
+        "Handle": 16777217
+      }, 
       "ecmp_group_table": {
         "1": [
           {
@@ -1939,9 +2000,70 @@
           }
         ], 
         "Handle": 16777221
+      }, 
+      "egress_port_count_table": {
+        "2": [
+          {
+            "0": [
+              {}, 
+              {
+                "seed": 0
+              }
+            ], 
+            "1": [
+              {}, 
+              {
+                "seed": 0
+              }
+            ], 
+            "2": [
+              {}, 
+              {
+                "seed": 0
+              }
+            ], 
+            "3": [
+              {}, 
+              {
+                "seed": 0
+              }
+            ], 
+            "4": [
+              {}, 
+              {
+                "seed": 0
+              }
+            ], 
+            "5": [
+              {}, 
+              {
+                "seed": 0
+              }
+            ], 
+            "6": [
+              {}, 
+              {
+                "seed": 0
+              }
+            ], 
+            "7": [
+              {}, 
+              {
+                "seed": 0
+              }
+            ], 
+            "8": [
+              {}, 
+              {
+                "seed": 0
+              }
+            ]
+          }
+        ], 
+        "Handle": 16777218
       }
     }, 
-    "HashFieldCount": 1
+    "HashFieldCount": 3
   }, 
   "EntryFormatNode": {
     "ExmEntryFormat": {
@@ -4832,7 +4954,7 @@
       "PhvDetails": [
         {
           "TOTALPOVHEADERS": 13, 
-          "TOTALSTAGEPHVS": 59, 
+          "TOTALSTAGEPHVS": 56, 
           "TOTALPHVRECORDS": 95, 
           "Phvs": [
             {
@@ -4912,6 +5034,31 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 31, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_dstPort", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 24, 
+                      "POSITIONOFFSET": 33
+                    }, 
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 23, 
+                      "FIELDMSB": 31, 
+                      "PHVNAME": "tcp_seqNo", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 76
+                    }
+                  ], 
+                  "PHVNUMBER": 3
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 8, 
                       "PHVMSB": 31, 
@@ -4922,7 +5069,7 @@
                       "POSITIONOFFSET": 20
                     }
                   ], 
-                  "PHVNUMBER": 3
+                  "PHVNUMBER": 4
                 }, 
                 {
                   "PHVRECORD": [
@@ -4937,31 +5084,6 @@
                       "POSITIONOFFSET": 70
                     }
                   ], 
-                  "PHVNUMBER": 4
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 31, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_srcPort", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 16, 
-                      "POSITIONOFFSET": 66
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_dstPort", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 55
-                    }
-                  ], 
                   "PHVNUMBER": 5
                 }, 
                 {
@@ -4971,10 +5093,10 @@
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "ecmp_metadata_group_id", 
+                      "PHVNAME": "ethernet_etherType", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 36
+                      "POSITIONOFFSET": 5
                     }
                   ], 
                   "PHVNUMBER": 134
@@ -5007,17 +5129,17 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 16, 
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
                       "PHVMSB": 15, 
-                      "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_ackNo", 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "ecmp_metadata_selector", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 26
+                      "POSITIONOFFSET": 61
                     }
                   ], 
-                  "PHVNUMBER": 324
+                  "PHVNUMBER": 136
                 }, 
                 {
                   "PHVRECORD": [
@@ -5147,6 +5269,31 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_srcPort", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 8, 
+                      "POSITIONOFFSET": 38
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_dstPort", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 33
+                    }
+                  ], 
+                  "PHVNUMBER": 132
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
@@ -5167,21 +5314,6 @@
                       "POSITIONOFFSET": 70
                     }
                   ], 
-                  "PHVNUMBER": 132
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "ethernet_etherType", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 5
-                    }
-                  ], 
                   "PHVNUMBER": 133
                 }, 
                 {
@@ -5212,24 +5344,24 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 8, 
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 0, 
                       "PHVMSB": 7, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_srcPort", 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_seqNo", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
+                      "POSITIONOFFSET": 76
                     }, 
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 8, 
                       "PHVMSB": 7, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "udp_length_", 
+                      "PHVNAME": "udp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 17
+                      "POSITIONOFFSET": 66
                     }
                   ], 
                   "PHVNUMBER": 289
@@ -5239,67 +5371,12 @@
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 0, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "tcp_srcPort", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "udp_length_", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 17
-                    }
-                  ], 
-                  "PHVNUMBER": 290
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 8, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_dstPort", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 33
-                    }
-                  ], 
-                  "PHVNUMBER": 291
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "tcp_dstPort", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 33
-                    }
-                  ], 
-                  "PHVNUMBER": 292
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "ecmp_metadata_selector", 
+                      "PHVNAME": "ecmp_metadata_group_id", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 61
+                      "POSITIONOFFSET": 36
                     }
                   ], 
                   "PHVNUMBER": 135
@@ -5355,6 +5432,26 @@
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
                       "POSITIONOFFSET": 46
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 31, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_length_", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 16, 
+                      "POSITIONOFFSET": 17
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_checksum", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 68
                     }
                   ], 
                   "PHVNUMBER": 257
@@ -5402,6 +5499,31 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_srcPort", 
+                      "CONTAINERWIDTH": 8, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 38
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "udp_srcPort", 
+                      "CONTAINERWIDTH": 8, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 66
+                    }
+                  ], 
+                  "PHVNUMBER": 65
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 40, 
                       "PHVMSB": 7, 
@@ -5412,7 +5534,7 @@
                       "POSITIONOFFSET": 20
                     }
                   ], 
-                  "PHVNUMBER": 65
+                  "PHVNUMBER": 66
                 }, 
                 {
                   "PHVRECORD": [
@@ -5427,7 +5549,7 @@
                       "POSITIONOFFSET": 70
                     }
                   ], 
-                  "PHVNUMBER": 66
+                  "PHVNUMBER": 67
                 }, 
                 {
                   "PHVRECORD": [
@@ -5478,7 +5600,7 @@
                       ]
                     }
                   ], 
-                  "PHVNUMBER": 67
+                  "PHVNUMBER": 68
                 }, 
                 {
                   "PHVRECORD": [
@@ -5493,22 +5615,7 @@
                       "POSITIONOFFSET": 51
                     }
                   ], 
-                  "PHVNUMBER": 68
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_ackNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 26
-                    }
-                  ], 
-                  "PHVNUMBER": 325
+                  "PHVNUMBER": 69
                 }, 
                 {
                   "PHVRECORD": [
@@ -5542,20 +5649,20 @@
                       "FIELDLSB": 16, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_seqNo", 
+                      "PHVNAME": "tcp_ackNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 76
+                      "POSITIONOFFSET": 26
                     }, 
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "udp_checksum", 
+                      "PHVNAME": "udp_dstPort", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 68
+                      "POSITIONOFFSET": 55
                     }
                   ], 
                   "PHVNUMBER": 322
@@ -5567,16 +5674,16 @@
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_seqNo", 
+                      "PHVNAME": "tcp_ackNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 76
+                      "POSITIONOFFSET": 26
                     }
                   ], 
                   "PHVNUMBER": 323
                 }
               ], 
-              "TOTALINGRESSPHVS": 33
+              "TOTALINGRESSPHVS": 30
             }, 
             {
               "PHVDIRECTION": 1, 
@@ -5614,7 +5721,7 @@
                       "POSITIONOFFSET": 9
                     }
                   ], 
-                  "PHVNUMBER": 264
+                  "PHVNUMBER": 260
                 }, 
                 {
                   "PHVRECORD": [
@@ -5629,7 +5736,7 @@
                       "POSITIONOFFSET": 12
                     }
                   ], 
-                  "PHVNUMBER": 265
+                  "PHVNUMBER": 261
                 }, 
                 {
                   "PHVRECORD": [
@@ -5644,7 +5751,7 @@
                       "POSITIONOFFSET": 50
                     }
                   ], 
-                  "PHVNUMBER": 266
+                  "PHVNUMBER": 262
                 }, 
                 {
                   "PHVRECORD": [
@@ -5679,7 +5786,7 @@
                       "POSITIONOFFSET": 59
                     }
                   ], 
-                  "PHVNUMBER": 267
+                  "PHVNUMBER": 263
                 }, 
                 {
                   "PHVRECORD": [
@@ -5734,7 +5841,7 @@
                       "POSITIONOFFSET": 41
                     }
                   ], 
-                  "PHVNUMBER": 268
+                  "PHVNUMBER": 264
                 }, 
                 {
                   "PHVRECORD": [
@@ -5759,7 +5866,7 @@
                       "POSITIONOFFSET": 45
                     }
                   ], 
-                  "PHVNUMBER": 269
+                  "PHVNUMBER": 265
                 }, 
                 {
                   "PHVRECORD": [
@@ -5774,7 +5881,7 @@
                       "POSITIONOFFSET": 19
                     }
                   ], 
-                  "PHVNUMBER": 270
+                  "PHVNUMBER": 266
                 }, 
                 {
                   "PHVRECORD": [
@@ -5789,7 +5896,7 @@
                       "POSITIONOFFSET": 63
                     }
                   ], 
-                  "PHVNUMBER": 271
+                  "PHVNUMBER": 267
                 }, 
                 {
                   "PHVRECORD": [
@@ -5829,7 +5936,7 @@
                       "POSITIONOFFSET": 37
                     }
                   ], 
-                  "PHVNUMBER": 296
+                  "PHVNUMBER": 292
                 }, 
                 {
                   "PHVRECORD": [
@@ -5844,7 +5951,7 @@
                       "POSITIONOFFSET": 4
                     }
                   ], 
-                  "PHVNUMBER": 297
+                  "PHVNUMBER": 293
                 }, 
                 {
                   "PHVRECORD": [
@@ -5869,7 +5976,7 @@
                       "POSITIONOFFSET": 56
                     }
                   ], 
-                  "PHVNUMBER": 298
+                  "PHVNUMBER": 294
                 }, 
                 {
                   "PHVRECORD": [
@@ -5894,7 +6001,7 @@
                       "POSITIONOFFSET": 56
                     }
                   ], 
-                  "PHVNUMBER": 299
+                  "PHVNUMBER": 295
                 }, 
                 {
                   "PHVRECORD": [
@@ -5909,7 +6016,7 @@
                       "POSITIONOFFSET": 19
                     }
                   ], 
-                  "PHVNUMBER": 300
+                  "PHVNUMBER": 296
                 }, 
                 {
                   "PHVRECORD": [
@@ -5924,7 +6031,7 @@
                       "POSITIONOFFSET": 63
                     }
                   ], 
-                  "PHVNUMBER": 301
+                  "PHVNUMBER": 297
                 }, 
                 {
                   "PHVRECORD": [
@@ -5939,7 +6046,7 @@
                       "POSITIONOFFSET": 54
                     }
                   ], 
-                  "PHVNUMBER": 332
+                  "PHVNUMBER": 326
                 }, 
                 {
                   "PHVRECORD": [
@@ -5954,7 +6061,7 @@
                       "POSITIONOFFSET": 43
                     }
                   ], 
-                  "PHVNUMBER": 333
+                  "PHVNUMBER": 327
                 }, 
                 {
                   "PHVRECORD": [
@@ -5979,7 +6086,7 @@
                       "POSITIONOFFSET": 5
                     }
                   ], 
-                  "PHVNUMBER": 334
+                  "PHVNUMBER": 328
                 }, 
                 {
                   "PHVRECORD": [
@@ -5992,9 +6099,114 @@
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
                       "POSITIONOFFSET": 32
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_dstPort", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 48
                     }
                   ], 
-                  "PHVNUMBER": 335
+                  "PHVNUMBER": 329
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 16, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 31, 
+                      "PHVNAME": "tcp_seqNo", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 69
+                    }
+                  ], 
+                  "PHVNUMBER": 330
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_seqNo", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 69
+                    }
+                  ], 
+                  "PHVNUMBER": 331
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 6, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "ethernet_dstAddr", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 8, 
+                      "POSITIONOFFSET": 19
+                    }, 
+                    {
+                      "FIELDWIDTH": 6, 
+                      "FIELDLSB": 40, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 47, 
+                      "PHVNAME": "ethernet_srcAddr", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 63
+                    }
+                  ], 
+                  "PHVNUMBER": 332
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "ethernet_etherType", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 39
+                    }
+                  ], 
+                  "PHVNUMBER": 333
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 8, 
+                      "PHVNAME": "packet_out_hdr_egress_port", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 7, 
+                      "POSITIONOFFSET": 0
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 8, 
+                      "PHVNAME": "packet_in_hdr_ingress_port", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 7, 
+                      "POSITIONOFFSET": 30
+                    }
+                  ], 
+                  "PHVNUMBER": 334
                 }, 
                 {
                   "PHVRECORD": [
@@ -6061,111 +6273,6 @@
                     }
                   ], 
                   "PHVNUMBER": 81
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 6, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "ethernet_dstAddr", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 8, 
-                      "POSITIONOFFSET": 19
-                    }, 
-                    {
-                      "FIELDWIDTH": 6, 
-                      "FIELDLSB": 40, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 47, 
-                      "PHVNAME": "ethernet_srcAddr", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 63
-                    }
-                  ], 
-                  "PHVNUMBER": 338
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "ethernet_etherType", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 39
-                    }
-                  ], 
-                  "PHVNUMBER": 339
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 8, 
-                      "PHVNAME": "packet_out_hdr_egress_port", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 7, 
-                      "POSITIONOFFSET": 0
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 8, 
-                      "PHVNAME": "packet_in_hdr_ingress_port", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 7, 
-                      "POSITIONOFFSET": 30
-                    }
-                  ], 
-                  "PHVNUMBER": 340
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 16, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_seqNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 69
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_dstPort", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 48
-                    }
-                  ], 
-                  "PHVNUMBER": 336
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_seqNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 69
-                    }
-                  ], 
-                  "PHVNUMBER": 337
                 }
               ], 
               "TOTALEGRESSPHVS": 26
@@ -6175,7 +6282,7 @@
         }, 
         {
           "TOTALPOVHEADERS": 13, 
-          "TOTALSTAGEPHVS": 59, 
+          "TOTALSTAGEPHVS": 56, 
           "TOTALPHVRECORDS": 95, 
           "Phvs": [
             {
@@ -6255,6 +6362,31 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 31, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_dstPort", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 24, 
+                      "POSITIONOFFSET": 33
+                    }, 
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 23, 
+                      "FIELDMSB": 31, 
+                      "PHVNAME": "tcp_seqNo", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 76
+                    }
+                  ], 
+                  "PHVNUMBER": 3
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 8, 
                       "PHVMSB": 31, 
@@ -6265,7 +6397,7 @@
                       "POSITIONOFFSET": 20
                     }
                   ], 
-                  "PHVNUMBER": 3
+                  "PHVNUMBER": 4
                 }, 
                 {
                   "PHVRECORD": [
@@ -6280,31 +6412,6 @@
                       "POSITIONOFFSET": 70
                     }
                   ], 
-                  "PHVNUMBER": 4
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 31, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_srcPort", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 16, 
-                      "POSITIONOFFSET": 66
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_dstPort", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 55
-                    }
-                  ], 
                   "PHVNUMBER": 5
                 }, 
                 {
@@ -6314,10 +6421,10 @@
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "ecmp_metadata_group_id", 
+                      "PHVNAME": "ethernet_etherType", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 36
+                      "POSITIONOFFSET": 5
                     }
                   ], 
                   "PHVNUMBER": 134
@@ -6350,17 +6457,17 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 16, 
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
                       "PHVMSB": 15, 
-                      "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_ackNo", 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "ecmp_metadata_selector", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 26
+                      "POSITIONOFFSET": 61
                     }
                   ], 
-                  "PHVNUMBER": 324
+                  "PHVNUMBER": 136
                 }, 
                 {
                   "PHVRECORD": [
@@ -6490,6 +6597,31 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_srcPort", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 8, 
+                      "POSITIONOFFSET": 38
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_dstPort", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 33
+                    }
+                  ], 
+                  "PHVNUMBER": 132
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
@@ -6510,21 +6642,6 @@
                       "POSITIONOFFSET": 70
                     }
                   ], 
-                  "PHVNUMBER": 132
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "ethernet_etherType", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 5
-                    }
-                  ], 
                   "PHVNUMBER": 133
                 }, 
                 {
@@ -6555,24 +6672,24 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 8, 
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 0, 
                       "PHVMSB": 7, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_srcPort", 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_seqNo", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
+                      "POSITIONOFFSET": 76
                     }, 
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 8, 
                       "PHVMSB": 7, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "udp_length_", 
+                      "PHVNAME": "udp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 17
+                      "POSITIONOFFSET": 66
                     }
                   ], 
                   "PHVNUMBER": 289
@@ -6582,67 +6699,12 @@
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 0, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "tcp_srcPort", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "udp_length_", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 17
-                    }
-                  ], 
-                  "PHVNUMBER": 290
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 8, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_dstPort", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 33
-                    }
-                  ], 
-                  "PHVNUMBER": 291
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "tcp_dstPort", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 33
-                    }
-                  ], 
-                  "PHVNUMBER": 292
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "ecmp_metadata_selector", 
+                      "PHVNAME": "ecmp_metadata_group_id", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 61
+                      "POSITIONOFFSET": 36
                     }
                   ], 
                   "PHVNUMBER": 135
@@ -6698,6 +6760,26 @@
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
                       "POSITIONOFFSET": 46
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 31, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_length_", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 16, 
+                      "POSITIONOFFSET": 17
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_checksum", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 68
                     }
                   ], 
                   "PHVNUMBER": 257
@@ -6745,6 +6827,31 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_srcPort", 
+                      "CONTAINERWIDTH": 8, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 38
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "udp_srcPort", 
+                      "CONTAINERWIDTH": 8, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 66
+                    }
+                  ], 
+                  "PHVNUMBER": 65
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 40, 
                       "PHVMSB": 7, 
@@ -6755,7 +6862,7 @@
                       "POSITIONOFFSET": 20
                     }
                   ], 
-                  "PHVNUMBER": 65
+                  "PHVNUMBER": 66
                 }, 
                 {
                   "PHVRECORD": [
@@ -6770,7 +6877,7 @@
                       "POSITIONOFFSET": 70
                     }
                   ], 
-                  "PHVNUMBER": 66
+                  "PHVNUMBER": 67
                 }, 
                 {
                   "PHVRECORD": [
@@ -6821,7 +6928,7 @@
                       ]
                     }
                   ], 
-                  "PHVNUMBER": 67
+                  "PHVNUMBER": 68
                 }, 
                 {
                   "PHVRECORD": [
@@ -6836,22 +6943,7 @@
                       "POSITIONOFFSET": 51
                     }
                   ], 
-                  "PHVNUMBER": 68
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_ackNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 26
-                    }
-                  ], 
-                  "PHVNUMBER": 325
+                  "PHVNUMBER": 69
                 }, 
                 {
                   "PHVRECORD": [
@@ -6885,20 +6977,20 @@
                       "FIELDLSB": 16, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_seqNo", 
+                      "PHVNAME": "tcp_ackNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 76
+                      "POSITIONOFFSET": 26
                     }, 
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "udp_checksum", 
+                      "PHVNAME": "udp_dstPort", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 68
+                      "POSITIONOFFSET": 55
                     }
                   ], 
                   "PHVNUMBER": 322
@@ -6910,16 +7002,16 @@
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_seqNo", 
+                      "PHVNAME": "tcp_ackNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 76
+                      "POSITIONOFFSET": 26
                     }
                   ], 
                   "PHVNUMBER": 323
                 }
               ], 
-              "TOTALINGRESSPHVS": 33
+              "TOTALINGRESSPHVS": 30
             }, 
             {
               "PHVDIRECTION": 1, 
@@ -6957,7 +7049,7 @@
                       "POSITIONOFFSET": 9
                     }
                   ], 
-                  "PHVNUMBER": 264
+                  "PHVNUMBER": 260
                 }, 
                 {
                   "PHVRECORD": [
@@ -6972,7 +7064,7 @@
                       "POSITIONOFFSET": 12
                     }
                   ], 
-                  "PHVNUMBER": 265
+                  "PHVNUMBER": 261
                 }, 
                 {
                   "PHVRECORD": [
@@ -6987,7 +7079,7 @@
                       "POSITIONOFFSET": 50
                     }
                   ], 
-                  "PHVNUMBER": 266
+                  "PHVNUMBER": 262
                 }, 
                 {
                   "PHVRECORD": [
@@ -7022,7 +7114,7 @@
                       "POSITIONOFFSET": 59
                     }
                   ], 
-                  "PHVNUMBER": 267
+                  "PHVNUMBER": 263
                 }, 
                 {
                   "PHVRECORD": [
@@ -7077,7 +7169,7 @@
                       "POSITIONOFFSET": 41
                     }
                   ], 
-                  "PHVNUMBER": 268
+                  "PHVNUMBER": 264
                 }, 
                 {
                   "PHVRECORD": [
@@ -7102,7 +7194,7 @@
                       "POSITIONOFFSET": 45
                     }
                   ], 
-                  "PHVNUMBER": 269
+                  "PHVNUMBER": 265
                 }, 
                 {
                   "PHVRECORD": [
@@ -7117,7 +7209,7 @@
                       "POSITIONOFFSET": 19
                     }
                   ], 
-                  "PHVNUMBER": 270
+                  "PHVNUMBER": 266
                 }, 
                 {
                   "PHVRECORD": [
@@ -7132,7 +7224,7 @@
                       "POSITIONOFFSET": 63
                     }
                   ], 
-                  "PHVNUMBER": 271
+                  "PHVNUMBER": 267
                 }, 
                 {
                   "PHVRECORD": [
@@ -7172,7 +7264,7 @@
                       "POSITIONOFFSET": 37
                     }
                   ], 
-                  "PHVNUMBER": 296
+                  "PHVNUMBER": 292
                 }, 
                 {
                   "PHVRECORD": [
@@ -7187,7 +7279,7 @@
                       "POSITIONOFFSET": 4
                     }
                   ], 
-                  "PHVNUMBER": 297
+                  "PHVNUMBER": 293
                 }, 
                 {
                   "PHVRECORD": [
@@ -7212,7 +7304,7 @@
                       "POSITIONOFFSET": 56
                     }
                   ], 
-                  "PHVNUMBER": 298
+                  "PHVNUMBER": 294
                 }, 
                 {
                   "PHVRECORD": [
@@ -7237,7 +7329,7 @@
                       "POSITIONOFFSET": 56
                     }
                   ], 
-                  "PHVNUMBER": 299
+                  "PHVNUMBER": 295
                 }, 
                 {
                   "PHVRECORD": [
@@ -7252,7 +7344,7 @@
                       "POSITIONOFFSET": 19
                     }
                   ], 
-                  "PHVNUMBER": 300
+                  "PHVNUMBER": 296
                 }, 
                 {
                   "PHVRECORD": [
@@ -7267,7 +7359,7 @@
                       "POSITIONOFFSET": 63
                     }
                   ], 
-                  "PHVNUMBER": 301
+                  "PHVNUMBER": 297
                 }, 
                 {
                   "PHVRECORD": [
@@ -7282,7 +7374,7 @@
                       "POSITIONOFFSET": 54
                     }
                   ], 
-                  "PHVNUMBER": 332
+                  "PHVNUMBER": 326
                 }, 
                 {
                   "PHVRECORD": [
@@ -7297,7 +7389,7 @@
                       "POSITIONOFFSET": 43
                     }
                   ], 
-                  "PHVNUMBER": 333
+                  "PHVNUMBER": 327
                 }, 
                 {
                   "PHVRECORD": [
@@ -7322,7 +7414,7 @@
                       "POSITIONOFFSET": 5
                     }
                   ], 
-                  "PHVNUMBER": 334
+                  "PHVNUMBER": 328
                 }, 
                 {
                   "PHVRECORD": [
@@ -7335,9 +7427,114 @@
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
                       "POSITIONOFFSET": 32
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_dstPort", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 48
                     }
                   ], 
-                  "PHVNUMBER": 335
+                  "PHVNUMBER": 329
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 16, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 31, 
+                      "PHVNAME": "tcp_seqNo", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 69
+                    }
+                  ], 
+                  "PHVNUMBER": 330
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_seqNo", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 69
+                    }
+                  ], 
+                  "PHVNUMBER": 331
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 6, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "ethernet_dstAddr", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 8, 
+                      "POSITIONOFFSET": 19
+                    }, 
+                    {
+                      "FIELDWIDTH": 6, 
+                      "FIELDLSB": 40, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 47, 
+                      "PHVNAME": "ethernet_srcAddr", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 63
+                    }
+                  ], 
+                  "PHVNUMBER": 332
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "ethernet_etherType", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 39
+                    }
+                  ], 
+                  "PHVNUMBER": 333
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 8, 
+                      "PHVNAME": "packet_out_hdr_egress_port", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 7, 
+                      "POSITIONOFFSET": 0
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 8, 
+                      "PHVNAME": "packet_in_hdr_ingress_port", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 7, 
+                      "POSITIONOFFSET": 30
+                    }
+                  ], 
+                  "PHVNUMBER": 334
                 }, 
                 {
                   "PHVRECORD": [
@@ -7404,111 +7601,6 @@
                     }
                   ], 
                   "PHVNUMBER": 81
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 6, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "ethernet_dstAddr", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 8, 
-                      "POSITIONOFFSET": 19
-                    }, 
-                    {
-                      "FIELDWIDTH": 6, 
-                      "FIELDLSB": 40, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 47, 
-                      "PHVNAME": "ethernet_srcAddr", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 63
-                    }
-                  ], 
-                  "PHVNUMBER": 338
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "ethernet_etherType", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 39
-                    }
-                  ], 
-                  "PHVNUMBER": 339
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 8, 
-                      "PHVNAME": "packet_out_hdr_egress_port", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 7, 
-                      "POSITIONOFFSET": 0
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 8, 
-                      "PHVNAME": "packet_in_hdr_ingress_port", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 7, 
-                      "POSITIONOFFSET": 30
-                    }
-                  ], 
-                  "PHVNUMBER": 340
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 16, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_seqNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 69
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_dstPort", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 48
-                    }
-                  ], 
-                  "PHVNUMBER": 336
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_seqNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 69
-                    }
-                  ], 
-                  "PHVNUMBER": 337
                 }
               ], 
               "TOTALEGRESSPHVS": 26
@@ -7518,7 +7610,7 @@
         }, 
         {
           "TOTALPOVHEADERS": 13, 
-          "TOTALSTAGEPHVS": 59, 
+          "TOTALSTAGEPHVS": 56, 
           "TOTALPHVRECORDS": 95, 
           "Phvs": [
             {
@@ -7598,6 +7690,31 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 31, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_dstPort", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 24, 
+                      "POSITIONOFFSET": 33
+                    }, 
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 23, 
+                      "FIELDMSB": 31, 
+                      "PHVNAME": "tcp_seqNo", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 76
+                    }
+                  ], 
+                  "PHVNUMBER": 3
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 8, 
                       "PHVMSB": 31, 
@@ -7608,7 +7725,7 @@
                       "POSITIONOFFSET": 20
                     }
                   ], 
-                  "PHVNUMBER": 3
+                  "PHVNUMBER": 4
                 }, 
                 {
                   "PHVRECORD": [
@@ -7623,31 +7740,6 @@
                       "POSITIONOFFSET": 70
                     }
                   ], 
-                  "PHVNUMBER": 4
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 31, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_srcPort", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 16, 
-                      "POSITIONOFFSET": 66
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_dstPort", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 55
-                    }
-                  ], 
                   "PHVNUMBER": 5
                 }, 
                 {
@@ -7657,10 +7749,10 @@
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "ecmp_metadata_group_id", 
+                      "PHVNAME": "ethernet_etherType", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 36
+                      "POSITIONOFFSET": 5
                     }
                   ], 
                   "PHVNUMBER": 134
@@ -7693,17 +7785,17 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 16, 
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
                       "PHVMSB": 15, 
-                      "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_ackNo", 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "ecmp_metadata_selector", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 26
+                      "POSITIONOFFSET": 61
                     }
                   ], 
-                  "PHVNUMBER": 324
+                  "PHVNUMBER": 136
                 }, 
                 {
                   "PHVRECORD": [
@@ -7833,6 +7925,31 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_srcPort", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 8, 
+                      "POSITIONOFFSET": 38
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_dstPort", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 33
+                    }
+                  ], 
+                  "PHVNUMBER": 132
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
@@ -7853,21 +7970,6 @@
                       "POSITIONOFFSET": 70
                     }
                   ], 
-                  "PHVNUMBER": 132
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "ethernet_etherType", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 5
-                    }
-                  ], 
                   "PHVNUMBER": 133
                 }, 
                 {
@@ -7898,24 +8000,24 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 8, 
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 0, 
                       "PHVMSB": 7, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_srcPort", 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_seqNo", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
+                      "POSITIONOFFSET": 76
                     }, 
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 8, 
                       "PHVMSB": 7, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "udp_length_", 
+                      "PHVNAME": "udp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 17
+                      "POSITIONOFFSET": 66
                     }
                   ], 
                   "PHVNUMBER": 289
@@ -7925,67 +8027,12 @@
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 0, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "tcp_srcPort", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "udp_length_", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 17
-                    }
-                  ], 
-                  "PHVNUMBER": 290
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 8, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_dstPort", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 33
-                    }
-                  ], 
-                  "PHVNUMBER": 291
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "tcp_dstPort", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 33
-                    }
-                  ], 
-                  "PHVNUMBER": 292
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "ecmp_metadata_selector", 
+                      "PHVNAME": "ecmp_metadata_group_id", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 61
+                      "POSITIONOFFSET": 36
                     }
                   ], 
                   "PHVNUMBER": 135
@@ -8041,6 +8088,26 @@
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
                       "POSITIONOFFSET": 46
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 31, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_length_", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 16, 
+                      "POSITIONOFFSET": 17
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_checksum", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 68
                     }
                   ], 
                   "PHVNUMBER": 257
@@ -8088,6 +8155,31 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_srcPort", 
+                      "CONTAINERWIDTH": 8, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 38
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "udp_srcPort", 
+                      "CONTAINERWIDTH": 8, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 66
+                    }
+                  ], 
+                  "PHVNUMBER": 65
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 40, 
                       "PHVMSB": 7, 
@@ -8098,7 +8190,7 @@
                       "POSITIONOFFSET": 20
                     }
                   ], 
-                  "PHVNUMBER": 65
+                  "PHVNUMBER": 66
                 }, 
                 {
                   "PHVRECORD": [
@@ -8113,7 +8205,7 @@
                       "POSITIONOFFSET": 70
                     }
                   ], 
-                  "PHVNUMBER": 66
+                  "PHVNUMBER": 67
                 }, 
                 {
                   "PHVRECORD": [
@@ -8164,7 +8256,7 @@
                       ]
                     }
                   ], 
-                  "PHVNUMBER": 67
+                  "PHVNUMBER": 68
                 }, 
                 {
                   "PHVRECORD": [
@@ -8179,22 +8271,7 @@
                       "POSITIONOFFSET": 51
                     }
                   ], 
-                  "PHVNUMBER": 68
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_ackNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 26
-                    }
-                  ], 
-                  "PHVNUMBER": 325
+                  "PHVNUMBER": 69
                 }, 
                 {
                   "PHVRECORD": [
@@ -8228,20 +8305,20 @@
                       "FIELDLSB": 16, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_seqNo", 
+                      "PHVNAME": "tcp_ackNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 76
+                      "POSITIONOFFSET": 26
                     }, 
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "udp_checksum", 
+                      "PHVNAME": "udp_dstPort", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 68
+                      "POSITIONOFFSET": 55
                     }
                   ], 
                   "PHVNUMBER": 322
@@ -8253,16 +8330,16 @@
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_seqNo", 
+                      "PHVNAME": "tcp_ackNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 76
+                      "POSITIONOFFSET": 26
                     }
                   ], 
                   "PHVNUMBER": 323
                 }
               ], 
-              "TOTALINGRESSPHVS": 33
+              "TOTALINGRESSPHVS": 30
             }, 
             {
               "PHVDIRECTION": 1, 
@@ -8300,7 +8377,7 @@
                       "POSITIONOFFSET": 9
                     }
                   ], 
-                  "PHVNUMBER": 264
+                  "PHVNUMBER": 260
                 }, 
                 {
                   "PHVRECORD": [
@@ -8315,7 +8392,7 @@
                       "POSITIONOFFSET": 12
                     }
                   ], 
-                  "PHVNUMBER": 265
+                  "PHVNUMBER": 261
                 }, 
                 {
                   "PHVRECORD": [
@@ -8330,7 +8407,7 @@
                       "POSITIONOFFSET": 50
                     }
                   ], 
-                  "PHVNUMBER": 266
+                  "PHVNUMBER": 262
                 }, 
                 {
                   "PHVRECORD": [
@@ -8365,7 +8442,7 @@
                       "POSITIONOFFSET": 59
                     }
                   ], 
-                  "PHVNUMBER": 267
+                  "PHVNUMBER": 263
                 }, 
                 {
                   "PHVRECORD": [
@@ -8420,7 +8497,7 @@
                       "POSITIONOFFSET": 41
                     }
                   ], 
-                  "PHVNUMBER": 268
+                  "PHVNUMBER": 264
                 }, 
                 {
                   "PHVRECORD": [
@@ -8445,7 +8522,7 @@
                       "POSITIONOFFSET": 45
                     }
                   ], 
-                  "PHVNUMBER": 269
+                  "PHVNUMBER": 265
                 }, 
                 {
                   "PHVRECORD": [
@@ -8460,7 +8537,7 @@
                       "POSITIONOFFSET": 19
                     }
                   ], 
-                  "PHVNUMBER": 270
+                  "PHVNUMBER": 266
                 }, 
                 {
                   "PHVRECORD": [
@@ -8475,7 +8552,7 @@
                       "POSITIONOFFSET": 63
                     }
                   ], 
-                  "PHVNUMBER": 271
+                  "PHVNUMBER": 267
                 }, 
                 {
                   "PHVRECORD": [
@@ -8515,7 +8592,7 @@
                       "POSITIONOFFSET": 37
                     }
                   ], 
-                  "PHVNUMBER": 296
+                  "PHVNUMBER": 292
                 }, 
                 {
                   "PHVRECORD": [
@@ -8530,7 +8607,7 @@
                       "POSITIONOFFSET": 4
                     }
                   ], 
-                  "PHVNUMBER": 297
+                  "PHVNUMBER": 293
                 }, 
                 {
                   "PHVRECORD": [
@@ -8555,7 +8632,7 @@
                       "POSITIONOFFSET": 56
                     }
                   ], 
-                  "PHVNUMBER": 298
+                  "PHVNUMBER": 294
                 }, 
                 {
                   "PHVRECORD": [
@@ -8580,7 +8657,7 @@
                       "POSITIONOFFSET": 56
                     }
                   ], 
-                  "PHVNUMBER": 299
+                  "PHVNUMBER": 295
                 }, 
                 {
                   "PHVRECORD": [
@@ -8595,7 +8672,7 @@
                       "POSITIONOFFSET": 19
                     }
                   ], 
-                  "PHVNUMBER": 300
+                  "PHVNUMBER": 296
                 }, 
                 {
                   "PHVRECORD": [
@@ -8610,7 +8687,7 @@
                       "POSITIONOFFSET": 63
                     }
                   ], 
-                  "PHVNUMBER": 301
+                  "PHVNUMBER": 297
                 }, 
                 {
                   "PHVRECORD": [
@@ -8625,7 +8702,7 @@
                       "POSITIONOFFSET": 54
                     }
                   ], 
-                  "PHVNUMBER": 332
+                  "PHVNUMBER": 326
                 }, 
                 {
                   "PHVRECORD": [
@@ -8640,7 +8717,7 @@
                       "POSITIONOFFSET": 43
                     }
                   ], 
-                  "PHVNUMBER": 333
+                  "PHVNUMBER": 327
                 }, 
                 {
                   "PHVRECORD": [
@@ -8665,7 +8742,7 @@
                       "POSITIONOFFSET": 5
                     }
                   ], 
-                  "PHVNUMBER": 334
+                  "PHVNUMBER": 328
                 }, 
                 {
                   "PHVRECORD": [
@@ -8678,9 +8755,114 @@
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
                       "POSITIONOFFSET": 32
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_dstPort", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 48
                     }
                   ], 
-                  "PHVNUMBER": 335
+                  "PHVNUMBER": 329
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 16, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 31, 
+                      "PHVNAME": "tcp_seqNo", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 69
+                    }
+                  ], 
+                  "PHVNUMBER": 330
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_seqNo", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 69
+                    }
+                  ], 
+                  "PHVNUMBER": 331
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 6, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "ethernet_dstAddr", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 8, 
+                      "POSITIONOFFSET": 19
+                    }, 
+                    {
+                      "FIELDWIDTH": 6, 
+                      "FIELDLSB": 40, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 47, 
+                      "PHVNAME": "ethernet_srcAddr", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 63
+                    }
+                  ], 
+                  "PHVNUMBER": 332
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "ethernet_etherType", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 39
+                    }
+                  ], 
+                  "PHVNUMBER": 333
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 8, 
+                      "PHVNAME": "packet_out_hdr_egress_port", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 7, 
+                      "POSITIONOFFSET": 0
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 8, 
+                      "PHVNAME": "packet_in_hdr_ingress_port", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 7, 
+                      "POSITIONOFFSET": 30
+                    }
+                  ], 
+                  "PHVNUMBER": 334
                 }, 
                 {
                   "PHVRECORD": [
@@ -8747,111 +8929,6 @@
                     }
                   ], 
                   "PHVNUMBER": 81
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 6, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "ethernet_dstAddr", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 8, 
-                      "POSITIONOFFSET": 19
-                    }, 
-                    {
-                      "FIELDWIDTH": 6, 
-                      "FIELDLSB": 40, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 47, 
-                      "PHVNAME": "ethernet_srcAddr", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 63
-                    }
-                  ], 
-                  "PHVNUMBER": 338
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "ethernet_etherType", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 39
-                    }
-                  ], 
-                  "PHVNUMBER": 339
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 8, 
-                      "PHVNAME": "packet_out_hdr_egress_port", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 7, 
-                      "POSITIONOFFSET": 0
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 8, 
-                      "PHVNAME": "packet_in_hdr_ingress_port", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 7, 
-                      "POSITIONOFFSET": 30
-                    }
-                  ], 
-                  "PHVNUMBER": 340
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 16, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_seqNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 69
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_dstPort", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 48
-                    }
-                  ], 
-                  "PHVNUMBER": 336
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_seqNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 69
-                    }
-                  ], 
-                  "PHVNUMBER": 337
                 }
               ], 
               "TOTALEGRESSPHVS": 26
@@ -8861,7 +8938,7 @@
         }, 
         {
           "TOTALPOVHEADERS": 13, 
-          "TOTALSTAGEPHVS": 59, 
+          "TOTALSTAGEPHVS": 56, 
           "TOTALPHVRECORDS": 95, 
           "Phvs": [
             {
@@ -8941,6 +9018,31 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 31, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_dstPort", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 24, 
+                      "POSITIONOFFSET": 33
+                    }, 
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 23, 
+                      "FIELDMSB": 31, 
+                      "PHVNAME": "tcp_seqNo", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 76
+                    }
+                  ], 
+                  "PHVNUMBER": 3
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 8, 
                       "PHVMSB": 31, 
@@ -8951,7 +9053,7 @@
                       "POSITIONOFFSET": 20
                     }
                   ], 
-                  "PHVNUMBER": 3
+                  "PHVNUMBER": 4
                 }, 
                 {
                   "PHVRECORD": [
@@ -8966,31 +9068,6 @@
                       "POSITIONOFFSET": 70
                     }
                   ], 
-                  "PHVNUMBER": 4
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 31, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_srcPort", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 16, 
-                      "POSITIONOFFSET": 66
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_dstPort", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 55
-                    }
-                  ], 
                   "PHVNUMBER": 5
                 }, 
                 {
@@ -9000,10 +9077,10 @@
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "ecmp_metadata_group_id", 
+                      "PHVNAME": "ethernet_etherType", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 36
+                      "POSITIONOFFSET": 5
                     }
                   ], 
                   "PHVNUMBER": 134
@@ -9036,17 +9113,17 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 16, 
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
                       "PHVMSB": 15, 
-                      "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_ackNo", 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "ecmp_metadata_selector", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 26
+                      "POSITIONOFFSET": 61
                     }
                   ], 
-                  "PHVNUMBER": 324
+                  "PHVNUMBER": 136
                 }, 
                 {
                   "PHVRECORD": [
@@ -9176,6 +9253,31 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_srcPort", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 8, 
+                      "POSITIONOFFSET": 38
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_dstPort", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 33
+                    }
+                  ], 
+                  "PHVNUMBER": 132
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
@@ -9196,21 +9298,6 @@
                       "POSITIONOFFSET": 70
                     }
                   ], 
-                  "PHVNUMBER": 132
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "ethernet_etherType", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 5
-                    }
-                  ], 
                   "PHVNUMBER": 133
                 }, 
                 {
@@ -9241,24 +9328,24 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 8, 
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 0, 
                       "PHVMSB": 7, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_srcPort", 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_seqNo", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
+                      "POSITIONOFFSET": 76
                     }, 
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 8, 
                       "PHVMSB": 7, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "udp_length_", 
+                      "PHVNAME": "udp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 17
+                      "POSITIONOFFSET": 66
                     }
                   ], 
                   "PHVNUMBER": 289
@@ -9268,67 +9355,12 @@
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 0, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "tcp_srcPort", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "udp_length_", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 17
-                    }
-                  ], 
-                  "PHVNUMBER": 290
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 8, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_dstPort", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 33
-                    }
-                  ], 
-                  "PHVNUMBER": 291
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "tcp_dstPort", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 33
-                    }
-                  ], 
-                  "PHVNUMBER": 292
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "ecmp_metadata_selector", 
+                      "PHVNAME": "ecmp_metadata_group_id", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 61
+                      "POSITIONOFFSET": 36
                     }
                   ], 
                   "PHVNUMBER": 135
@@ -9384,6 +9416,26 @@
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
                       "POSITIONOFFSET": 46
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 31, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_length_", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 16, 
+                      "POSITIONOFFSET": 17
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_checksum", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 68
                     }
                   ], 
                   "PHVNUMBER": 257
@@ -9431,6 +9483,31 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_srcPort", 
+                      "CONTAINERWIDTH": 8, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 38
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "udp_srcPort", 
+                      "CONTAINERWIDTH": 8, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 66
+                    }
+                  ], 
+                  "PHVNUMBER": 65
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 40, 
                       "PHVMSB": 7, 
@@ -9441,7 +9518,7 @@
                       "POSITIONOFFSET": 20
                     }
                   ], 
-                  "PHVNUMBER": 65
+                  "PHVNUMBER": 66
                 }, 
                 {
                   "PHVRECORD": [
@@ -9456,7 +9533,7 @@
                       "POSITIONOFFSET": 70
                     }
                   ], 
-                  "PHVNUMBER": 66
+                  "PHVNUMBER": 67
                 }, 
                 {
                   "PHVRECORD": [
@@ -9507,7 +9584,7 @@
                       ]
                     }
                   ], 
-                  "PHVNUMBER": 67
+                  "PHVNUMBER": 68
                 }, 
                 {
                   "PHVRECORD": [
@@ -9522,22 +9599,7 @@
                       "POSITIONOFFSET": 51
                     }
                   ], 
-                  "PHVNUMBER": 68
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_ackNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 26
-                    }
-                  ], 
-                  "PHVNUMBER": 325
+                  "PHVNUMBER": 69
                 }, 
                 {
                   "PHVRECORD": [
@@ -9571,20 +9633,20 @@
                       "FIELDLSB": 16, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_seqNo", 
+                      "PHVNAME": "tcp_ackNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 76
+                      "POSITIONOFFSET": 26
                     }, 
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "udp_checksum", 
+                      "PHVNAME": "udp_dstPort", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 68
+                      "POSITIONOFFSET": 55
                     }
                   ], 
                   "PHVNUMBER": 322
@@ -9596,16 +9658,16 @@
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_seqNo", 
+                      "PHVNAME": "tcp_ackNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 76
+                      "POSITIONOFFSET": 26
                     }
                   ], 
                   "PHVNUMBER": 323
                 }
               ], 
-              "TOTALINGRESSPHVS": 33
+              "TOTALINGRESSPHVS": 30
             }, 
             {
               "PHVDIRECTION": 1, 
@@ -9643,7 +9705,7 @@
                       "POSITIONOFFSET": 9
                     }
                   ], 
-                  "PHVNUMBER": 264
+                  "PHVNUMBER": 260
                 }, 
                 {
                   "PHVRECORD": [
@@ -9658,7 +9720,7 @@
                       "POSITIONOFFSET": 12
                     }
                   ], 
-                  "PHVNUMBER": 265
+                  "PHVNUMBER": 261
                 }, 
                 {
                   "PHVRECORD": [
@@ -9673,7 +9735,7 @@
                       "POSITIONOFFSET": 50
                     }
                   ], 
-                  "PHVNUMBER": 266
+                  "PHVNUMBER": 262
                 }, 
                 {
                   "PHVRECORD": [
@@ -9708,7 +9770,7 @@
                       "POSITIONOFFSET": 59
                     }
                   ], 
-                  "PHVNUMBER": 267
+                  "PHVNUMBER": 263
                 }, 
                 {
                   "PHVRECORD": [
@@ -9763,7 +9825,7 @@
                       "POSITIONOFFSET": 41
                     }
                   ], 
-                  "PHVNUMBER": 268
+                  "PHVNUMBER": 264
                 }, 
                 {
                   "PHVRECORD": [
@@ -9788,7 +9850,7 @@
                       "POSITIONOFFSET": 45
                     }
                   ], 
-                  "PHVNUMBER": 269
+                  "PHVNUMBER": 265
                 }, 
                 {
                   "PHVRECORD": [
@@ -9803,7 +9865,7 @@
                       "POSITIONOFFSET": 19
                     }
                   ], 
-                  "PHVNUMBER": 270
+                  "PHVNUMBER": 266
                 }, 
                 {
                   "PHVRECORD": [
@@ -9818,7 +9880,7 @@
                       "POSITIONOFFSET": 63
                     }
                   ], 
-                  "PHVNUMBER": 271
+                  "PHVNUMBER": 267
                 }, 
                 {
                   "PHVRECORD": [
@@ -9858,7 +9920,7 @@
                       "POSITIONOFFSET": 37
                     }
                   ], 
-                  "PHVNUMBER": 296
+                  "PHVNUMBER": 292
                 }, 
                 {
                   "PHVRECORD": [
@@ -9873,7 +9935,7 @@
                       "POSITIONOFFSET": 4
                     }
                   ], 
-                  "PHVNUMBER": 297
+                  "PHVNUMBER": 293
                 }, 
                 {
                   "PHVRECORD": [
@@ -9898,7 +9960,7 @@
                       "POSITIONOFFSET": 56
                     }
                   ], 
-                  "PHVNUMBER": 298
+                  "PHVNUMBER": 294
                 }, 
                 {
                   "PHVRECORD": [
@@ -9923,7 +9985,7 @@
                       "POSITIONOFFSET": 56
                     }
                   ], 
-                  "PHVNUMBER": 299
+                  "PHVNUMBER": 295
                 }, 
                 {
                   "PHVRECORD": [
@@ -9938,7 +10000,7 @@
                       "POSITIONOFFSET": 19
                     }
                   ], 
-                  "PHVNUMBER": 300
+                  "PHVNUMBER": 296
                 }, 
                 {
                   "PHVRECORD": [
@@ -9953,7 +10015,7 @@
                       "POSITIONOFFSET": 63
                     }
                   ], 
-                  "PHVNUMBER": 301
+                  "PHVNUMBER": 297
                 }, 
                 {
                   "PHVRECORD": [
@@ -9968,7 +10030,7 @@
                       "POSITIONOFFSET": 54
                     }
                   ], 
-                  "PHVNUMBER": 332
+                  "PHVNUMBER": 326
                 }, 
                 {
                   "PHVRECORD": [
@@ -9983,7 +10045,7 @@
                       "POSITIONOFFSET": 43
                     }
                   ], 
-                  "PHVNUMBER": 333
+                  "PHVNUMBER": 327
                 }, 
                 {
                   "PHVRECORD": [
@@ -10008,7 +10070,7 @@
                       "POSITIONOFFSET": 5
                     }
                   ], 
-                  "PHVNUMBER": 334
+                  "PHVNUMBER": 328
                 }, 
                 {
                   "PHVRECORD": [
@@ -10021,9 +10083,114 @@
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
                       "POSITIONOFFSET": 32
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_dstPort", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 48
                     }
                   ], 
-                  "PHVNUMBER": 335
+                  "PHVNUMBER": 329
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 16, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 31, 
+                      "PHVNAME": "tcp_seqNo", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 69
+                    }
+                  ], 
+                  "PHVNUMBER": 330
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_seqNo", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 69
+                    }
+                  ], 
+                  "PHVNUMBER": 331
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 6, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "ethernet_dstAddr", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 8, 
+                      "POSITIONOFFSET": 19
+                    }, 
+                    {
+                      "FIELDWIDTH": 6, 
+                      "FIELDLSB": 40, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 47, 
+                      "PHVNAME": "ethernet_srcAddr", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 63
+                    }
+                  ], 
+                  "PHVNUMBER": 332
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "ethernet_etherType", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 39
+                    }
+                  ], 
+                  "PHVNUMBER": 333
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 8, 
+                      "PHVNAME": "packet_out_hdr_egress_port", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 7, 
+                      "POSITIONOFFSET": 0
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 8, 
+                      "PHVNAME": "packet_in_hdr_ingress_port", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 7, 
+                      "POSITIONOFFSET": 30
+                    }
+                  ], 
+                  "PHVNUMBER": 334
                 }, 
                 {
                   "PHVRECORD": [
@@ -10090,111 +10257,6 @@
                     }
                   ], 
                   "PHVNUMBER": 81
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 6, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "ethernet_dstAddr", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 8, 
-                      "POSITIONOFFSET": 19
-                    }, 
-                    {
-                      "FIELDWIDTH": 6, 
-                      "FIELDLSB": 40, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 47, 
-                      "PHVNAME": "ethernet_srcAddr", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 63
-                    }
-                  ], 
-                  "PHVNUMBER": 338
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "ethernet_etherType", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 39
-                    }
-                  ], 
-                  "PHVNUMBER": 339
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 8, 
-                      "PHVNAME": "packet_out_hdr_egress_port", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 7, 
-                      "POSITIONOFFSET": 0
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 8, 
-                      "PHVNAME": "packet_in_hdr_ingress_port", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 7, 
-                      "POSITIONOFFSET": 30
-                    }
-                  ], 
-                  "PHVNUMBER": 340
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 16, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_seqNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 69
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_dstPort", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 48
-                    }
-                  ], 
-                  "PHVNUMBER": 336
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_seqNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 69
-                    }
-                  ], 
-                  "PHVNUMBER": 337
                 }
               ], 
               "TOTALEGRESSPHVS": 26
@@ -10204,7 +10266,7 @@
         }, 
         {
           "TOTALPOVHEADERS": 13, 
-          "TOTALSTAGEPHVS": 59, 
+          "TOTALSTAGEPHVS": 56, 
           "TOTALPHVRECORDS": 95, 
           "Phvs": [
             {
@@ -10284,6 +10346,31 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 31, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_dstPort", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 24, 
+                      "POSITIONOFFSET": 33
+                    }, 
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 23, 
+                      "FIELDMSB": 31, 
+                      "PHVNAME": "tcp_seqNo", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 76
+                    }
+                  ], 
+                  "PHVNUMBER": 3
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 8, 
                       "PHVMSB": 31, 
@@ -10294,7 +10381,7 @@
                       "POSITIONOFFSET": 20
                     }
                   ], 
-                  "PHVNUMBER": 3
+                  "PHVNUMBER": 4
                 }, 
                 {
                   "PHVRECORD": [
@@ -10309,31 +10396,6 @@
                       "POSITIONOFFSET": 70
                     }
                   ], 
-                  "PHVNUMBER": 4
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 31, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_srcPort", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 16, 
-                      "POSITIONOFFSET": 66
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_dstPort", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 55
-                    }
-                  ], 
                   "PHVNUMBER": 5
                 }, 
                 {
@@ -10343,10 +10405,10 @@
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "ecmp_metadata_group_id", 
+                      "PHVNAME": "ethernet_etherType", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 36
+                      "POSITIONOFFSET": 5
                     }
                   ], 
                   "PHVNUMBER": 134
@@ -10379,17 +10441,17 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 16, 
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
                       "PHVMSB": 15, 
-                      "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_ackNo", 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "ecmp_metadata_selector", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 26
+                      "POSITIONOFFSET": 61
                     }
                   ], 
-                  "PHVNUMBER": 324
+                  "PHVNUMBER": 136
                 }, 
                 {
                   "PHVRECORD": [
@@ -10519,6 +10581,31 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_srcPort", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 8, 
+                      "POSITIONOFFSET": 38
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_dstPort", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 33
+                    }
+                  ], 
+                  "PHVNUMBER": 132
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
@@ -10539,21 +10626,6 @@
                       "POSITIONOFFSET": 70
                     }
                   ], 
-                  "PHVNUMBER": 132
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "ethernet_etherType", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 5
-                    }
-                  ], 
                   "PHVNUMBER": 133
                 }, 
                 {
@@ -10584,24 +10656,24 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 8, 
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 0, 
                       "PHVMSB": 7, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_srcPort", 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_seqNo", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
+                      "POSITIONOFFSET": 76
                     }, 
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 8, 
                       "PHVMSB": 7, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "udp_length_", 
+                      "PHVNAME": "udp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 17
+                      "POSITIONOFFSET": 66
                     }
                   ], 
                   "PHVNUMBER": 289
@@ -10611,67 +10683,12 @@
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 0, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "tcp_srcPort", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "udp_length_", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 17
-                    }
-                  ], 
-                  "PHVNUMBER": 290
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 8, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_dstPort", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 33
-                    }
-                  ], 
-                  "PHVNUMBER": 291
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "tcp_dstPort", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 33
-                    }
-                  ], 
-                  "PHVNUMBER": 292
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "ecmp_metadata_selector", 
+                      "PHVNAME": "ecmp_metadata_group_id", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 61
+                      "POSITIONOFFSET": 36
                     }
                   ], 
                   "PHVNUMBER": 135
@@ -10727,6 +10744,26 @@
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
                       "POSITIONOFFSET": 46
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 31, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_length_", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 16, 
+                      "POSITIONOFFSET": 17
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_checksum", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 68
                     }
                   ], 
                   "PHVNUMBER": 257
@@ -10774,6 +10811,31 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_srcPort", 
+                      "CONTAINERWIDTH": 8, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 38
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "udp_srcPort", 
+                      "CONTAINERWIDTH": 8, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 66
+                    }
+                  ], 
+                  "PHVNUMBER": 65
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 40, 
                       "PHVMSB": 7, 
@@ -10784,7 +10846,7 @@
                       "POSITIONOFFSET": 20
                     }
                   ], 
-                  "PHVNUMBER": 65
+                  "PHVNUMBER": 66
                 }, 
                 {
                   "PHVRECORD": [
@@ -10799,7 +10861,7 @@
                       "POSITIONOFFSET": 70
                     }
                   ], 
-                  "PHVNUMBER": 66
+                  "PHVNUMBER": 67
                 }, 
                 {
                   "PHVRECORD": [
@@ -10850,7 +10912,7 @@
                       ]
                     }
                   ], 
-                  "PHVNUMBER": 67
+                  "PHVNUMBER": 68
                 }, 
                 {
                   "PHVRECORD": [
@@ -10865,22 +10927,7 @@
                       "POSITIONOFFSET": 51
                     }
                   ], 
-                  "PHVNUMBER": 68
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_ackNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 26
-                    }
-                  ], 
-                  "PHVNUMBER": 325
+                  "PHVNUMBER": 69
                 }, 
                 {
                   "PHVRECORD": [
@@ -10914,20 +10961,20 @@
                       "FIELDLSB": 16, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_seqNo", 
+                      "PHVNAME": "tcp_ackNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 76
+                      "POSITIONOFFSET": 26
                     }, 
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "udp_checksum", 
+                      "PHVNAME": "udp_dstPort", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 68
+                      "POSITIONOFFSET": 55
                     }
                   ], 
                   "PHVNUMBER": 322
@@ -10939,16 +10986,16 @@
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_seqNo", 
+                      "PHVNAME": "tcp_ackNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 76
+                      "POSITIONOFFSET": 26
                     }
                   ], 
                   "PHVNUMBER": 323
                 }
               ], 
-              "TOTALINGRESSPHVS": 33
+              "TOTALINGRESSPHVS": 30
             }, 
             {
               "PHVDIRECTION": 1, 
@@ -10986,7 +11033,7 @@
                       "POSITIONOFFSET": 9
                     }
                   ], 
-                  "PHVNUMBER": 264
+                  "PHVNUMBER": 260
                 }, 
                 {
                   "PHVRECORD": [
@@ -11001,7 +11048,7 @@
                       "POSITIONOFFSET": 12
                     }
                   ], 
-                  "PHVNUMBER": 265
+                  "PHVNUMBER": 261
                 }, 
                 {
                   "PHVRECORD": [
@@ -11016,7 +11063,7 @@
                       "POSITIONOFFSET": 50
                     }
                   ], 
-                  "PHVNUMBER": 266
+                  "PHVNUMBER": 262
                 }, 
                 {
                   "PHVRECORD": [
@@ -11051,7 +11098,7 @@
                       "POSITIONOFFSET": 59
                     }
                   ], 
-                  "PHVNUMBER": 267
+                  "PHVNUMBER": 263
                 }, 
                 {
                   "PHVRECORD": [
@@ -11106,7 +11153,7 @@
                       "POSITIONOFFSET": 41
                     }
                   ], 
-                  "PHVNUMBER": 268
+                  "PHVNUMBER": 264
                 }, 
                 {
                   "PHVRECORD": [
@@ -11131,7 +11178,7 @@
                       "POSITIONOFFSET": 45
                     }
                   ], 
-                  "PHVNUMBER": 269
+                  "PHVNUMBER": 265
                 }, 
                 {
                   "PHVRECORD": [
@@ -11146,7 +11193,7 @@
                       "POSITIONOFFSET": 19
                     }
                   ], 
-                  "PHVNUMBER": 270
+                  "PHVNUMBER": 266
                 }, 
                 {
                   "PHVRECORD": [
@@ -11161,7 +11208,7 @@
                       "POSITIONOFFSET": 63
                     }
                   ], 
-                  "PHVNUMBER": 271
+                  "PHVNUMBER": 267
                 }, 
                 {
                   "PHVRECORD": [
@@ -11201,7 +11248,7 @@
                       "POSITIONOFFSET": 37
                     }
                   ], 
-                  "PHVNUMBER": 296
+                  "PHVNUMBER": 292
                 }, 
                 {
                   "PHVRECORD": [
@@ -11216,7 +11263,7 @@
                       "POSITIONOFFSET": 4
                     }
                   ], 
-                  "PHVNUMBER": 297
+                  "PHVNUMBER": 293
                 }, 
                 {
                   "PHVRECORD": [
@@ -11241,7 +11288,7 @@
                       "POSITIONOFFSET": 56
                     }
                   ], 
-                  "PHVNUMBER": 298
+                  "PHVNUMBER": 294
                 }, 
                 {
                   "PHVRECORD": [
@@ -11266,7 +11313,7 @@
                       "POSITIONOFFSET": 56
                     }
                   ], 
-                  "PHVNUMBER": 299
+                  "PHVNUMBER": 295
                 }, 
                 {
                   "PHVRECORD": [
@@ -11281,7 +11328,7 @@
                       "POSITIONOFFSET": 19
                     }
                   ], 
-                  "PHVNUMBER": 300
+                  "PHVNUMBER": 296
                 }, 
                 {
                   "PHVRECORD": [
@@ -11296,7 +11343,7 @@
                       "POSITIONOFFSET": 63
                     }
                   ], 
-                  "PHVNUMBER": 301
+                  "PHVNUMBER": 297
                 }, 
                 {
                   "PHVRECORD": [
@@ -11311,7 +11358,7 @@
                       "POSITIONOFFSET": 54
                     }
                   ], 
-                  "PHVNUMBER": 332
+                  "PHVNUMBER": 326
                 }, 
                 {
                   "PHVRECORD": [
@@ -11326,7 +11373,7 @@
                       "POSITIONOFFSET": 43
                     }
                   ], 
-                  "PHVNUMBER": 333
+                  "PHVNUMBER": 327
                 }, 
                 {
                   "PHVRECORD": [
@@ -11351,7 +11398,7 @@
                       "POSITIONOFFSET": 5
                     }
                   ], 
-                  "PHVNUMBER": 334
+                  "PHVNUMBER": 328
                 }, 
                 {
                   "PHVRECORD": [
@@ -11364,9 +11411,114 @@
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
                       "POSITIONOFFSET": 32
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_dstPort", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 48
                     }
                   ], 
-                  "PHVNUMBER": 335
+                  "PHVNUMBER": 329
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 16, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 31, 
+                      "PHVNAME": "tcp_seqNo", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 69
+                    }
+                  ], 
+                  "PHVNUMBER": 330
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_seqNo", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 69
+                    }
+                  ], 
+                  "PHVNUMBER": 331
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 6, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "ethernet_dstAddr", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 8, 
+                      "POSITIONOFFSET": 19
+                    }, 
+                    {
+                      "FIELDWIDTH": 6, 
+                      "FIELDLSB": 40, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 47, 
+                      "PHVNAME": "ethernet_srcAddr", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 63
+                    }
+                  ], 
+                  "PHVNUMBER": 332
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "ethernet_etherType", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 39
+                    }
+                  ], 
+                  "PHVNUMBER": 333
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 8, 
+                      "PHVNAME": "packet_out_hdr_egress_port", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 7, 
+                      "POSITIONOFFSET": 0
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 8, 
+                      "PHVNAME": "packet_in_hdr_ingress_port", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 7, 
+                      "POSITIONOFFSET": 30
+                    }
+                  ], 
+                  "PHVNUMBER": 334
                 }, 
                 {
                   "PHVRECORD": [
@@ -11433,111 +11585,6 @@
                     }
                   ], 
                   "PHVNUMBER": 81
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 6, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "ethernet_dstAddr", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 8, 
-                      "POSITIONOFFSET": 19
-                    }, 
-                    {
-                      "FIELDWIDTH": 6, 
-                      "FIELDLSB": 40, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 47, 
-                      "PHVNAME": "ethernet_srcAddr", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 63
-                    }
-                  ], 
-                  "PHVNUMBER": 338
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "ethernet_etherType", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 39
-                    }
-                  ], 
-                  "PHVNUMBER": 339
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 8, 
-                      "PHVNAME": "packet_out_hdr_egress_port", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 7, 
-                      "POSITIONOFFSET": 0
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 8, 
-                      "PHVNAME": "packet_in_hdr_ingress_port", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 7, 
-                      "POSITIONOFFSET": 30
-                    }
-                  ], 
-                  "PHVNUMBER": 340
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 16, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_seqNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 69
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_dstPort", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 48
-                    }
-                  ], 
-                  "PHVNUMBER": 336
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_seqNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 69
-                    }
-                  ], 
-                  "PHVNUMBER": 337
                 }
               ], 
               "TOTALEGRESSPHVS": 26
@@ -11547,7 +11594,7 @@
         }, 
         {
           "TOTALPOVHEADERS": 13, 
-          "TOTALSTAGEPHVS": 59, 
+          "TOTALSTAGEPHVS": 56, 
           "TOTALPHVRECORDS": 95, 
           "Phvs": [
             {
@@ -11627,6 +11674,31 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 31, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_dstPort", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 24, 
+                      "POSITIONOFFSET": 33
+                    }, 
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 23, 
+                      "FIELDMSB": 31, 
+                      "PHVNAME": "tcp_seqNo", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 76
+                    }
+                  ], 
+                  "PHVNUMBER": 3
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 8, 
                       "PHVMSB": 31, 
@@ -11637,7 +11709,7 @@
                       "POSITIONOFFSET": 20
                     }
                   ], 
-                  "PHVNUMBER": 3
+                  "PHVNUMBER": 4
                 }, 
                 {
                   "PHVRECORD": [
@@ -11652,31 +11724,6 @@
                       "POSITIONOFFSET": 70
                     }
                   ], 
-                  "PHVNUMBER": 4
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 31, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_srcPort", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 16, 
-                      "POSITIONOFFSET": 66
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_dstPort", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 55
-                    }
-                  ], 
                   "PHVNUMBER": 5
                 }, 
                 {
@@ -11686,10 +11733,10 @@
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "ecmp_metadata_group_id", 
+                      "PHVNAME": "ethernet_etherType", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 36
+                      "POSITIONOFFSET": 5
                     }
                   ], 
                   "PHVNUMBER": 134
@@ -11722,17 +11769,17 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 16, 
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
                       "PHVMSB": 15, 
-                      "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_ackNo", 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "ecmp_metadata_selector", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 26
+                      "POSITIONOFFSET": 61
                     }
                   ], 
-                  "PHVNUMBER": 324
+                  "PHVNUMBER": 136
                 }, 
                 {
                   "PHVRECORD": [
@@ -11862,6 +11909,31 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_srcPort", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 8, 
+                      "POSITIONOFFSET": 38
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_dstPort", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 33
+                    }
+                  ], 
+                  "PHVNUMBER": 132
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
@@ -11882,21 +11954,6 @@
                       "POSITIONOFFSET": 70
                     }
                   ], 
-                  "PHVNUMBER": 132
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "ethernet_etherType", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 5
-                    }
-                  ], 
                   "PHVNUMBER": 133
                 }, 
                 {
@@ -11927,24 +11984,24 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 8, 
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 0, 
                       "PHVMSB": 7, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_srcPort", 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_seqNo", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
+                      "POSITIONOFFSET": 76
                     }, 
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 8, 
                       "PHVMSB": 7, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "udp_length_", 
+                      "PHVNAME": "udp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 17
+                      "POSITIONOFFSET": 66
                     }
                   ], 
                   "PHVNUMBER": 289
@@ -11954,67 +12011,12 @@
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 0, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "tcp_srcPort", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "udp_length_", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 17
-                    }
-                  ], 
-                  "PHVNUMBER": 290
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 8, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_dstPort", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 33
-                    }
-                  ], 
-                  "PHVNUMBER": 291
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "tcp_dstPort", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 33
-                    }
-                  ], 
-                  "PHVNUMBER": 292
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "ecmp_metadata_selector", 
+                      "PHVNAME": "ecmp_metadata_group_id", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 61
+                      "POSITIONOFFSET": 36
                     }
                   ], 
                   "PHVNUMBER": 135
@@ -12070,6 +12072,26 @@
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
                       "POSITIONOFFSET": 46
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 31, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_length_", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 16, 
+                      "POSITIONOFFSET": 17
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_checksum", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 68
                     }
                   ], 
                   "PHVNUMBER": 257
@@ -12117,6 +12139,31 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_srcPort", 
+                      "CONTAINERWIDTH": 8, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 38
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "udp_srcPort", 
+                      "CONTAINERWIDTH": 8, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 66
+                    }
+                  ], 
+                  "PHVNUMBER": 65
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 40, 
                       "PHVMSB": 7, 
@@ -12127,7 +12174,7 @@
                       "POSITIONOFFSET": 20
                     }
                   ], 
-                  "PHVNUMBER": 65
+                  "PHVNUMBER": 66
                 }, 
                 {
                   "PHVRECORD": [
@@ -12142,7 +12189,7 @@
                       "POSITIONOFFSET": 70
                     }
                   ], 
-                  "PHVNUMBER": 66
+                  "PHVNUMBER": 67
                 }, 
                 {
                   "PHVRECORD": [
@@ -12193,7 +12240,7 @@
                       ]
                     }
                   ], 
-                  "PHVNUMBER": 67
+                  "PHVNUMBER": 68
                 }, 
                 {
                   "PHVRECORD": [
@@ -12208,22 +12255,7 @@
                       "POSITIONOFFSET": 51
                     }
                   ], 
-                  "PHVNUMBER": 68
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_ackNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 26
-                    }
-                  ], 
-                  "PHVNUMBER": 325
+                  "PHVNUMBER": 69
                 }, 
                 {
                   "PHVRECORD": [
@@ -12257,20 +12289,20 @@
                       "FIELDLSB": 16, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_seqNo", 
+                      "PHVNAME": "tcp_ackNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 76
+                      "POSITIONOFFSET": 26
                     }, 
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "udp_checksum", 
+                      "PHVNAME": "udp_dstPort", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 68
+                      "POSITIONOFFSET": 55
                     }
                   ], 
                   "PHVNUMBER": 322
@@ -12282,16 +12314,16 @@
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_seqNo", 
+                      "PHVNAME": "tcp_ackNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 76
+                      "POSITIONOFFSET": 26
                     }
                   ], 
                   "PHVNUMBER": 323
                 }
               ], 
-              "TOTALINGRESSPHVS": 33
+              "TOTALINGRESSPHVS": 30
             }, 
             {
               "PHVDIRECTION": 1, 
@@ -12329,7 +12361,7 @@
                       "POSITIONOFFSET": 9
                     }
                   ], 
-                  "PHVNUMBER": 264
+                  "PHVNUMBER": 260
                 }, 
                 {
                   "PHVRECORD": [
@@ -12344,7 +12376,7 @@
                       "POSITIONOFFSET": 12
                     }
                   ], 
-                  "PHVNUMBER": 265
+                  "PHVNUMBER": 261
                 }, 
                 {
                   "PHVRECORD": [
@@ -12359,7 +12391,7 @@
                       "POSITIONOFFSET": 50
                     }
                   ], 
-                  "PHVNUMBER": 266
+                  "PHVNUMBER": 262
                 }, 
                 {
                   "PHVRECORD": [
@@ -12394,7 +12426,7 @@
                       "POSITIONOFFSET": 59
                     }
                   ], 
-                  "PHVNUMBER": 267
+                  "PHVNUMBER": 263
                 }, 
                 {
                   "PHVRECORD": [
@@ -12449,7 +12481,7 @@
                       "POSITIONOFFSET": 41
                     }
                   ], 
-                  "PHVNUMBER": 268
+                  "PHVNUMBER": 264
                 }, 
                 {
                   "PHVRECORD": [
@@ -12474,7 +12506,7 @@
                       "POSITIONOFFSET": 45
                     }
                   ], 
-                  "PHVNUMBER": 269
+                  "PHVNUMBER": 265
                 }, 
                 {
                   "PHVRECORD": [
@@ -12489,7 +12521,7 @@
                       "POSITIONOFFSET": 19
                     }
                   ], 
-                  "PHVNUMBER": 270
+                  "PHVNUMBER": 266
                 }, 
                 {
                   "PHVRECORD": [
@@ -12504,7 +12536,7 @@
                       "POSITIONOFFSET": 63
                     }
                   ], 
-                  "PHVNUMBER": 271
+                  "PHVNUMBER": 267
                 }, 
                 {
                   "PHVRECORD": [
@@ -12544,7 +12576,7 @@
                       "POSITIONOFFSET": 37
                     }
                   ], 
-                  "PHVNUMBER": 296
+                  "PHVNUMBER": 292
                 }, 
                 {
                   "PHVRECORD": [
@@ -12559,7 +12591,7 @@
                       "POSITIONOFFSET": 4
                     }
                   ], 
-                  "PHVNUMBER": 297
+                  "PHVNUMBER": 293
                 }, 
                 {
                   "PHVRECORD": [
@@ -12584,7 +12616,7 @@
                       "POSITIONOFFSET": 56
                     }
                   ], 
-                  "PHVNUMBER": 298
+                  "PHVNUMBER": 294
                 }, 
                 {
                   "PHVRECORD": [
@@ -12609,7 +12641,7 @@
                       "POSITIONOFFSET": 56
                     }
                   ], 
-                  "PHVNUMBER": 299
+                  "PHVNUMBER": 295
                 }, 
                 {
                   "PHVRECORD": [
@@ -12624,7 +12656,7 @@
                       "POSITIONOFFSET": 19
                     }
                   ], 
-                  "PHVNUMBER": 300
+                  "PHVNUMBER": 296
                 }, 
                 {
                   "PHVRECORD": [
@@ -12639,7 +12671,7 @@
                       "POSITIONOFFSET": 63
                     }
                   ], 
-                  "PHVNUMBER": 301
+                  "PHVNUMBER": 297
                 }, 
                 {
                   "PHVRECORD": [
@@ -12654,7 +12686,7 @@
                       "POSITIONOFFSET": 54
                     }
                   ], 
-                  "PHVNUMBER": 332
+                  "PHVNUMBER": 326
                 }, 
                 {
                   "PHVRECORD": [
@@ -12669,7 +12701,7 @@
                       "POSITIONOFFSET": 43
                     }
                   ], 
-                  "PHVNUMBER": 333
+                  "PHVNUMBER": 327
                 }, 
                 {
                   "PHVRECORD": [
@@ -12694,7 +12726,7 @@
                       "POSITIONOFFSET": 5
                     }
                   ], 
-                  "PHVNUMBER": 334
+                  "PHVNUMBER": 328
                 }, 
                 {
                   "PHVRECORD": [
@@ -12707,9 +12739,114 @@
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
                       "POSITIONOFFSET": 32
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_dstPort", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 48
                     }
                   ], 
-                  "PHVNUMBER": 335
+                  "PHVNUMBER": 329
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 16, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 31, 
+                      "PHVNAME": "tcp_seqNo", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 69
+                    }
+                  ], 
+                  "PHVNUMBER": 330
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_seqNo", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 69
+                    }
+                  ], 
+                  "PHVNUMBER": 331
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 6, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "ethernet_dstAddr", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 8, 
+                      "POSITIONOFFSET": 19
+                    }, 
+                    {
+                      "FIELDWIDTH": 6, 
+                      "FIELDLSB": 40, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 47, 
+                      "PHVNAME": "ethernet_srcAddr", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 63
+                    }
+                  ], 
+                  "PHVNUMBER": 332
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "ethernet_etherType", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 39
+                    }
+                  ], 
+                  "PHVNUMBER": 333
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 8, 
+                      "PHVNAME": "packet_out_hdr_egress_port", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 7, 
+                      "POSITIONOFFSET": 0
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 8, 
+                      "PHVNAME": "packet_in_hdr_ingress_port", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 7, 
+                      "POSITIONOFFSET": 30
+                    }
+                  ], 
+                  "PHVNUMBER": 334
                 }, 
                 {
                   "PHVRECORD": [
@@ -12776,111 +12913,6 @@
                     }
                   ], 
                   "PHVNUMBER": 81
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 6, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "ethernet_dstAddr", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 8, 
-                      "POSITIONOFFSET": 19
-                    }, 
-                    {
-                      "FIELDWIDTH": 6, 
-                      "FIELDLSB": 40, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 47, 
-                      "PHVNAME": "ethernet_srcAddr", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 63
-                    }
-                  ], 
-                  "PHVNUMBER": 338
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "ethernet_etherType", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 39
-                    }
-                  ], 
-                  "PHVNUMBER": 339
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 8, 
-                      "PHVNAME": "packet_out_hdr_egress_port", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 7, 
-                      "POSITIONOFFSET": 0
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 8, 
-                      "PHVNAME": "packet_in_hdr_ingress_port", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 7, 
-                      "POSITIONOFFSET": 30
-                    }
-                  ], 
-                  "PHVNUMBER": 340
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 16, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_seqNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 69
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_dstPort", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 48
-                    }
-                  ], 
-                  "PHVNUMBER": 336
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_seqNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 69
-                    }
-                  ], 
-                  "PHVNUMBER": 337
                 }
               ], 
               "TOTALEGRESSPHVS": 26
@@ -12890,7 +12922,7 @@
         }, 
         {
           "TOTALPOVHEADERS": 13, 
-          "TOTALSTAGEPHVS": 59, 
+          "TOTALSTAGEPHVS": 56, 
           "TOTALPHVRECORDS": 95, 
           "Phvs": [
             {
@@ -12970,6 +13002,31 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 31, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_dstPort", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 24, 
+                      "POSITIONOFFSET": 33
+                    }, 
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 23, 
+                      "FIELDMSB": 31, 
+                      "PHVNAME": "tcp_seqNo", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 76
+                    }
+                  ], 
+                  "PHVNUMBER": 3
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 8, 
                       "PHVMSB": 31, 
@@ -12980,7 +13037,7 @@
                       "POSITIONOFFSET": 20
                     }
                   ], 
-                  "PHVNUMBER": 3
+                  "PHVNUMBER": 4
                 }, 
                 {
                   "PHVRECORD": [
@@ -12995,31 +13052,6 @@
                       "POSITIONOFFSET": 70
                     }
                   ], 
-                  "PHVNUMBER": 4
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 31, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_srcPort", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 16, 
-                      "POSITIONOFFSET": 66
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_dstPort", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 55
-                    }
-                  ], 
                   "PHVNUMBER": 5
                 }, 
                 {
@@ -13029,10 +13061,10 @@
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "ecmp_metadata_group_id", 
+                      "PHVNAME": "ethernet_etherType", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 36
+                      "POSITIONOFFSET": 5
                     }
                   ], 
                   "PHVNUMBER": 134
@@ -13065,17 +13097,17 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 16, 
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
                       "PHVMSB": 15, 
-                      "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_ackNo", 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "ecmp_metadata_selector", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 26
+                      "POSITIONOFFSET": 61
                     }
                   ], 
-                  "PHVNUMBER": 324
+                  "PHVNUMBER": 136
                 }, 
                 {
                   "PHVRECORD": [
@@ -13205,6 +13237,31 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_srcPort", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 8, 
+                      "POSITIONOFFSET": 38
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_dstPort", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 33
+                    }
+                  ], 
+                  "PHVNUMBER": 132
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
@@ -13225,21 +13282,6 @@
                       "POSITIONOFFSET": 70
                     }
                   ], 
-                  "PHVNUMBER": 132
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "ethernet_etherType", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 5
-                    }
-                  ], 
                   "PHVNUMBER": 133
                 }, 
                 {
@@ -13270,24 +13312,24 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 8, 
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 0, 
                       "PHVMSB": 7, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_srcPort", 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_seqNo", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
+                      "POSITIONOFFSET": 76
                     }, 
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 8, 
                       "PHVMSB": 7, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "udp_length_", 
+                      "PHVNAME": "udp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 17
+                      "POSITIONOFFSET": 66
                     }
                   ], 
                   "PHVNUMBER": 289
@@ -13297,67 +13339,12 @@
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 0, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "tcp_srcPort", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "udp_length_", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 17
-                    }
-                  ], 
-                  "PHVNUMBER": 290
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 8, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_dstPort", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 33
-                    }
-                  ], 
-                  "PHVNUMBER": 291
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "tcp_dstPort", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 33
-                    }
-                  ], 
-                  "PHVNUMBER": 292
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "ecmp_metadata_selector", 
+                      "PHVNAME": "ecmp_metadata_group_id", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 61
+                      "POSITIONOFFSET": 36
                     }
                   ], 
                   "PHVNUMBER": 135
@@ -13413,6 +13400,26 @@
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
                       "POSITIONOFFSET": 46
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 31, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_length_", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 16, 
+                      "POSITIONOFFSET": 17
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_checksum", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 68
                     }
                   ], 
                   "PHVNUMBER": 257
@@ -13460,6 +13467,31 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_srcPort", 
+                      "CONTAINERWIDTH": 8, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 38
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "udp_srcPort", 
+                      "CONTAINERWIDTH": 8, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 66
+                    }
+                  ], 
+                  "PHVNUMBER": 65
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 40, 
                       "PHVMSB": 7, 
@@ -13470,7 +13502,7 @@
                       "POSITIONOFFSET": 20
                     }
                   ], 
-                  "PHVNUMBER": 65
+                  "PHVNUMBER": 66
                 }, 
                 {
                   "PHVRECORD": [
@@ -13485,7 +13517,7 @@
                       "POSITIONOFFSET": 70
                     }
                   ], 
-                  "PHVNUMBER": 66
+                  "PHVNUMBER": 67
                 }, 
                 {
                   "PHVRECORD": [
@@ -13536,7 +13568,7 @@
                       ]
                     }
                   ], 
-                  "PHVNUMBER": 67
+                  "PHVNUMBER": 68
                 }, 
                 {
                   "PHVRECORD": [
@@ -13551,22 +13583,7 @@
                       "POSITIONOFFSET": 51
                     }
                   ], 
-                  "PHVNUMBER": 68
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_ackNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 26
-                    }
-                  ], 
-                  "PHVNUMBER": 325
+                  "PHVNUMBER": 69
                 }, 
                 {
                   "PHVRECORD": [
@@ -13600,20 +13617,20 @@
                       "FIELDLSB": 16, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_seqNo", 
+                      "PHVNAME": "tcp_ackNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 76
+                      "POSITIONOFFSET": 26
                     }, 
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "udp_checksum", 
+                      "PHVNAME": "udp_dstPort", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 68
+                      "POSITIONOFFSET": 55
                     }
                   ], 
                   "PHVNUMBER": 322
@@ -13625,16 +13642,16 @@
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_seqNo", 
+                      "PHVNAME": "tcp_ackNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 76
+                      "POSITIONOFFSET": 26
                     }
                   ], 
                   "PHVNUMBER": 323
                 }
               ], 
-              "TOTALINGRESSPHVS": 33
+              "TOTALINGRESSPHVS": 30
             }, 
             {
               "PHVDIRECTION": 1, 
@@ -13672,7 +13689,7 @@
                       "POSITIONOFFSET": 9
                     }
                   ], 
-                  "PHVNUMBER": 264
+                  "PHVNUMBER": 260
                 }, 
                 {
                   "PHVRECORD": [
@@ -13687,7 +13704,7 @@
                       "POSITIONOFFSET": 12
                     }
                   ], 
-                  "PHVNUMBER": 265
+                  "PHVNUMBER": 261
                 }, 
                 {
                   "PHVRECORD": [
@@ -13702,7 +13719,7 @@
                       "POSITIONOFFSET": 50
                     }
                   ], 
-                  "PHVNUMBER": 266
+                  "PHVNUMBER": 262
                 }, 
                 {
                   "PHVRECORD": [
@@ -13737,7 +13754,7 @@
                       "POSITIONOFFSET": 59
                     }
                   ], 
-                  "PHVNUMBER": 267
+                  "PHVNUMBER": 263
                 }, 
                 {
                   "PHVRECORD": [
@@ -13792,7 +13809,7 @@
                       "POSITIONOFFSET": 41
                     }
                   ], 
-                  "PHVNUMBER": 268
+                  "PHVNUMBER": 264
                 }, 
                 {
                   "PHVRECORD": [
@@ -13817,7 +13834,7 @@
                       "POSITIONOFFSET": 45
                     }
                   ], 
-                  "PHVNUMBER": 269
+                  "PHVNUMBER": 265
                 }, 
                 {
                   "PHVRECORD": [
@@ -13832,7 +13849,7 @@
                       "POSITIONOFFSET": 19
                     }
                   ], 
-                  "PHVNUMBER": 270
+                  "PHVNUMBER": 266
                 }, 
                 {
                   "PHVRECORD": [
@@ -13847,7 +13864,7 @@
                       "POSITIONOFFSET": 63
                     }
                   ], 
-                  "PHVNUMBER": 271
+                  "PHVNUMBER": 267
                 }, 
                 {
                   "PHVRECORD": [
@@ -13887,7 +13904,7 @@
                       "POSITIONOFFSET": 37
                     }
                   ], 
-                  "PHVNUMBER": 296
+                  "PHVNUMBER": 292
                 }, 
                 {
                   "PHVRECORD": [
@@ -13902,7 +13919,7 @@
                       "POSITIONOFFSET": 4
                     }
                   ], 
-                  "PHVNUMBER": 297
+                  "PHVNUMBER": 293
                 }, 
                 {
                   "PHVRECORD": [
@@ -13927,7 +13944,7 @@
                       "POSITIONOFFSET": 56
                     }
                   ], 
-                  "PHVNUMBER": 298
+                  "PHVNUMBER": 294
                 }, 
                 {
                   "PHVRECORD": [
@@ -13952,7 +13969,7 @@
                       "POSITIONOFFSET": 56
                     }
                   ], 
-                  "PHVNUMBER": 299
+                  "PHVNUMBER": 295
                 }, 
                 {
                   "PHVRECORD": [
@@ -13967,7 +13984,7 @@
                       "POSITIONOFFSET": 19
                     }
                   ], 
-                  "PHVNUMBER": 300
+                  "PHVNUMBER": 296
                 }, 
                 {
                   "PHVRECORD": [
@@ -13982,7 +13999,7 @@
                       "POSITIONOFFSET": 63
                     }
                   ], 
-                  "PHVNUMBER": 301
+                  "PHVNUMBER": 297
                 }, 
                 {
                   "PHVRECORD": [
@@ -13997,7 +14014,7 @@
                       "POSITIONOFFSET": 54
                     }
                   ], 
-                  "PHVNUMBER": 332
+                  "PHVNUMBER": 326
                 }, 
                 {
                   "PHVRECORD": [
@@ -14012,7 +14029,7 @@
                       "POSITIONOFFSET": 43
                     }
                   ], 
-                  "PHVNUMBER": 333
+                  "PHVNUMBER": 327
                 }, 
                 {
                   "PHVRECORD": [
@@ -14037,7 +14054,7 @@
                       "POSITIONOFFSET": 5
                     }
                   ], 
-                  "PHVNUMBER": 334
+                  "PHVNUMBER": 328
                 }, 
                 {
                   "PHVRECORD": [
@@ -14050,9 +14067,114 @@
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
                       "POSITIONOFFSET": 32
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_dstPort", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 48
                     }
                   ], 
-                  "PHVNUMBER": 335
+                  "PHVNUMBER": 329
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 16, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 31, 
+                      "PHVNAME": "tcp_seqNo", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 69
+                    }
+                  ], 
+                  "PHVNUMBER": 330
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_seqNo", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 69
+                    }
+                  ], 
+                  "PHVNUMBER": 331
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 6, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "ethernet_dstAddr", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 8, 
+                      "POSITIONOFFSET": 19
+                    }, 
+                    {
+                      "FIELDWIDTH": 6, 
+                      "FIELDLSB": 40, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 47, 
+                      "PHVNAME": "ethernet_srcAddr", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 63
+                    }
+                  ], 
+                  "PHVNUMBER": 332
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "ethernet_etherType", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 39
+                    }
+                  ], 
+                  "PHVNUMBER": 333
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 8, 
+                      "PHVNAME": "packet_out_hdr_egress_port", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 7, 
+                      "POSITIONOFFSET": 0
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 8, 
+                      "PHVNAME": "packet_in_hdr_ingress_port", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 7, 
+                      "POSITIONOFFSET": 30
+                    }
+                  ], 
+                  "PHVNUMBER": 334
                 }, 
                 {
                   "PHVRECORD": [
@@ -14119,111 +14241,6 @@
                     }
                   ], 
                   "PHVNUMBER": 81
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 6, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "ethernet_dstAddr", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 8, 
-                      "POSITIONOFFSET": 19
-                    }, 
-                    {
-                      "FIELDWIDTH": 6, 
-                      "FIELDLSB": 40, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 47, 
-                      "PHVNAME": "ethernet_srcAddr", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 63
-                    }
-                  ], 
-                  "PHVNUMBER": 338
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "ethernet_etherType", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 39
-                    }
-                  ], 
-                  "PHVNUMBER": 339
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 8, 
-                      "PHVNAME": "packet_out_hdr_egress_port", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 7, 
-                      "POSITIONOFFSET": 0
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 8, 
-                      "PHVNAME": "packet_in_hdr_ingress_port", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 7, 
-                      "POSITIONOFFSET": 30
-                    }
-                  ], 
-                  "PHVNUMBER": 340
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 16, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_seqNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 69
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_dstPort", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 48
-                    }
-                  ], 
-                  "PHVNUMBER": 336
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_seqNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 69
-                    }
-                  ], 
-                  "PHVNUMBER": 337
                 }
               ], 
               "TOTALEGRESSPHVS": 26
@@ -14233,7 +14250,7 @@
         }, 
         {
           "TOTALPOVHEADERS": 13, 
-          "TOTALSTAGEPHVS": 59, 
+          "TOTALSTAGEPHVS": 56, 
           "TOTALPHVRECORDS": 95, 
           "Phvs": [
             {
@@ -14313,6 +14330,31 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 31, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_dstPort", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 24, 
+                      "POSITIONOFFSET": 33
+                    }, 
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 23, 
+                      "FIELDMSB": 31, 
+                      "PHVNAME": "tcp_seqNo", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 76
+                    }
+                  ], 
+                  "PHVNUMBER": 3
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 8, 
                       "PHVMSB": 31, 
@@ -14323,7 +14365,7 @@
                       "POSITIONOFFSET": 20
                     }
                   ], 
-                  "PHVNUMBER": 3
+                  "PHVNUMBER": 4
                 }, 
                 {
                   "PHVRECORD": [
@@ -14338,31 +14380,6 @@
                       "POSITIONOFFSET": 70
                     }
                   ], 
-                  "PHVNUMBER": 4
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 31, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_srcPort", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 16, 
-                      "POSITIONOFFSET": 66
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_dstPort", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 55
-                    }
-                  ], 
                   "PHVNUMBER": 5
                 }, 
                 {
@@ -14372,10 +14389,10 @@
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "ecmp_metadata_group_id", 
+                      "PHVNAME": "ethernet_etherType", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 36
+                      "POSITIONOFFSET": 5
                     }
                   ], 
                   "PHVNUMBER": 134
@@ -14408,17 +14425,17 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 16, 
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
                       "PHVMSB": 15, 
-                      "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_ackNo", 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "ecmp_metadata_selector", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 26
+                      "POSITIONOFFSET": 61
                     }
                   ], 
-                  "PHVNUMBER": 324
+                  "PHVNUMBER": 136
                 }, 
                 {
                   "PHVRECORD": [
@@ -14548,6 +14565,31 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_srcPort", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 8, 
+                      "POSITIONOFFSET": 38
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_dstPort", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 33
+                    }
+                  ], 
+                  "PHVNUMBER": 132
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
@@ -14568,21 +14610,6 @@
                       "POSITIONOFFSET": 70
                     }
                   ], 
-                  "PHVNUMBER": 132
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "ethernet_etherType", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 5
-                    }
-                  ], 
                   "PHVNUMBER": 133
                 }, 
                 {
@@ -14613,24 +14640,24 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 8, 
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 0, 
                       "PHVMSB": 7, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_srcPort", 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_seqNo", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
+                      "POSITIONOFFSET": 76
                     }, 
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 8, 
                       "PHVMSB": 7, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "udp_length_", 
+                      "PHVNAME": "udp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 17
+                      "POSITIONOFFSET": 66
                     }
                   ], 
                   "PHVNUMBER": 289
@@ -14640,67 +14667,12 @@
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 0, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "tcp_srcPort", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "udp_length_", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 17
-                    }
-                  ], 
-                  "PHVNUMBER": 290
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 8, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_dstPort", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 33
-                    }
-                  ], 
-                  "PHVNUMBER": 291
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "tcp_dstPort", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 33
-                    }
-                  ], 
-                  "PHVNUMBER": 292
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "ecmp_metadata_selector", 
+                      "PHVNAME": "ecmp_metadata_group_id", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 61
+                      "POSITIONOFFSET": 36
                     }
                   ], 
                   "PHVNUMBER": 135
@@ -14756,6 +14728,26 @@
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
                       "POSITIONOFFSET": 46
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 31, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_length_", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 16, 
+                      "POSITIONOFFSET": 17
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_checksum", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 68
                     }
                   ], 
                   "PHVNUMBER": 257
@@ -14803,6 +14795,31 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_srcPort", 
+                      "CONTAINERWIDTH": 8, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 38
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "udp_srcPort", 
+                      "CONTAINERWIDTH": 8, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 66
+                    }
+                  ], 
+                  "PHVNUMBER": 65
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 40, 
                       "PHVMSB": 7, 
@@ -14813,7 +14830,7 @@
                       "POSITIONOFFSET": 20
                     }
                   ], 
-                  "PHVNUMBER": 65
+                  "PHVNUMBER": 66
                 }, 
                 {
                   "PHVRECORD": [
@@ -14828,7 +14845,7 @@
                       "POSITIONOFFSET": 70
                     }
                   ], 
-                  "PHVNUMBER": 66
+                  "PHVNUMBER": 67
                 }, 
                 {
                   "PHVRECORD": [
@@ -14879,7 +14896,7 @@
                       ]
                     }
                   ], 
-                  "PHVNUMBER": 67
+                  "PHVNUMBER": 68
                 }, 
                 {
                   "PHVRECORD": [
@@ -14894,22 +14911,7 @@
                       "POSITIONOFFSET": 51
                     }
                   ], 
-                  "PHVNUMBER": 68
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_ackNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 26
-                    }
-                  ], 
-                  "PHVNUMBER": 325
+                  "PHVNUMBER": 69
                 }, 
                 {
                   "PHVRECORD": [
@@ -14943,20 +14945,20 @@
                       "FIELDLSB": 16, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_seqNo", 
+                      "PHVNAME": "tcp_ackNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 76
+                      "POSITIONOFFSET": 26
                     }, 
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "udp_checksum", 
+                      "PHVNAME": "udp_dstPort", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 68
+                      "POSITIONOFFSET": 55
                     }
                   ], 
                   "PHVNUMBER": 322
@@ -14968,16 +14970,16 @@
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_seqNo", 
+                      "PHVNAME": "tcp_ackNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 76
+                      "POSITIONOFFSET": 26
                     }
                   ], 
                   "PHVNUMBER": 323
                 }
               ], 
-              "TOTALINGRESSPHVS": 33
+              "TOTALINGRESSPHVS": 30
             }, 
             {
               "PHVDIRECTION": 1, 
@@ -15015,7 +15017,7 @@
                       "POSITIONOFFSET": 9
                     }
                   ], 
-                  "PHVNUMBER": 264
+                  "PHVNUMBER": 260
                 }, 
                 {
                   "PHVRECORD": [
@@ -15030,7 +15032,7 @@
                       "POSITIONOFFSET": 12
                     }
                   ], 
-                  "PHVNUMBER": 265
+                  "PHVNUMBER": 261
                 }, 
                 {
                   "PHVRECORD": [
@@ -15045,7 +15047,7 @@
                       "POSITIONOFFSET": 50
                     }
                   ], 
-                  "PHVNUMBER": 266
+                  "PHVNUMBER": 262
                 }, 
                 {
                   "PHVRECORD": [
@@ -15080,7 +15082,7 @@
                       "POSITIONOFFSET": 59
                     }
                   ], 
-                  "PHVNUMBER": 267
+                  "PHVNUMBER": 263
                 }, 
                 {
                   "PHVRECORD": [
@@ -15135,7 +15137,7 @@
                       "POSITIONOFFSET": 41
                     }
                   ], 
-                  "PHVNUMBER": 268
+                  "PHVNUMBER": 264
                 }, 
                 {
                   "PHVRECORD": [
@@ -15160,7 +15162,7 @@
                       "POSITIONOFFSET": 45
                     }
                   ], 
-                  "PHVNUMBER": 269
+                  "PHVNUMBER": 265
                 }, 
                 {
                   "PHVRECORD": [
@@ -15175,7 +15177,7 @@
                       "POSITIONOFFSET": 19
                     }
                   ], 
-                  "PHVNUMBER": 270
+                  "PHVNUMBER": 266
                 }, 
                 {
                   "PHVRECORD": [
@@ -15190,7 +15192,7 @@
                       "POSITIONOFFSET": 63
                     }
                   ], 
-                  "PHVNUMBER": 271
+                  "PHVNUMBER": 267
                 }, 
                 {
                   "PHVRECORD": [
@@ -15230,7 +15232,7 @@
                       "POSITIONOFFSET": 37
                     }
                   ], 
-                  "PHVNUMBER": 296
+                  "PHVNUMBER": 292
                 }, 
                 {
                   "PHVRECORD": [
@@ -15245,7 +15247,7 @@
                       "POSITIONOFFSET": 4
                     }
                   ], 
-                  "PHVNUMBER": 297
+                  "PHVNUMBER": 293
                 }, 
                 {
                   "PHVRECORD": [
@@ -15270,7 +15272,7 @@
                       "POSITIONOFFSET": 56
                     }
                   ], 
-                  "PHVNUMBER": 298
+                  "PHVNUMBER": 294
                 }, 
                 {
                   "PHVRECORD": [
@@ -15295,7 +15297,7 @@
                       "POSITIONOFFSET": 56
                     }
                   ], 
-                  "PHVNUMBER": 299
+                  "PHVNUMBER": 295
                 }, 
                 {
                   "PHVRECORD": [
@@ -15310,7 +15312,7 @@
                       "POSITIONOFFSET": 19
                     }
                   ], 
-                  "PHVNUMBER": 300
+                  "PHVNUMBER": 296
                 }, 
                 {
                   "PHVRECORD": [
@@ -15325,7 +15327,7 @@
                       "POSITIONOFFSET": 63
                     }
                   ], 
-                  "PHVNUMBER": 301
+                  "PHVNUMBER": 297
                 }, 
                 {
                   "PHVRECORD": [
@@ -15340,7 +15342,7 @@
                       "POSITIONOFFSET": 54
                     }
                   ], 
-                  "PHVNUMBER": 332
+                  "PHVNUMBER": 326
                 }, 
                 {
                   "PHVRECORD": [
@@ -15355,7 +15357,7 @@
                       "POSITIONOFFSET": 43
                     }
                   ], 
-                  "PHVNUMBER": 333
+                  "PHVNUMBER": 327
                 }, 
                 {
                   "PHVRECORD": [
@@ -15380,7 +15382,7 @@
                       "POSITIONOFFSET": 5
                     }
                   ], 
-                  "PHVNUMBER": 334
+                  "PHVNUMBER": 328
                 }, 
                 {
                   "PHVRECORD": [
@@ -15393,9 +15395,114 @@
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
                       "POSITIONOFFSET": 32
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_dstPort", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 48
                     }
                   ], 
-                  "PHVNUMBER": 335
+                  "PHVNUMBER": 329
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 16, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 31, 
+                      "PHVNAME": "tcp_seqNo", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 69
+                    }
+                  ], 
+                  "PHVNUMBER": 330
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_seqNo", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 69
+                    }
+                  ], 
+                  "PHVNUMBER": 331
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 6, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "ethernet_dstAddr", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 8, 
+                      "POSITIONOFFSET": 19
+                    }, 
+                    {
+                      "FIELDWIDTH": 6, 
+                      "FIELDLSB": 40, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 47, 
+                      "PHVNAME": "ethernet_srcAddr", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 63
+                    }
+                  ], 
+                  "PHVNUMBER": 332
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "ethernet_etherType", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 39
+                    }
+                  ], 
+                  "PHVNUMBER": 333
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 8, 
+                      "PHVNAME": "packet_out_hdr_egress_port", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 7, 
+                      "POSITIONOFFSET": 0
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 8, 
+                      "PHVNAME": "packet_in_hdr_ingress_port", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 7, 
+                      "POSITIONOFFSET": 30
+                    }
+                  ], 
+                  "PHVNUMBER": 334
                 }, 
                 {
                   "PHVRECORD": [
@@ -15462,111 +15569,6 @@
                     }
                   ], 
                   "PHVNUMBER": 81
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 6, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "ethernet_dstAddr", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 8, 
-                      "POSITIONOFFSET": 19
-                    }, 
-                    {
-                      "FIELDWIDTH": 6, 
-                      "FIELDLSB": 40, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 47, 
-                      "PHVNAME": "ethernet_srcAddr", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 63
-                    }
-                  ], 
-                  "PHVNUMBER": 338
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "ethernet_etherType", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 39
-                    }
-                  ], 
-                  "PHVNUMBER": 339
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 8, 
-                      "PHVNAME": "packet_out_hdr_egress_port", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 7, 
-                      "POSITIONOFFSET": 0
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 8, 
-                      "PHVNAME": "packet_in_hdr_ingress_port", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 7, 
-                      "POSITIONOFFSET": 30
-                    }
-                  ], 
-                  "PHVNUMBER": 340
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 16, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_seqNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 69
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_dstPort", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 48
-                    }
-                  ], 
-                  "PHVNUMBER": 336
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_seqNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 69
-                    }
-                  ], 
-                  "PHVNUMBER": 337
                 }
               ], 
               "TOTALEGRESSPHVS": 26
@@ -15576,7 +15578,7 @@
         }, 
         {
           "TOTALPOVHEADERS": 13, 
-          "TOTALSTAGEPHVS": 59, 
+          "TOTALSTAGEPHVS": 56, 
           "TOTALPHVRECORDS": 95, 
           "Phvs": [
             {
@@ -15656,6 +15658,31 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 31, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_dstPort", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 24, 
+                      "POSITIONOFFSET": 33
+                    }, 
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 23, 
+                      "FIELDMSB": 31, 
+                      "PHVNAME": "tcp_seqNo", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 76
+                    }
+                  ], 
+                  "PHVNUMBER": 3
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 8, 
                       "PHVMSB": 31, 
@@ -15666,7 +15693,7 @@
                       "POSITIONOFFSET": 20
                     }
                   ], 
-                  "PHVNUMBER": 3
+                  "PHVNUMBER": 4
                 }, 
                 {
                   "PHVRECORD": [
@@ -15681,31 +15708,6 @@
                       "POSITIONOFFSET": 70
                     }
                   ], 
-                  "PHVNUMBER": 4
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 31, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_srcPort", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 16, 
-                      "POSITIONOFFSET": 66
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_dstPort", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 55
-                    }
-                  ], 
                   "PHVNUMBER": 5
                 }, 
                 {
@@ -15715,10 +15717,10 @@
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "ecmp_metadata_group_id", 
+                      "PHVNAME": "ethernet_etherType", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 36
+                      "POSITIONOFFSET": 5
                     }
                   ], 
                   "PHVNUMBER": 134
@@ -15751,17 +15753,17 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 16, 
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
                       "PHVMSB": 15, 
-                      "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_ackNo", 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "ecmp_metadata_selector", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 26
+                      "POSITIONOFFSET": 61
                     }
                   ], 
-                  "PHVNUMBER": 324
+                  "PHVNUMBER": 136
                 }, 
                 {
                   "PHVRECORD": [
@@ -15891,6 +15893,31 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_srcPort", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 8, 
+                      "POSITIONOFFSET": 38
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_dstPort", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 33
+                    }
+                  ], 
+                  "PHVNUMBER": 132
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
@@ -15911,21 +15938,6 @@
                       "POSITIONOFFSET": 70
                     }
                   ], 
-                  "PHVNUMBER": 132
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "ethernet_etherType", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 5
-                    }
-                  ], 
                   "PHVNUMBER": 133
                 }, 
                 {
@@ -15956,24 +15968,24 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 8, 
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 0, 
                       "PHVMSB": 7, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_srcPort", 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_seqNo", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
+                      "POSITIONOFFSET": 76
                     }, 
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 8, 
                       "PHVMSB": 7, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "udp_length_", 
+                      "PHVNAME": "udp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 17
+                      "POSITIONOFFSET": 66
                     }
                   ], 
                   "PHVNUMBER": 289
@@ -15983,67 +15995,12 @@
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 0, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "tcp_srcPort", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "udp_length_", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 17
-                    }
-                  ], 
-                  "PHVNUMBER": 290
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 8, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_dstPort", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 33
-                    }
-                  ], 
-                  "PHVNUMBER": 291
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "tcp_dstPort", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 33
-                    }
-                  ], 
-                  "PHVNUMBER": 292
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "ecmp_metadata_selector", 
+                      "PHVNAME": "ecmp_metadata_group_id", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 61
+                      "POSITIONOFFSET": 36
                     }
                   ], 
                   "PHVNUMBER": 135
@@ -16099,6 +16056,26 @@
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
                       "POSITIONOFFSET": 46
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 31, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_length_", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 16, 
+                      "POSITIONOFFSET": 17
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_checksum", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 68
                     }
                   ], 
                   "PHVNUMBER": 257
@@ -16146,6 +16123,31 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_srcPort", 
+                      "CONTAINERWIDTH": 8, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 38
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "udp_srcPort", 
+                      "CONTAINERWIDTH": 8, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 66
+                    }
+                  ], 
+                  "PHVNUMBER": 65
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 40, 
                       "PHVMSB": 7, 
@@ -16156,7 +16158,7 @@
                       "POSITIONOFFSET": 20
                     }
                   ], 
-                  "PHVNUMBER": 65
+                  "PHVNUMBER": 66
                 }, 
                 {
                   "PHVRECORD": [
@@ -16171,7 +16173,7 @@
                       "POSITIONOFFSET": 70
                     }
                   ], 
-                  "PHVNUMBER": 66
+                  "PHVNUMBER": 67
                 }, 
                 {
                   "PHVRECORD": [
@@ -16222,7 +16224,7 @@
                       ]
                     }
                   ], 
-                  "PHVNUMBER": 67
+                  "PHVNUMBER": 68
                 }, 
                 {
                   "PHVRECORD": [
@@ -16237,22 +16239,7 @@
                       "POSITIONOFFSET": 51
                     }
                   ], 
-                  "PHVNUMBER": 68
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_ackNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 26
-                    }
-                  ], 
-                  "PHVNUMBER": 325
+                  "PHVNUMBER": 69
                 }, 
                 {
                   "PHVRECORD": [
@@ -16286,20 +16273,20 @@
                       "FIELDLSB": 16, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_seqNo", 
+                      "PHVNAME": "tcp_ackNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 76
+                      "POSITIONOFFSET": 26
                     }, 
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "udp_checksum", 
+                      "PHVNAME": "udp_dstPort", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 68
+                      "POSITIONOFFSET": 55
                     }
                   ], 
                   "PHVNUMBER": 322
@@ -16311,16 +16298,16 @@
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_seqNo", 
+                      "PHVNAME": "tcp_ackNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 76
+                      "POSITIONOFFSET": 26
                     }
                   ], 
                   "PHVNUMBER": 323
                 }
               ], 
-              "TOTALINGRESSPHVS": 33
+              "TOTALINGRESSPHVS": 30
             }, 
             {
               "PHVDIRECTION": 1, 
@@ -16358,7 +16345,7 @@
                       "POSITIONOFFSET": 9
                     }
                   ], 
-                  "PHVNUMBER": 264
+                  "PHVNUMBER": 260
                 }, 
                 {
                   "PHVRECORD": [
@@ -16373,7 +16360,7 @@
                       "POSITIONOFFSET": 12
                     }
                   ], 
-                  "PHVNUMBER": 265
+                  "PHVNUMBER": 261
                 }, 
                 {
                   "PHVRECORD": [
@@ -16388,7 +16375,7 @@
                       "POSITIONOFFSET": 50
                     }
                   ], 
-                  "PHVNUMBER": 266
+                  "PHVNUMBER": 262
                 }, 
                 {
                   "PHVRECORD": [
@@ -16423,7 +16410,7 @@
                       "POSITIONOFFSET": 59
                     }
                   ], 
-                  "PHVNUMBER": 267
+                  "PHVNUMBER": 263
                 }, 
                 {
                   "PHVRECORD": [
@@ -16478,7 +16465,7 @@
                       "POSITIONOFFSET": 41
                     }
                   ], 
-                  "PHVNUMBER": 268
+                  "PHVNUMBER": 264
                 }, 
                 {
                   "PHVRECORD": [
@@ -16503,7 +16490,7 @@
                       "POSITIONOFFSET": 45
                     }
                   ], 
-                  "PHVNUMBER": 269
+                  "PHVNUMBER": 265
                 }, 
                 {
                   "PHVRECORD": [
@@ -16518,7 +16505,7 @@
                       "POSITIONOFFSET": 19
                     }
                   ], 
-                  "PHVNUMBER": 270
+                  "PHVNUMBER": 266
                 }, 
                 {
                   "PHVRECORD": [
@@ -16533,7 +16520,7 @@
                       "POSITIONOFFSET": 63
                     }
                   ], 
-                  "PHVNUMBER": 271
+                  "PHVNUMBER": 267
                 }, 
                 {
                   "PHVRECORD": [
@@ -16573,7 +16560,7 @@
                       "POSITIONOFFSET": 37
                     }
                   ], 
-                  "PHVNUMBER": 296
+                  "PHVNUMBER": 292
                 }, 
                 {
                   "PHVRECORD": [
@@ -16588,7 +16575,7 @@
                       "POSITIONOFFSET": 4
                     }
                   ], 
-                  "PHVNUMBER": 297
+                  "PHVNUMBER": 293
                 }, 
                 {
                   "PHVRECORD": [
@@ -16613,7 +16600,7 @@
                       "POSITIONOFFSET": 56
                     }
                   ], 
-                  "PHVNUMBER": 298
+                  "PHVNUMBER": 294
                 }, 
                 {
                   "PHVRECORD": [
@@ -16638,7 +16625,7 @@
                       "POSITIONOFFSET": 56
                     }
                   ], 
-                  "PHVNUMBER": 299
+                  "PHVNUMBER": 295
                 }, 
                 {
                   "PHVRECORD": [
@@ -16653,7 +16640,7 @@
                       "POSITIONOFFSET": 19
                     }
                   ], 
-                  "PHVNUMBER": 300
+                  "PHVNUMBER": 296
                 }, 
                 {
                   "PHVRECORD": [
@@ -16668,7 +16655,7 @@
                       "POSITIONOFFSET": 63
                     }
                   ], 
-                  "PHVNUMBER": 301
+                  "PHVNUMBER": 297
                 }, 
                 {
                   "PHVRECORD": [
@@ -16683,7 +16670,7 @@
                       "POSITIONOFFSET": 54
                     }
                   ], 
-                  "PHVNUMBER": 332
+                  "PHVNUMBER": 326
                 }, 
                 {
                   "PHVRECORD": [
@@ -16698,7 +16685,7 @@
                       "POSITIONOFFSET": 43
                     }
                   ], 
-                  "PHVNUMBER": 333
+                  "PHVNUMBER": 327
                 }, 
                 {
                   "PHVRECORD": [
@@ -16723,7 +16710,7 @@
                       "POSITIONOFFSET": 5
                     }
                   ], 
-                  "PHVNUMBER": 334
+                  "PHVNUMBER": 328
                 }, 
                 {
                   "PHVRECORD": [
@@ -16736,9 +16723,114 @@
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
                       "POSITIONOFFSET": 32
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_dstPort", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 48
                     }
                   ], 
-                  "PHVNUMBER": 335
+                  "PHVNUMBER": 329
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 16, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 31, 
+                      "PHVNAME": "tcp_seqNo", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 69
+                    }
+                  ], 
+                  "PHVNUMBER": 330
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_seqNo", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 69
+                    }
+                  ], 
+                  "PHVNUMBER": 331
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 6, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "ethernet_dstAddr", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 8, 
+                      "POSITIONOFFSET": 19
+                    }, 
+                    {
+                      "FIELDWIDTH": 6, 
+                      "FIELDLSB": 40, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 47, 
+                      "PHVNAME": "ethernet_srcAddr", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 63
+                    }
+                  ], 
+                  "PHVNUMBER": 332
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "ethernet_etherType", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 39
+                    }
+                  ], 
+                  "PHVNUMBER": 333
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 8, 
+                      "PHVNAME": "packet_out_hdr_egress_port", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 7, 
+                      "POSITIONOFFSET": 0
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 8, 
+                      "PHVNAME": "packet_in_hdr_ingress_port", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 7, 
+                      "POSITIONOFFSET": 30
+                    }
+                  ], 
+                  "PHVNUMBER": 334
                 }, 
                 {
                   "PHVRECORD": [
@@ -16805,111 +16897,6 @@
                     }
                   ], 
                   "PHVNUMBER": 81
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 6, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "ethernet_dstAddr", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 8, 
-                      "POSITIONOFFSET": 19
-                    }, 
-                    {
-                      "FIELDWIDTH": 6, 
-                      "FIELDLSB": 40, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 47, 
-                      "PHVNAME": "ethernet_srcAddr", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 63
-                    }
-                  ], 
-                  "PHVNUMBER": 338
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "ethernet_etherType", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 39
-                    }
-                  ], 
-                  "PHVNUMBER": 339
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 8, 
-                      "PHVNAME": "packet_out_hdr_egress_port", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 7, 
-                      "POSITIONOFFSET": 0
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 8, 
-                      "PHVNAME": "packet_in_hdr_ingress_port", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 7, 
-                      "POSITIONOFFSET": 30
-                    }
-                  ], 
-                  "PHVNUMBER": 340
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 16, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_seqNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 69
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_dstPort", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 48
-                    }
-                  ], 
-                  "PHVNUMBER": 336
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_seqNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 69
-                    }
-                  ], 
-                  "PHVNUMBER": 337
                 }
               ], 
               "TOTALEGRESSPHVS": 26
@@ -16919,7 +16906,7 @@
         }, 
         {
           "TOTALPOVHEADERS": 13, 
-          "TOTALSTAGEPHVS": 59, 
+          "TOTALSTAGEPHVS": 56, 
           "TOTALPHVRECORDS": 95, 
           "Phvs": [
             {
@@ -16999,6 +16986,31 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 31, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_dstPort", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 24, 
+                      "POSITIONOFFSET": 33
+                    }, 
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 23, 
+                      "FIELDMSB": 31, 
+                      "PHVNAME": "tcp_seqNo", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 76
+                    }
+                  ], 
+                  "PHVNUMBER": 3
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 8, 
                       "PHVMSB": 31, 
@@ -17009,7 +17021,7 @@
                       "POSITIONOFFSET": 20
                     }
                   ], 
-                  "PHVNUMBER": 3
+                  "PHVNUMBER": 4
                 }, 
                 {
                   "PHVRECORD": [
@@ -17024,31 +17036,6 @@
                       "POSITIONOFFSET": 70
                     }
                   ], 
-                  "PHVNUMBER": 4
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 31, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_srcPort", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 16, 
-                      "POSITIONOFFSET": 66
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_dstPort", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 55
-                    }
-                  ], 
                   "PHVNUMBER": 5
                 }, 
                 {
@@ -17058,10 +17045,10 @@
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "ecmp_metadata_group_id", 
+                      "PHVNAME": "ethernet_etherType", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 36
+                      "POSITIONOFFSET": 5
                     }
                   ], 
                   "PHVNUMBER": 134
@@ -17094,17 +17081,17 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 16, 
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
                       "PHVMSB": 15, 
-                      "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_ackNo", 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "ecmp_metadata_selector", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 26
+                      "POSITIONOFFSET": 61
                     }
                   ], 
-                  "PHVNUMBER": 324
+                  "PHVNUMBER": 136
                 }, 
                 {
                   "PHVRECORD": [
@@ -17234,6 +17221,31 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_srcPort", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 8, 
+                      "POSITIONOFFSET": 38
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_dstPort", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 33
+                    }
+                  ], 
+                  "PHVNUMBER": 132
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
@@ -17254,21 +17266,6 @@
                       "POSITIONOFFSET": 70
                     }
                   ], 
-                  "PHVNUMBER": 132
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "ethernet_etherType", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 5
-                    }
-                  ], 
                   "PHVNUMBER": 133
                 }, 
                 {
@@ -17299,24 +17296,24 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 8, 
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 0, 
                       "PHVMSB": 7, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_srcPort", 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_seqNo", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
+                      "POSITIONOFFSET": 76
                     }, 
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 8, 
                       "PHVMSB": 7, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "udp_length_", 
+                      "PHVNAME": "udp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 17
+                      "POSITIONOFFSET": 66
                     }
                   ], 
                   "PHVNUMBER": 289
@@ -17326,67 +17323,12 @@
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 0, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "tcp_srcPort", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "udp_length_", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 17
-                    }
-                  ], 
-                  "PHVNUMBER": 290
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 8, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_dstPort", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 33
-                    }
-                  ], 
-                  "PHVNUMBER": 291
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "tcp_dstPort", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 33
-                    }
-                  ], 
-                  "PHVNUMBER": 292
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "ecmp_metadata_selector", 
+                      "PHVNAME": "ecmp_metadata_group_id", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 61
+                      "POSITIONOFFSET": 36
                     }
                   ], 
                   "PHVNUMBER": 135
@@ -17442,6 +17384,26 @@
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
                       "POSITIONOFFSET": 46
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 31, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_length_", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 16, 
+                      "POSITIONOFFSET": 17
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_checksum", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 68
                     }
                   ], 
                   "PHVNUMBER": 257
@@ -17489,6 +17451,31 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_srcPort", 
+                      "CONTAINERWIDTH": 8, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 38
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "udp_srcPort", 
+                      "CONTAINERWIDTH": 8, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 66
+                    }
+                  ], 
+                  "PHVNUMBER": 65
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 40, 
                       "PHVMSB": 7, 
@@ -17499,7 +17486,7 @@
                       "POSITIONOFFSET": 20
                     }
                   ], 
-                  "PHVNUMBER": 65
+                  "PHVNUMBER": 66
                 }, 
                 {
                   "PHVRECORD": [
@@ -17514,7 +17501,7 @@
                       "POSITIONOFFSET": 70
                     }
                   ], 
-                  "PHVNUMBER": 66
+                  "PHVNUMBER": 67
                 }, 
                 {
                   "PHVRECORD": [
@@ -17565,7 +17552,7 @@
                       ]
                     }
                   ], 
-                  "PHVNUMBER": 67
+                  "PHVNUMBER": 68
                 }, 
                 {
                   "PHVRECORD": [
@@ -17580,22 +17567,7 @@
                       "POSITIONOFFSET": 51
                     }
                   ], 
-                  "PHVNUMBER": 68
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_ackNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 26
-                    }
-                  ], 
-                  "PHVNUMBER": 325
+                  "PHVNUMBER": 69
                 }, 
                 {
                   "PHVRECORD": [
@@ -17629,20 +17601,20 @@
                       "FIELDLSB": 16, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_seqNo", 
+                      "PHVNAME": "tcp_ackNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 76
+                      "POSITIONOFFSET": 26
                     }, 
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "udp_checksum", 
+                      "PHVNAME": "udp_dstPort", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 68
+                      "POSITIONOFFSET": 55
                     }
                   ], 
                   "PHVNUMBER": 322
@@ -17654,16 +17626,16 @@
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_seqNo", 
+                      "PHVNAME": "tcp_ackNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 76
+                      "POSITIONOFFSET": 26
                     }
                   ], 
                   "PHVNUMBER": 323
                 }
               ], 
-              "TOTALINGRESSPHVS": 33
+              "TOTALINGRESSPHVS": 30
             }, 
             {
               "PHVDIRECTION": 1, 
@@ -17701,7 +17673,7 @@
                       "POSITIONOFFSET": 9
                     }
                   ], 
-                  "PHVNUMBER": 264
+                  "PHVNUMBER": 260
                 }, 
                 {
                   "PHVRECORD": [
@@ -17716,7 +17688,7 @@
                       "POSITIONOFFSET": 12
                     }
                   ], 
-                  "PHVNUMBER": 265
+                  "PHVNUMBER": 261
                 }, 
                 {
                   "PHVRECORD": [
@@ -17731,7 +17703,7 @@
                       "POSITIONOFFSET": 50
                     }
                   ], 
-                  "PHVNUMBER": 266
+                  "PHVNUMBER": 262
                 }, 
                 {
                   "PHVRECORD": [
@@ -17766,7 +17738,7 @@
                       "POSITIONOFFSET": 59
                     }
                   ], 
-                  "PHVNUMBER": 267
+                  "PHVNUMBER": 263
                 }, 
                 {
                   "PHVRECORD": [
@@ -17821,7 +17793,7 @@
                       "POSITIONOFFSET": 41
                     }
                   ], 
-                  "PHVNUMBER": 268
+                  "PHVNUMBER": 264
                 }, 
                 {
                   "PHVRECORD": [
@@ -17846,7 +17818,7 @@
                       "POSITIONOFFSET": 45
                     }
                   ], 
-                  "PHVNUMBER": 269
+                  "PHVNUMBER": 265
                 }, 
                 {
                   "PHVRECORD": [
@@ -17861,7 +17833,7 @@
                       "POSITIONOFFSET": 19
                     }
                   ], 
-                  "PHVNUMBER": 270
+                  "PHVNUMBER": 266
                 }, 
                 {
                   "PHVRECORD": [
@@ -17876,7 +17848,7 @@
                       "POSITIONOFFSET": 63
                     }
                   ], 
-                  "PHVNUMBER": 271
+                  "PHVNUMBER": 267
                 }, 
                 {
                   "PHVRECORD": [
@@ -17916,7 +17888,7 @@
                       "POSITIONOFFSET": 37
                     }
                   ], 
-                  "PHVNUMBER": 296
+                  "PHVNUMBER": 292
                 }, 
                 {
                   "PHVRECORD": [
@@ -17931,7 +17903,7 @@
                       "POSITIONOFFSET": 4
                     }
                   ], 
-                  "PHVNUMBER": 297
+                  "PHVNUMBER": 293
                 }, 
                 {
                   "PHVRECORD": [
@@ -17956,7 +17928,7 @@
                       "POSITIONOFFSET": 56
                     }
                   ], 
-                  "PHVNUMBER": 298
+                  "PHVNUMBER": 294
                 }, 
                 {
                   "PHVRECORD": [
@@ -17981,7 +17953,7 @@
                       "POSITIONOFFSET": 56
                     }
                   ], 
-                  "PHVNUMBER": 299
+                  "PHVNUMBER": 295
                 }, 
                 {
                   "PHVRECORD": [
@@ -17996,7 +17968,7 @@
                       "POSITIONOFFSET": 19
                     }
                   ], 
-                  "PHVNUMBER": 300
+                  "PHVNUMBER": 296
                 }, 
                 {
                   "PHVRECORD": [
@@ -18011,7 +17983,7 @@
                       "POSITIONOFFSET": 63
                     }
                   ], 
-                  "PHVNUMBER": 301
+                  "PHVNUMBER": 297
                 }, 
                 {
                   "PHVRECORD": [
@@ -18026,7 +17998,7 @@
                       "POSITIONOFFSET": 54
                     }
                   ], 
-                  "PHVNUMBER": 332
+                  "PHVNUMBER": 326
                 }, 
                 {
                   "PHVRECORD": [
@@ -18041,7 +18013,7 @@
                       "POSITIONOFFSET": 43
                     }
                   ], 
-                  "PHVNUMBER": 333
+                  "PHVNUMBER": 327
                 }, 
                 {
                   "PHVRECORD": [
@@ -18066,7 +18038,7 @@
                       "POSITIONOFFSET": 5
                     }
                   ], 
-                  "PHVNUMBER": 334
+                  "PHVNUMBER": 328
                 }, 
                 {
                   "PHVRECORD": [
@@ -18079,9 +18051,114 @@
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
                       "POSITIONOFFSET": 32
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_dstPort", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 48
                     }
                   ], 
-                  "PHVNUMBER": 335
+                  "PHVNUMBER": 329
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 16, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 31, 
+                      "PHVNAME": "tcp_seqNo", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 69
+                    }
+                  ], 
+                  "PHVNUMBER": 330
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_seqNo", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 69
+                    }
+                  ], 
+                  "PHVNUMBER": 331
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 6, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "ethernet_dstAddr", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 8, 
+                      "POSITIONOFFSET": 19
+                    }, 
+                    {
+                      "FIELDWIDTH": 6, 
+                      "FIELDLSB": 40, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 47, 
+                      "PHVNAME": "ethernet_srcAddr", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 63
+                    }
+                  ], 
+                  "PHVNUMBER": 332
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "ethernet_etherType", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 39
+                    }
+                  ], 
+                  "PHVNUMBER": 333
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 8, 
+                      "PHVNAME": "packet_out_hdr_egress_port", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 7, 
+                      "POSITIONOFFSET": 0
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 8, 
+                      "PHVNAME": "packet_in_hdr_ingress_port", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 7, 
+                      "POSITIONOFFSET": 30
+                    }
+                  ], 
+                  "PHVNUMBER": 334
                 }, 
                 {
                   "PHVRECORD": [
@@ -18148,111 +18225,6 @@
                     }
                   ], 
                   "PHVNUMBER": 81
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 6, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "ethernet_dstAddr", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 8, 
-                      "POSITIONOFFSET": 19
-                    }, 
-                    {
-                      "FIELDWIDTH": 6, 
-                      "FIELDLSB": 40, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 47, 
-                      "PHVNAME": "ethernet_srcAddr", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 63
-                    }
-                  ], 
-                  "PHVNUMBER": 338
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "ethernet_etherType", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 39
-                    }
-                  ], 
-                  "PHVNUMBER": 339
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 8, 
-                      "PHVNAME": "packet_out_hdr_egress_port", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 7, 
-                      "POSITIONOFFSET": 0
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 8, 
-                      "PHVNAME": "packet_in_hdr_ingress_port", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 7, 
-                      "POSITIONOFFSET": 30
-                    }
-                  ], 
-                  "PHVNUMBER": 340
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 16, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_seqNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 69
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_dstPort", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 48
-                    }
-                  ], 
-                  "PHVNUMBER": 336
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_seqNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 69
-                    }
-                  ], 
-                  "PHVNUMBER": 337
                 }
               ], 
               "TOTALEGRESSPHVS": 26
@@ -18262,7 +18234,7 @@
         }, 
         {
           "TOTALPOVHEADERS": 13, 
-          "TOTALSTAGEPHVS": 59, 
+          "TOTALSTAGEPHVS": 56, 
           "TOTALPHVRECORDS": 95, 
           "Phvs": [
             {
@@ -18342,6 +18314,31 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 31, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_dstPort", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 24, 
+                      "POSITIONOFFSET": 33
+                    }, 
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 23, 
+                      "FIELDMSB": 31, 
+                      "PHVNAME": "tcp_seqNo", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 76
+                    }
+                  ], 
+                  "PHVNUMBER": 3
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 8, 
                       "PHVMSB": 31, 
@@ -18352,7 +18349,7 @@
                       "POSITIONOFFSET": 20
                     }
                   ], 
-                  "PHVNUMBER": 3
+                  "PHVNUMBER": 4
                 }, 
                 {
                   "PHVRECORD": [
@@ -18367,31 +18364,6 @@
                       "POSITIONOFFSET": 70
                     }
                   ], 
-                  "PHVNUMBER": 4
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 31, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_srcPort", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 16, 
-                      "POSITIONOFFSET": 66
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_dstPort", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 55
-                    }
-                  ], 
                   "PHVNUMBER": 5
                 }, 
                 {
@@ -18401,10 +18373,10 @@
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "ecmp_metadata_group_id", 
+                      "PHVNAME": "ethernet_etherType", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 36
+                      "POSITIONOFFSET": 5
                     }
                   ], 
                   "PHVNUMBER": 134
@@ -18437,17 +18409,17 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 16, 
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
                       "PHVMSB": 15, 
-                      "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_ackNo", 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "ecmp_metadata_selector", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 26
+                      "POSITIONOFFSET": 61
                     }
                   ], 
-                  "PHVNUMBER": 324
+                  "PHVNUMBER": 136
                 }, 
                 {
                   "PHVRECORD": [
@@ -18577,6 +18549,31 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_srcPort", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 8, 
+                      "POSITIONOFFSET": 38
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_dstPort", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 33
+                    }
+                  ], 
+                  "PHVNUMBER": 132
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
@@ -18597,21 +18594,6 @@
                       "POSITIONOFFSET": 70
                     }
                   ], 
-                  "PHVNUMBER": 132
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "ethernet_etherType", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 5
-                    }
-                  ], 
                   "PHVNUMBER": 133
                 }, 
                 {
@@ -18642,24 +18624,24 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 8, 
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 0, 
                       "PHVMSB": 7, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_srcPort", 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_seqNo", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
+                      "POSITIONOFFSET": 76
                     }, 
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 8, 
                       "PHVMSB": 7, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "udp_length_", 
+                      "PHVNAME": "udp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 17
+                      "POSITIONOFFSET": 66
                     }
                   ], 
                   "PHVNUMBER": 289
@@ -18669,67 +18651,12 @@
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 0, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "tcp_srcPort", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "udp_length_", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 17
-                    }
-                  ], 
-                  "PHVNUMBER": 290
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 8, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_dstPort", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 33
-                    }
-                  ], 
-                  "PHVNUMBER": 291
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "tcp_dstPort", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 33
-                    }
-                  ], 
-                  "PHVNUMBER": 292
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "ecmp_metadata_selector", 
+                      "PHVNAME": "ecmp_metadata_group_id", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 61
+                      "POSITIONOFFSET": 36
                     }
                   ], 
                   "PHVNUMBER": 135
@@ -18785,6 +18712,26 @@
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
                       "POSITIONOFFSET": 46
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 31, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_length_", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 16, 
+                      "POSITIONOFFSET": 17
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_checksum", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 68
                     }
                   ], 
                   "PHVNUMBER": 257
@@ -18832,6 +18779,31 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_srcPort", 
+                      "CONTAINERWIDTH": 8, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 38
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "udp_srcPort", 
+                      "CONTAINERWIDTH": 8, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 66
+                    }
+                  ], 
+                  "PHVNUMBER": 65
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 40, 
                       "PHVMSB": 7, 
@@ -18842,7 +18814,7 @@
                       "POSITIONOFFSET": 20
                     }
                   ], 
-                  "PHVNUMBER": 65
+                  "PHVNUMBER": 66
                 }, 
                 {
                   "PHVRECORD": [
@@ -18857,7 +18829,7 @@
                       "POSITIONOFFSET": 70
                     }
                   ], 
-                  "PHVNUMBER": 66
+                  "PHVNUMBER": 67
                 }, 
                 {
                   "PHVRECORD": [
@@ -18908,7 +18880,7 @@
                       ]
                     }
                   ], 
-                  "PHVNUMBER": 67
+                  "PHVNUMBER": 68
                 }, 
                 {
                   "PHVRECORD": [
@@ -18923,22 +18895,7 @@
                       "POSITIONOFFSET": 51
                     }
                   ], 
-                  "PHVNUMBER": 68
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_ackNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 26
-                    }
-                  ], 
-                  "PHVNUMBER": 325
+                  "PHVNUMBER": 69
                 }, 
                 {
                   "PHVRECORD": [
@@ -18972,20 +18929,20 @@
                       "FIELDLSB": 16, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_seqNo", 
+                      "PHVNAME": "tcp_ackNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 76
+                      "POSITIONOFFSET": 26
                     }, 
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "udp_checksum", 
+                      "PHVNAME": "udp_dstPort", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 68
+                      "POSITIONOFFSET": 55
                     }
                   ], 
                   "PHVNUMBER": 322
@@ -18997,16 +18954,16 @@
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_seqNo", 
+                      "PHVNAME": "tcp_ackNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 76
+                      "POSITIONOFFSET": 26
                     }
                   ], 
                   "PHVNUMBER": 323
                 }
               ], 
-              "TOTALINGRESSPHVS": 33
+              "TOTALINGRESSPHVS": 30
             }, 
             {
               "PHVDIRECTION": 1, 
@@ -19044,7 +19001,7 @@
                       "POSITIONOFFSET": 9
                     }
                   ], 
-                  "PHVNUMBER": 264
+                  "PHVNUMBER": 260
                 }, 
                 {
                   "PHVRECORD": [
@@ -19059,7 +19016,7 @@
                       "POSITIONOFFSET": 12
                     }
                   ], 
-                  "PHVNUMBER": 265
+                  "PHVNUMBER": 261
                 }, 
                 {
                   "PHVRECORD": [
@@ -19074,7 +19031,7 @@
                       "POSITIONOFFSET": 50
                     }
                   ], 
-                  "PHVNUMBER": 266
+                  "PHVNUMBER": 262
                 }, 
                 {
                   "PHVRECORD": [
@@ -19109,7 +19066,7 @@
                       "POSITIONOFFSET": 59
                     }
                   ], 
-                  "PHVNUMBER": 267
+                  "PHVNUMBER": 263
                 }, 
                 {
                   "PHVRECORD": [
@@ -19164,7 +19121,7 @@
                       "POSITIONOFFSET": 41
                     }
                   ], 
-                  "PHVNUMBER": 268
+                  "PHVNUMBER": 264
                 }, 
                 {
                   "PHVRECORD": [
@@ -19189,7 +19146,7 @@
                       "POSITIONOFFSET": 45
                     }
                   ], 
-                  "PHVNUMBER": 269
+                  "PHVNUMBER": 265
                 }, 
                 {
                   "PHVRECORD": [
@@ -19204,7 +19161,7 @@
                       "POSITIONOFFSET": 19
                     }
                   ], 
-                  "PHVNUMBER": 270
+                  "PHVNUMBER": 266
                 }, 
                 {
                   "PHVRECORD": [
@@ -19219,7 +19176,7 @@
                       "POSITIONOFFSET": 63
                     }
                   ], 
-                  "PHVNUMBER": 271
+                  "PHVNUMBER": 267
                 }, 
                 {
                   "PHVRECORD": [
@@ -19259,7 +19216,7 @@
                       "POSITIONOFFSET": 37
                     }
                   ], 
-                  "PHVNUMBER": 296
+                  "PHVNUMBER": 292
                 }, 
                 {
                   "PHVRECORD": [
@@ -19274,7 +19231,7 @@
                       "POSITIONOFFSET": 4
                     }
                   ], 
-                  "PHVNUMBER": 297
+                  "PHVNUMBER": 293
                 }, 
                 {
                   "PHVRECORD": [
@@ -19299,7 +19256,7 @@
                       "POSITIONOFFSET": 56
                     }
                   ], 
-                  "PHVNUMBER": 298
+                  "PHVNUMBER": 294
                 }, 
                 {
                   "PHVRECORD": [
@@ -19324,7 +19281,7 @@
                       "POSITIONOFFSET": 56
                     }
                   ], 
-                  "PHVNUMBER": 299
+                  "PHVNUMBER": 295
                 }, 
                 {
                   "PHVRECORD": [
@@ -19339,7 +19296,7 @@
                       "POSITIONOFFSET": 19
                     }
                   ], 
-                  "PHVNUMBER": 300
+                  "PHVNUMBER": 296
                 }, 
                 {
                   "PHVRECORD": [
@@ -19354,7 +19311,7 @@
                       "POSITIONOFFSET": 63
                     }
                   ], 
-                  "PHVNUMBER": 301
+                  "PHVNUMBER": 297
                 }, 
                 {
                   "PHVRECORD": [
@@ -19369,7 +19326,7 @@
                       "POSITIONOFFSET": 54
                     }
                   ], 
-                  "PHVNUMBER": 332
+                  "PHVNUMBER": 326
                 }, 
                 {
                   "PHVRECORD": [
@@ -19384,7 +19341,7 @@
                       "POSITIONOFFSET": 43
                     }
                   ], 
-                  "PHVNUMBER": 333
+                  "PHVNUMBER": 327
                 }, 
                 {
                   "PHVRECORD": [
@@ -19409,7 +19366,7 @@
                       "POSITIONOFFSET": 5
                     }
                   ], 
-                  "PHVNUMBER": 334
+                  "PHVNUMBER": 328
                 }, 
                 {
                   "PHVRECORD": [
@@ -19422,9 +19379,114 @@
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
                       "POSITIONOFFSET": 32
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_dstPort", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 48
                     }
                   ], 
-                  "PHVNUMBER": 335
+                  "PHVNUMBER": 329
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 16, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 31, 
+                      "PHVNAME": "tcp_seqNo", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 69
+                    }
+                  ], 
+                  "PHVNUMBER": 330
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_seqNo", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 69
+                    }
+                  ], 
+                  "PHVNUMBER": 331
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 6, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "ethernet_dstAddr", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 8, 
+                      "POSITIONOFFSET": 19
+                    }, 
+                    {
+                      "FIELDWIDTH": 6, 
+                      "FIELDLSB": 40, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 47, 
+                      "PHVNAME": "ethernet_srcAddr", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 63
+                    }
+                  ], 
+                  "PHVNUMBER": 332
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "ethernet_etherType", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 39
+                    }
+                  ], 
+                  "PHVNUMBER": 333
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 8, 
+                      "PHVNAME": "packet_out_hdr_egress_port", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 7, 
+                      "POSITIONOFFSET": 0
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 8, 
+                      "PHVNAME": "packet_in_hdr_ingress_port", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 7, 
+                      "POSITIONOFFSET": 30
+                    }
+                  ], 
+                  "PHVNUMBER": 334
                 }, 
                 {
                   "PHVRECORD": [
@@ -19491,111 +19553,6 @@
                     }
                   ], 
                   "PHVNUMBER": 81
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 6, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "ethernet_dstAddr", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 8, 
-                      "POSITIONOFFSET": 19
-                    }, 
-                    {
-                      "FIELDWIDTH": 6, 
-                      "FIELDLSB": 40, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 47, 
-                      "PHVNAME": "ethernet_srcAddr", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 63
-                    }
-                  ], 
-                  "PHVNUMBER": 338
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "ethernet_etherType", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 39
-                    }
-                  ], 
-                  "PHVNUMBER": 339
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 8, 
-                      "PHVNAME": "packet_out_hdr_egress_port", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 7, 
-                      "POSITIONOFFSET": 0
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 8, 
-                      "PHVNAME": "packet_in_hdr_ingress_port", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 7, 
-                      "POSITIONOFFSET": 30
-                    }
-                  ], 
-                  "PHVNUMBER": 340
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 16, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_seqNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 69
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_dstPort", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 48
-                    }
-                  ], 
-                  "PHVNUMBER": 336
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_seqNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 69
-                    }
-                  ], 
-                  "PHVNUMBER": 337
                 }
               ], 
               "TOTALEGRESSPHVS": 26
@@ -19605,7 +19562,7 @@
         }, 
         {
           "TOTALPOVHEADERS": 13, 
-          "TOTALSTAGEPHVS": 59, 
+          "TOTALSTAGEPHVS": 56, 
           "TOTALPHVRECORDS": 95, 
           "Phvs": [
             {
@@ -19685,6 +19642,31 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 31, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_dstPort", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 24, 
+                      "POSITIONOFFSET": 33
+                    }, 
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 23, 
+                      "FIELDMSB": 31, 
+                      "PHVNAME": "tcp_seqNo", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 76
+                    }
+                  ], 
+                  "PHVNUMBER": 3
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 8, 
                       "PHVMSB": 31, 
@@ -19695,7 +19677,7 @@
                       "POSITIONOFFSET": 20
                     }
                   ], 
-                  "PHVNUMBER": 3
+                  "PHVNUMBER": 4
                 }, 
                 {
                   "PHVRECORD": [
@@ -19710,31 +19692,6 @@
                       "POSITIONOFFSET": 70
                     }
                   ], 
-                  "PHVNUMBER": 4
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 31, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_srcPort", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 16, 
-                      "POSITIONOFFSET": 66
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_dstPort", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 55
-                    }
-                  ], 
                   "PHVNUMBER": 5
                 }, 
                 {
@@ -19744,10 +19701,10 @@
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "ecmp_metadata_group_id", 
+                      "PHVNAME": "ethernet_etherType", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 36
+                      "POSITIONOFFSET": 5
                     }
                   ], 
                   "PHVNUMBER": 134
@@ -19780,17 +19737,17 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 16, 
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
                       "PHVMSB": 15, 
-                      "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_ackNo", 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "ecmp_metadata_selector", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 26
+                      "POSITIONOFFSET": 61
                     }
                   ], 
-                  "PHVNUMBER": 324
+                  "PHVNUMBER": 136
                 }, 
                 {
                   "PHVRECORD": [
@@ -19920,6 +19877,31 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_srcPort", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 8, 
+                      "POSITIONOFFSET": 38
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_dstPort", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 33
+                    }
+                  ], 
+                  "PHVNUMBER": 132
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
@@ -19940,21 +19922,6 @@
                       "POSITIONOFFSET": 70
                     }
                   ], 
-                  "PHVNUMBER": 132
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "ethernet_etherType", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 5
-                    }
-                  ], 
                   "PHVNUMBER": 133
                 }, 
                 {
@@ -19985,24 +19952,24 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 8, 
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 0, 
                       "PHVMSB": 7, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_srcPort", 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_seqNo", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
+                      "POSITIONOFFSET": 76
                     }, 
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 8, 
                       "PHVMSB": 7, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "udp_length_", 
+                      "PHVNAME": "udp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 17
+                      "POSITIONOFFSET": 66
                     }
                   ], 
                   "PHVNUMBER": 289
@@ -20012,67 +19979,12 @@
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 0, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "tcp_srcPort", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "udp_length_", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 17
-                    }
-                  ], 
-                  "PHVNUMBER": 290
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 8, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_dstPort", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 33
-                    }
-                  ], 
-                  "PHVNUMBER": 291
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "tcp_dstPort", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 33
-                    }
-                  ], 
-                  "PHVNUMBER": 292
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "ecmp_metadata_selector", 
+                      "PHVNAME": "ecmp_metadata_group_id", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 61
+                      "POSITIONOFFSET": 36
                     }
                   ], 
                   "PHVNUMBER": 135
@@ -20128,6 +20040,26 @@
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
                       "POSITIONOFFSET": 46
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 31, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_length_", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 16, 
+                      "POSITIONOFFSET": 17
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_checksum", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 68
                     }
                   ], 
                   "PHVNUMBER": 257
@@ -20175,6 +20107,31 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_srcPort", 
+                      "CONTAINERWIDTH": 8, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 38
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "udp_srcPort", 
+                      "CONTAINERWIDTH": 8, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 66
+                    }
+                  ], 
+                  "PHVNUMBER": 65
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 40, 
                       "PHVMSB": 7, 
@@ -20185,7 +20142,7 @@
                       "POSITIONOFFSET": 20
                     }
                   ], 
-                  "PHVNUMBER": 65
+                  "PHVNUMBER": 66
                 }, 
                 {
                   "PHVRECORD": [
@@ -20200,7 +20157,7 @@
                       "POSITIONOFFSET": 70
                     }
                   ], 
-                  "PHVNUMBER": 66
+                  "PHVNUMBER": 67
                 }, 
                 {
                   "PHVRECORD": [
@@ -20251,7 +20208,7 @@
                       ]
                     }
                   ], 
-                  "PHVNUMBER": 67
+                  "PHVNUMBER": 68
                 }, 
                 {
                   "PHVRECORD": [
@@ -20266,22 +20223,7 @@
                       "POSITIONOFFSET": 51
                     }
                   ], 
-                  "PHVNUMBER": 68
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_ackNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 26
-                    }
-                  ], 
-                  "PHVNUMBER": 325
+                  "PHVNUMBER": 69
                 }, 
                 {
                   "PHVRECORD": [
@@ -20315,20 +20257,20 @@
                       "FIELDLSB": 16, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_seqNo", 
+                      "PHVNAME": "tcp_ackNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 76
+                      "POSITIONOFFSET": 26
                     }, 
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "udp_checksum", 
+                      "PHVNAME": "udp_dstPort", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 68
+                      "POSITIONOFFSET": 55
                     }
                   ], 
                   "PHVNUMBER": 322
@@ -20340,16 +20282,16 @@
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_seqNo", 
+                      "PHVNAME": "tcp_ackNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 76
+                      "POSITIONOFFSET": 26
                     }
                   ], 
                   "PHVNUMBER": 323
                 }
               ], 
-              "TOTALINGRESSPHVS": 33
+              "TOTALINGRESSPHVS": 30
             }, 
             {
               "PHVDIRECTION": 1, 
@@ -20387,7 +20329,7 @@
                       "POSITIONOFFSET": 9
                     }
                   ], 
-                  "PHVNUMBER": 264
+                  "PHVNUMBER": 260
                 }, 
                 {
                   "PHVRECORD": [
@@ -20402,7 +20344,7 @@
                       "POSITIONOFFSET": 12
                     }
                   ], 
-                  "PHVNUMBER": 265
+                  "PHVNUMBER": 261
                 }, 
                 {
                   "PHVRECORD": [
@@ -20417,7 +20359,7 @@
                       "POSITIONOFFSET": 50
                     }
                   ], 
-                  "PHVNUMBER": 266
+                  "PHVNUMBER": 262
                 }, 
                 {
                   "PHVRECORD": [
@@ -20452,7 +20394,7 @@
                       "POSITIONOFFSET": 59
                     }
                   ], 
-                  "PHVNUMBER": 267
+                  "PHVNUMBER": 263
                 }, 
                 {
                   "PHVRECORD": [
@@ -20507,7 +20449,7 @@
                       "POSITIONOFFSET": 41
                     }
                   ], 
-                  "PHVNUMBER": 268
+                  "PHVNUMBER": 264
                 }, 
                 {
                   "PHVRECORD": [
@@ -20532,7 +20474,7 @@
                       "POSITIONOFFSET": 45
                     }
                   ], 
-                  "PHVNUMBER": 269
+                  "PHVNUMBER": 265
                 }, 
                 {
                   "PHVRECORD": [
@@ -20547,7 +20489,7 @@
                       "POSITIONOFFSET": 19
                     }
                   ], 
-                  "PHVNUMBER": 270
+                  "PHVNUMBER": 266
                 }, 
                 {
                   "PHVRECORD": [
@@ -20562,7 +20504,7 @@
                       "POSITIONOFFSET": 63
                     }
                   ], 
-                  "PHVNUMBER": 271
+                  "PHVNUMBER": 267
                 }, 
                 {
                   "PHVRECORD": [
@@ -20602,7 +20544,7 @@
                       "POSITIONOFFSET": 37
                     }
                   ], 
-                  "PHVNUMBER": 296
+                  "PHVNUMBER": 292
                 }, 
                 {
                   "PHVRECORD": [
@@ -20617,7 +20559,7 @@
                       "POSITIONOFFSET": 4
                     }
                   ], 
-                  "PHVNUMBER": 297
+                  "PHVNUMBER": 293
                 }, 
                 {
                   "PHVRECORD": [
@@ -20642,7 +20584,7 @@
                       "POSITIONOFFSET": 56
                     }
                   ], 
-                  "PHVNUMBER": 298
+                  "PHVNUMBER": 294
                 }, 
                 {
                   "PHVRECORD": [
@@ -20667,7 +20609,7 @@
                       "POSITIONOFFSET": 56
                     }
                   ], 
-                  "PHVNUMBER": 299
+                  "PHVNUMBER": 295
                 }, 
                 {
                   "PHVRECORD": [
@@ -20682,7 +20624,7 @@
                       "POSITIONOFFSET": 19
                     }
                   ], 
-                  "PHVNUMBER": 300
+                  "PHVNUMBER": 296
                 }, 
                 {
                   "PHVRECORD": [
@@ -20697,7 +20639,7 @@
                       "POSITIONOFFSET": 63
                     }
                   ], 
-                  "PHVNUMBER": 301
+                  "PHVNUMBER": 297
                 }, 
                 {
                   "PHVRECORD": [
@@ -20712,7 +20654,7 @@
                       "POSITIONOFFSET": 54
                     }
                   ], 
-                  "PHVNUMBER": 332
+                  "PHVNUMBER": 326
                 }, 
                 {
                   "PHVRECORD": [
@@ -20727,7 +20669,7 @@
                       "POSITIONOFFSET": 43
                     }
                   ], 
-                  "PHVNUMBER": 333
+                  "PHVNUMBER": 327
                 }, 
                 {
                   "PHVRECORD": [
@@ -20752,7 +20694,7 @@
                       "POSITIONOFFSET": 5
                     }
                   ], 
-                  "PHVNUMBER": 334
+                  "PHVNUMBER": 328
                 }, 
                 {
                   "PHVRECORD": [
@@ -20765,9 +20707,114 @@
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
                       "POSITIONOFFSET": 32
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_dstPort", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 48
                     }
                   ], 
-                  "PHVNUMBER": 335
+                  "PHVNUMBER": 329
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 16, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 31, 
+                      "PHVNAME": "tcp_seqNo", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 69
+                    }
+                  ], 
+                  "PHVNUMBER": 330
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_seqNo", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 69
+                    }
+                  ], 
+                  "PHVNUMBER": 331
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 6, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "ethernet_dstAddr", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 8, 
+                      "POSITIONOFFSET": 19
+                    }, 
+                    {
+                      "FIELDWIDTH": 6, 
+                      "FIELDLSB": 40, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 47, 
+                      "PHVNAME": "ethernet_srcAddr", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 63
+                    }
+                  ], 
+                  "PHVNUMBER": 332
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "ethernet_etherType", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 39
+                    }
+                  ], 
+                  "PHVNUMBER": 333
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 8, 
+                      "PHVNAME": "packet_out_hdr_egress_port", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 7, 
+                      "POSITIONOFFSET": 0
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 8, 
+                      "PHVNAME": "packet_in_hdr_ingress_port", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 7, 
+                      "POSITIONOFFSET": 30
+                    }
+                  ], 
+                  "PHVNUMBER": 334
                 }, 
                 {
                   "PHVRECORD": [
@@ -20834,111 +20881,6 @@
                     }
                   ], 
                   "PHVNUMBER": 81
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 6, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "ethernet_dstAddr", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 8, 
-                      "POSITIONOFFSET": 19
-                    }, 
-                    {
-                      "FIELDWIDTH": 6, 
-                      "FIELDLSB": 40, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 47, 
-                      "PHVNAME": "ethernet_srcAddr", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 63
-                    }
-                  ], 
-                  "PHVNUMBER": 338
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "ethernet_etherType", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 39
-                    }
-                  ], 
-                  "PHVNUMBER": 339
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 8, 
-                      "PHVNAME": "packet_out_hdr_egress_port", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 7, 
-                      "POSITIONOFFSET": 0
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 8, 
-                      "PHVNAME": "packet_in_hdr_ingress_port", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 7, 
-                      "POSITIONOFFSET": 30
-                    }
-                  ], 
-                  "PHVNUMBER": 340
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 16, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_seqNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 69
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_dstPort", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 48
-                    }
-                  ], 
-                  "PHVNUMBER": 336
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_seqNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 69
-                    }
-                  ], 
-                  "PHVNUMBER": 337
                 }
               ], 
               "TOTALEGRESSPHVS": 26
@@ -21380,8 +21322,7 @@
         "6": "default_parser", 
         "7": "parse_pkt_out", 
         "8": "<POV initialization>_<Ingress intrinsic metadata>_<Phase 0>", 
-        "9": "start", 
-        "10": "parse_tcp//spilled"
+        "9": "start"
       }, 
       "parser_value_set": []
     }, 
@@ -21412,21 +21353,16 @@
         "stage_tables": [
           {
             "stage_number": 2, 
-            "stage_table_type": "match_with_no_key", 
-            "number_entries": 1, 
+            "stage_table_type": "hash_action", 
+            "number_entries": 1024, 
             "pack_format_length": 1, 
             "pack_format": [
               {
                 "table_word_width": 0, 
                 "memory_word_width": 0, 
-                "entries_per_table_word": 1, 
+                "entries_per_table_word": 0, 
                 "number_memory_units_per_table_word": 0, 
-                "entry_list": [
-                  {
-                    "entry_number": 0, 
-                    "field_list": []
-                  }
-                ]
+                "entry_list": []
               }
             ], 
             "memory_resource_allocation": null, 
@@ -21463,15 +21399,15 @@
                 ], 
                 "match_group_key_bit_width": 16, 
                 "match_group_phv_bit_scrambling": {
-                  "ig_intr_md_for_tm.ucast_egress_port[0]": 0, 
-                  "ig_intr_md_for_tm.ucast_egress_port[1]": 1, 
-                  "ig_intr_md_for_tm.ucast_egress_port[2]": 2, 
-                  "ig_intr_md_for_tm.ucast_egress_port[3]": 3, 
-                  "ig_intr_md_for_tm.ucast_egress_port[4]": 4, 
-                  "ig_intr_md_for_tm.ucast_egress_port[5]": 5, 
-                  "ig_intr_md_for_tm.ucast_egress_port[6]": 6, 
-                  "ig_intr_md_for_tm.ucast_egress_port[7]": 7, 
-                  "ig_intr_md_for_tm.ucast_egress_port[8]": 8
+                  "ig_intr_md_for_tm.ucast_egress_port[0]": 16, 
+                  "ig_intr_md_for_tm.ucast_egress_port[1]": 17, 
+                  "ig_intr_md_for_tm.ucast_egress_port[2]": 18, 
+                  "ig_intr_md_for_tm.ucast_egress_port[3]": 19, 
+                  "ig_intr_md_for_tm.ucast_egress_port[4]": 20, 
+                  "ig_intr_md_for_tm.ucast_egress_port[5]": 21, 
+                  "ig_intr_md_for_tm.ucast_egress_port[6]": 22, 
+                  "ig_intr_md_for_tm.ucast_egress_port[7]": 23, 
+                  "ig_intr_md_for_tm.ucast_egress_port[8]": 24
                 }, 
                 "match_group_match_bit_scrambling": {}, 
                 "seed": [
@@ -21577,8 +21513,8 @@
           {
             "name": "count_ingress", 
             "handle": 536870914, 
-            "allowed_to_be_default_action": true, 
-            "disallowed_as_default_action_reason": null, 
+            "allowed_to_be_default_action": false, 
+            "disallowed_as_default_action_reason": "USES_HASH_DIST", 
             "override_stat_addr_pfe": true, 
             "override_stat_addr": false, 
             "override_stat_full_addr": 0, 
@@ -21609,8 +21545,8 @@
         "default_action": {
           "name": "count_ingress", 
           "handle": 536870914, 
-          "allowed_to_be_default_action": true, 
-          "disallowed_as_default_action_reason": null, 
+          "allowed_to_be_default_action": false, 
+          "disallowed_as_default_action_reason": "USES_HASH_DIST", 
           "override_stat_addr_pfe": true, 
           "override_stat_addr": false, 
           "override_stat_full_addr": 0, 
@@ -21650,7 +21586,7 @@
         "p4_stateful_tables": [], 
         "p4_selection_tables": [], 
         "include_idletime": false, 
-        "performs_hash_action": false, 
+        "performs_hash_action": true, 
         "uses_range": false, 
         "number_entries_with_ranges": 0, 
         "uses_versioning": true, 
@@ -21671,21 +21607,16 @@
         "stage_tables": [
           {
             "stage_number": 2, 
-            "stage_table_type": "match_with_no_key", 
-            "number_entries": 1, 
+            "stage_table_type": "hash_action", 
+            "number_entries": 1024, 
             "pack_format_length": 1, 
             "pack_format": [
               {
                 "table_word_width": 0, 
                 "memory_word_width": 0, 
-                "entries_per_table_word": 1, 
+                "entries_per_table_word": 0, 
                 "number_memory_units_per_table_word": 0, 
-                "entry_list": [
-                  {
-                    "entry_number": 0, 
-                    "field_list": []
-                  }
-                ]
+                "entry_list": []
               }
             ], 
             "memory_resource_allocation": null, 
@@ -21818,8 +21749,8 @@
           {
             "name": "count_egress", 
             "handle": 536870916, 
-            "allowed_to_be_default_action": true, 
-            "disallowed_as_default_action_reason": null, 
+            "allowed_to_be_default_action": false, 
+            "disallowed_as_default_action_reason": "USES_HASH_DIST", 
             "override_stat_addr_pfe": true, 
             "override_stat_addr": false, 
             "override_stat_full_addr": 0, 
@@ -21850,8 +21781,8 @@
         "default_action": {
           "name": "count_egress", 
           "handle": 536870916, 
-          "allowed_to_be_default_action": true, 
-          "disallowed_as_default_action_reason": null, 
+          "allowed_to_be_default_action": false, 
+          "disallowed_as_default_action_reason": "USES_HASH_DIST", 
           "override_stat_addr_pfe": true, 
           "override_stat_addr": false, 
           "override_stat_full_addr": 0, 
@@ -21891,7 +21822,7 @@
         "p4_stateful_tables": [], 
         "p4_selection_tables": [], 
         "include_idletime": false, 
-        "performs_hash_action": false, 
+        "performs_hash_action": true, 
         "uses_range": false, 
         "number_entries_with_ranges": 0, 
         "uses_versioning": true, 
@@ -22103,7 +22034,7 @@
                 "phv_word_address": 130
               }, 
               {
-                "phv_word_address": 67
+                "phv_word_address": 68
               }
             ], 
             "indirect_resources": []
@@ -22156,7 +22087,7 @@
               "phv_word_address": 130
             }, 
             {
-              "phv_word_address": 67
+              "phv_word_address": 68
             }
           ]
         }, 
@@ -23019,16 +22950,16 @@
                   "conditional_extend": false
                 }, 
                 "total_bits": 1, 
-                "hash_algorithm": "crc32", 
-                "hash_output_width": 32
+                "hash_algorithm": "crc16", 
+                "hash_output_width": 16
               }
             ], 
             "stage_primitives": [
               {
-                "phv_word_address": 134
+                "phv_word_address": 135
               }, 
               {
-                "phv_word_address": 135
+                "phv_word_address": 136
               }
             ]
           }, 
@@ -23097,7 +23028,7 @@
                 "phv_word_address": 130
               }, 
               {
-                "phv_word_address": 67
+                "phv_word_address": 68
               }, 
               {
                 "phv_word_address": 129
@@ -23127,7 +23058,7 @@
             ], 
             "stage_primitives": [
               {
-                "phv_word_address": 68
+                "phv_word_address": 69
               }
             ]
           }
@@ -24483,16 +24414,16 @@
                   "conditional_extend": false
                 }, 
                 "total_bits": 1, 
-                "hash_algorithm": "crc32", 
-                "hash_output_width": 32
+                "hash_algorithm": "crc16", 
+                "hash_output_width": 16
               }
             ], 
             "stage_primitives": [
               {
-                "phv_word_address": 134
+                "phv_word_address": 135
               }, 
               {
-                "phv_word_address": 135
+                "phv_word_address": 136
               }
             ], 
             "indirect_resources": []
@@ -24562,7 +24493,7 @@
                 "phv_word_address": 130
               }, 
               {
-                "phv_word_address": 67
+                "phv_word_address": 68
               }, 
               {
                 "phv_word_address": 129
@@ -24593,7 +24524,7 @@
             ], 
             "stage_primitives": [
               {
-                "phv_word_address": 68
+                "phv_word_address": 69
               }
             ], 
             "indirect_resources": []
@@ -25668,7 +25599,7 @@
         "name": "ingress_port_counter", 
         "handle": 67108865, 
         "direction": "ingress", 
-        "number_entries": 510, 
+        "number_entries": 512, 
         "stage_tables_length": 1, 
         "stage_tables": [
           {
@@ -25776,7 +25707,7 @@
         "name": "egress_port_counter", 
         "handle": 67108866, 
         "direction": "ingress", 
-        "number_entries": 510, 
+        "number_entries": 512, 
         "stage_tables_length": 1, 
         "stage_tables": [
           {
@@ -26178,7 +26109,7 @@
     }, 
     {
       "0": {
-        "67": {
+        "68": {
           "0": "packet_in_hdr", 
           "1": "packet_out_hdr", 
           "2": "ethernet", 
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/context/p4_name_lookup.json b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/context/p4_name_lookup.json
index e16069d..4d20733 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/context/p4_name_lookup.json
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/context/p4_name_lookup.json
@@ -11,14 +11,13 @@
                 "6": "default_parser", 
                 "7": "parse_pkt_out", 
                 "8": "<POV initialization>", 
-                "9": "start", 
-                "10": "parse_tcp"
+                "9": "start"
             }, 
             "pov": {
                 "0": {
                     "0": "--pov_reserved--_0"
                 }, 
-                "67": {
+                "68": {
                     "0": "packet_in_hdr", 
                     "1": "packet_out_hdr", 
                     "2": "ethernet", 
@@ -58,62 +57,59 @@
                 "0": "I [POV[31:0]]", 
                 "1": "I [ipv4.protocol, ipv4.hdrChecksum, ipv4.srcAddr[31:24]]", 
                 "2": "I [ipv4.dstAddr]", 
-                "3": "I [ethernet.dstAddr[39:8]]", 
-                "4": "I [ethernet.srcAddr[31:0]]", 
-                "5": "I [udp.srcPort, udp.dstPort]", 
+                "3": "I [tcp.dstPort[7:0], tcp.seqNo[31:8]]", 
+                "4": "I [ethernet.dstAddr[39:8]]", 
+                "5": "I [ethernet.srcAddr[31:0]]", 
                 "64": "I [ipv4.srcAddr[23:16]]", 
-                "65": "I [ethernet.dstAddr[47:40]]", 
-                "66": "I [ethernet.srcAddr[39:32]]", 
-                "67": "I [POV[39:32]]", 
-                "68": "I [ig_intr_md_for_tm.drop_ctl]", 
+                "65": "I [tcp.srcPort[15:8], udp.srcPort[7:0]]", 
+                "66": "I [ethernet.dstAddr[47:40]]", 
+                "67": "I [ethernet.srcAddr[39:32]]", 
+                "68": "I [POV[39:32]]", 
+                "69": "I [ig_intr_md_for_tm.drop_ctl]", 
                 "80": "E [eg_intr_md._pad7, eg_intr_md.egress_cos]", 
                 "81": "E [POV[7:0]]", 
                 "128": "I [ig_intr_md.resubmit_flag, ig_intr_md._pad1, ig_intr_md._pad2, ig_intr_md._pad3, ig_intr_md.ingress_port]", 
                 "129": "I [packet_out_hdr.egress_port, packet_out_hdr._padding, packet_in_hdr.ingress_port, packet_in_hdr._padding]", 
                 "130": "I [ig_intr_md_for_tm.ucast_egress_port]", 
                 "131": "I [ipv4.srcAddr[15:0]]", 
-                "132": "I [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]", 
-                "133": "I [ethernet.etherType]", 
-                "134": "I [ecmp_metadata.group_id]", 
-                "135": "I [ecmp_metadata.selector]", 
+                "132": "I [tcp.srcPort[7:0], tcp.dstPort[15:8]]", 
+                "133": "I [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]", 
+                "134": "I [ethernet.etherType]", 
+                "135": "I [ecmp_metadata.group_id]", 
+                "136": "I [ecmp_metadata.selector]", 
                 "144": "E [eg_intr_md._pad0, eg_intr_md.egress_port]", 
                 "256": "I [ipv4.identification[7:0], ipv4.flags, ipv4.fragOffset, ipv4.ttl]", 
-                "257": "I [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]", 
+                "257": "I [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window, udp.length_, udp.checksum]", 
                 "258": "I [tcp.checksum, tcp.urgentPtr]", 
-                "264": "E [ipv4.ttl, ipv4.protocol, ipv4.hdrChecksum]", 
-                "265": "E [ipv4.srcAddr]", 
-                "266": "E [ipv4.dstAddr]", 
-                "267": "E [tcp.ackNo, udp.length_, udp.checksum]", 
-                "268": "E [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]", 
-                "269": "E [tcp.checksum, tcp.urgentPtr]", 
-                "270": "E [ethernet.dstAddr[39:8]]", 
-                "271": "E [ethernet.srcAddr[31:0]]", 
+                "260": "E [ipv4.ttl, ipv4.protocol, ipv4.hdrChecksum]", 
+                "261": "E [ipv4.srcAddr]", 
+                "262": "E [ipv4.dstAddr]", 
+                "263": "E [tcp.ackNo, udp.length_, udp.checksum]", 
+                "264": "E [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]", 
+                "265": "E [tcp.checksum, tcp.urgentPtr]", 
+                "266": "E [ethernet.dstAddr[39:8]]", 
+                "267": "E [ethernet.srcAddr[31:0]]", 
                 "288": "I [ipv4.version, ipv4.ihl]", 
-                "289": "I [tcp.srcPort[15:8], udp.length_[15:8]]", 
-                "290": "I [tcp.srcPort[7:0], udp.length_[7:0]]", 
-                "291": "I [tcp.dstPort[15:8]]", 
-                "292": "I [tcp.dstPort[7:0]]", 
-                "296": "E [ipv4.version, ipv4.ihl]", 
-                "297": "E [ipv4.diffserv]", 
-                "298": "E [tcp.srcPort[15:8], udp.srcPort[15:8]]", 
-                "299": "E [tcp.srcPort[7:0], udp.srcPort[7:0]]", 
-                "300": "E [ethernet.dstAddr[47:40]]", 
-                "301": "E [ethernet.srcAddr[39:32]]", 
+                "289": "I [tcp.seqNo[7:0], udp.srcPort[15:8]]", 
+                "292": "E [ipv4.version, ipv4.ihl]", 
+                "293": "E [ipv4.diffserv]", 
+                "294": "E [tcp.srcPort[15:8], udp.srcPort[15:8]]", 
+                "295": "E [tcp.srcPort[7:0], udp.srcPort[7:0]]", 
+                "296": "E [ethernet.dstAddr[47:40]]", 
+                "297": "E [ethernet.srcAddr[39:32]]", 
                 "320": "I [ipv4.diffserv, ipv4.totalLen[15:8]]", 
                 "321": "I [ipv4.totalLen[7:0], ipv4.identification[15:8]]", 
-                "322": "I [tcp.seqNo[31:16], udp.checksum]", 
-                "323": "I [tcp.seqNo[15:0]]", 
-                "324": "I [tcp.ackNo[31:16]]", 
-                "325": "I [tcp.ackNo[15:0]]", 
-                "332": "E [ipv4.totalLen]", 
-                "333": "E [ipv4.identification]", 
-                "334": "E [ipv4.flags, ipv4.fragOffset]", 
-                "335": "E [tcp.dstPort]", 
-                "336": "E [tcp.seqNo[31:16], udp.dstPort]", 
-                "337": "E [tcp.seqNo[15:0]]", 
-                "338": "E [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]", 
-                "339": "E [ethernet.etherType]", 
-                "340": "E [packet_out_hdr.egress_port, packet_out_hdr._padding, packet_in_hdr.ingress_port, packet_in_hdr._padding]"
+                "322": "I [tcp.ackNo[31:16], udp.dstPort]", 
+                "323": "I [tcp.ackNo[15:0]]", 
+                "326": "E [ipv4.totalLen]", 
+                "327": "E [ipv4.identification]", 
+                "328": "E [ipv4.flags, ipv4.fragOffset]", 
+                "329": "E [tcp.dstPort, udp.dstPort]", 
+                "330": "E [tcp.seqNo[31:16]]", 
+                "331": "E [tcp.seqNo[15:0]]", 
+                "332": "E [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]", 
+                "333": "E [ethernet.etherType]", 
+                "334": "E [packet_out_hdr.egress_port, packet_out_hdr._padding, packet_in_hdr.ingress_port, packet_in_hdr._padding]"
             }, 
             "logical_tables": {
                 "0": {
@@ -139,7 +135,7 @@
                                                 "field_instance_most_significant_bit": 15, 
                                                 "phv_container_least_significant_bit": 0, 
                                                 "phv_container_most_significant_bit": 15, 
-                                                "word_address": 134
+                                                "word_address": 135
                                             }
                                         ], 
                                         "type": "phv"
@@ -161,7 +157,7 @@
                                                 "field_instance_most_significant_bit": 15, 
                                                 "phv_container_least_significant_bit": 0, 
                                                 "phv_container_most_significant_bit": 15, 
-                                                "word_address": 135
+                                                "word_address": 136
                                             }
                                         ], 
                                         "type": "phv"
@@ -279,21 +275,21 @@
                                 "field_instance_most_significant_bit": 47, 
                                 "phv_container_least_significant_bit": 0, 
                                 "phv_container_most_significant_bit": 7, 
-                                "word_address": 65
+                                "word_address": 66
                             }, 
                             {
                                 "field_instance_least_significant_bit": 8, 
                                 "field_instance_most_significant_bit": 39, 
                                 "phv_container_least_significant_bit": 0, 
                                 "phv_container_most_significant_bit": 31, 
-                                "word_address": 3
+                                "word_address": 4
                             }, 
                             {
                                 "field_instance_least_significant_bit": 0, 
                                 "field_instance_most_significant_bit": 7, 
                                 "phv_container_least_significant_bit": 8, 
                                 "phv_container_most_significant_bit": 15, 
-                                "word_address": 132
+                                "word_address": 133
                             }
                         ], 
                         "ethernet_etherType": [
@@ -302,7 +298,7 @@
                                 "field_instance_most_significant_bit": 15, 
                                 "phv_container_least_significant_bit": 0, 
                                 "phv_container_most_significant_bit": 15, 
-                                "word_address": 133
+                                "word_address": 134
                             }
                         ], 
                         "ethernet_srcAddr": [
@@ -311,21 +307,21 @@
                                 "field_instance_most_significant_bit": 47, 
                                 "phv_container_least_significant_bit": 0, 
                                 "phv_container_most_significant_bit": 7, 
-                                "word_address": 132
+                                "word_address": 133
                             }, 
                             {
                                 "field_instance_least_significant_bit": 32, 
                                 "field_instance_most_significant_bit": 39, 
                                 "phv_container_least_significant_bit": 0, 
                                 "phv_container_most_significant_bit": 7, 
-                                "word_address": 66
+                                "word_address": 67
                             }, 
                             {
                                 "field_instance_least_significant_bit": 0, 
                                 "field_instance_most_significant_bit": 31, 
                                 "phv_container_least_significant_bit": 0, 
                                 "phv_container_most_significant_bit": 31, 
-                                "word_address": 4
+                                "word_address": 5
                             }
                         ], 
                         "ig_intr_md_ingress_port": [
@@ -401,62 +397,59 @@
                 "0": "I [POV[31:0]]", 
                 "1": "I [ipv4.protocol, ipv4.hdrChecksum, ipv4.srcAddr[31:24]]", 
                 "2": "I [ipv4.dstAddr]", 
-                "3": "I [ethernet.dstAddr[39:8]]", 
-                "4": "I [ethernet.srcAddr[31:0]]", 
-                "5": "I [udp.srcPort, udp.dstPort]", 
+                "3": "I [tcp.dstPort[7:0], tcp.seqNo[31:8]]", 
+                "4": "I [ethernet.dstAddr[39:8]]", 
+                "5": "I [ethernet.srcAddr[31:0]]", 
                 "64": "I [ipv4.srcAddr[23:16]]", 
-                "65": "I [ethernet.dstAddr[47:40]]", 
-                "66": "I [ethernet.srcAddr[39:32]]", 
-                "67": "I [POV[39:32]]", 
-                "68": "I [ig_intr_md_for_tm.drop_ctl]", 
+                "65": "I [tcp.srcPort[15:8], udp.srcPort[7:0]]", 
+                "66": "I [ethernet.dstAddr[47:40]]", 
+                "67": "I [ethernet.srcAddr[39:32]]", 
+                "68": "I [POV[39:32]]", 
+                "69": "I [ig_intr_md_for_tm.drop_ctl]", 
                 "80": "E [eg_intr_md._pad7, eg_intr_md.egress_cos]", 
                 "81": "E [POV[7:0]]", 
                 "128": "I [ig_intr_md.resubmit_flag, ig_intr_md._pad1, ig_intr_md._pad2, ig_intr_md._pad3, ig_intr_md.ingress_port]", 
                 "129": "I [packet_out_hdr.egress_port, packet_out_hdr._padding, packet_in_hdr.ingress_port, packet_in_hdr._padding]", 
                 "130": "I [ig_intr_md_for_tm.ucast_egress_port]", 
                 "131": "I [ipv4.srcAddr[15:0]]", 
-                "132": "I [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]", 
-                "133": "I [ethernet.etherType]", 
-                "134": "I [ecmp_metadata.group_id]", 
-                "135": "I [ecmp_metadata.selector]", 
+                "132": "I [tcp.srcPort[7:0], tcp.dstPort[15:8]]", 
+                "133": "I [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]", 
+                "134": "I [ethernet.etherType]", 
+                "135": "I [ecmp_metadata.group_id]", 
+                "136": "I [ecmp_metadata.selector]", 
                 "144": "E [eg_intr_md._pad0, eg_intr_md.egress_port]", 
                 "256": "I [ipv4.identification[7:0], ipv4.flags, ipv4.fragOffset, ipv4.ttl]", 
-                "257": "I [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]", 
+                "257": "I [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window, udp.length_, udp.checksum]", 
                 "258": "I [tcp.checksum, tcp.urgentPtr]", 
-                "264": "E [ipv4.ttl, ipv4.protocol, ipv4.hdrChecksum]", 
-                "265": "E [ipv4.srcAddr]", 
-                "266": "E [ipv4.dstAddr]", 
-                "267": "E [tcp.ackNo, udp.length_, udp.checksum]", 
-                "268": "E [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]", 
-                "269": "E [tcp.checksum, tcp.urgentPtr]", 
-                "270": "E [ethernet.dstAddr[39:8]]", 
-                "271": "E [ethernet.srcAddr[31:0]]", 
+                "260": "E [ipv4.ttl, ipv4.protocol, ipv4.hdrChecksum]", 
+                "261": "E [ipv4.srcAddr]", 
+                "262": "E [ipv4.dstAddr]", 
+                "263": "E [tcp.ackNo, udp.length_, udp.checksum]", 
+                "264": "E [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]", 
+                "265": "E [tcp.checksum, tcp.urgentPtr]", 
+                "266": "E [ethernet.dstAddr[39:8]]", 
+                "267": "E [ethernet.srcAddr[31:0]]", 
                 "288": "I [ipv4.version, ipv4.ihl]", 
-                "289": "I [tcp.srcPort[15:8], udp.length_[15:8]]", 
-                "290": "I [tcp.srcPort[7:0], udp.length_[7:0]]", 
-                "291": "I [tcp.dstPort[15:8]]", 
-                "292": "I [tcp.dstPort[7:0]]", 
-                "296": "E [ipv4.version, ipv4.ihl]", 
-                "297": "E [ipv4.diffserv]", 
-                "298": "E [tcp.srcPort[15:8], udp.srcPort[15:8]]", 
-                "299": "E [tcp.srcPort[7:0], udp.srcPort[7:0]]", 
-                "300": "E [ethernet.dstAddr[47:40]]", 
-                "301": "E [ethernet.srcAddr[39:32]]", 
+                "289": "I [tcp.seqNo[7:0], udp.srcPort[15:8]]", 
+                "292": "E [ipv4.version, ipv4.ihl]", 
+                "293": "E [ipv4.diffserv]", 
+                "294": "E [tcp.srcPort[15:8], udp.srcPort[15:8]]", 
+                "295": "E [tcp.srcPort[7:0], udp.srcPort[7:0]]", 
+                "296": "E [ethernet.dstAddr[47:40]]", 
+                "297": "E [ethernet.srcAddr[39:32]]", 
                 "320": "I [ipv4.diffserv, ipv4.totalLen[15:8]]", 
                 "321": "I [ipv4.totalLen[7:0], ipv4.identification[15:8]]", 
-                "322": "I [tcp.seqNo[31:16], udp.checksum]", 
-                "323": "I [tcp.seqNo[15:0]]", 
-                "324": "I [tcp.ackNo[31:16]]", 
-                "325": "I [tcp.ackNo[15:0]]", 
-                "332": "E [ipv4.totalLen]", 
-                "333": "E [ipv4.identification]", 
-                "334": "E [ipv4.flags, ipv4.fragOffset]", 
-                "335": "E [tcp.dstPort]", 
-                "336": "E [tcp.seqNo[31:16], udp.dstPort]", 
-                "337": "E [tcp.seqNo[15:0]]", 
-                "338": "E [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]", 
-                "339": "E [ethernet.etherType]", 
-                "340": "E [packet_out_hdr.egress_port, packet_out_hdr._padding, packet_in_hdr.ingress_port, packet_in_hdr._padding]"
+                "322": "I [tcp.ackNo[31:16], udp.dstPort]", 
+                "323": "I [tcp.ackNo[15:0]]", 
+                "326": "E [ipv4.totalLen]", 
+                "327": "E [ipv4.identification]", 
+                "328": "E [ipv4.flags, ipv4.fragOffset]", 
+                "329": "E [tcp.dstPort, udp.dstPort]", 
+                "330": "E [tcp.seqNo[31:16]]", 
+                "331": "E [tcp.seqNo[15:0]]", 
+                "332": "E [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]", 
+                "333": "E [ethernet.etherType]", 
+                "334": "E [packet_out_hdr.egress_port, packet_out_hdr._padding, packet_in_hdr.ingress_port, packet_in_hdr._padding]"
             }, 
             "logical_tables": {
                 "0": {
@@ -500,7 +493,7 @@
                                 "field_instance_most_significant_bit": 15, 
                                 "phv_container_least_significant_bit": 0, 
                                 "phv_container_most_significant_bit": 15, 
-                                "word_address": 134
+                                "word_address": 135
                             }
                         ], 
                         "ecmp_metadata_selector": [
@@ -509,7 +502,7 @@
                                 "field_instance_most_significant_bit": 15, 
                                 "phv_container_least_significant_bit": 0, 
                                 "phv_container_most_significant_bit": 15, 
-                                "word_address": 135
+                                "word_address": 136
                             }
                         ]
                     }, 
@@ -523,62 +516,59 @@
                 "0": "I [POV[31:0]]", 
                 "1": "I [ipv4.protocol, ipv4.hdrChecksum, ipv4.srcAddr[31:24]]", 
                 "2": "I [ipv4.dstAddr]", 
-                "3": "I [ethernet.dstAddr[39:8]]", 
-                "4": "I [ethernet.srcAddr[31:0]]", 
-                "5": "I [udp.srcPort, udp.dstPort]", 
+                "3": "I [tcp.dstPort[7:0], tcp.seqNo[31:8]]", 
+                "4": "I [ethernet.dstAddr[39:8]]", 
+                "5": "I [ethernet.srcAddr[31:0]]", 
                 "64": "I [ipv4.srcAddr[23:16]]", 
-                "65": "I [ethernet.dstAddr[47:40]]", 
-                "66": "I [ethernet.srcAddr[39:32]]", 
-                "67": "I [POV[39:32]]", 
-                "68": "I [ig_intr_md_for_tm.drop_ctl]", 
+                "65": "I [tcp.srcPort[15:8], udp.srcPort[7:0]]", 
+                "66": "I [ethernet.dstAddr[47:40]]", 
+                "67": "I [ethernet.srcAddr[39:32]]", 
+                "68": "I [POV[39:32]]", 
+                "69": "I [ig_intr_md_for_tm.drop_ctl]", 
                 "80": "E [eg_intr_md._pad7, eg_intr_md.egress_cos]", 
                 "81": "E [POV[7:0]]", 
                 "128": "I [ig_intr_md.resubmit_flag, ig_intr_md._pad1, ig_intr_md._pad2, ig_intr_md._pad3, ig_intr_md.ingress_port]", 
                 "129": "I [packet_out_hdr.egress_port, packet_out_hdr._padding, packet_in_hdr.ingress_port, packet_in_hdr._padding]", 
                 "130": "I [ig_intr_md_for_tm.ucast_egress_port]", 
                 "131": "I [ipv4.srcAddr[15:0]]", 
-                "132": "I [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]", 
-                "133": "I [ethernet.etherType]", 
-                "134": "I [ecmp_metadata.group_id]", 
-                "135": "I [ecmp_metadata.selector]", 
+                "132": "I [tcp.srcPort[7:0], tcp.dstPort[15:8]]", 
+                "133": "I [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]", 
+                "134": "I [ethernet.etherType]", 
+                "135": "I [ecmp_metadata.group_id]", 
+                "136": "I [ecmp_metadata.selector]", 
                 "144": "E [eg_intr_md._pad0, eg_intr_md.egress_port]", 
                 "256": "I [ipv4.identification[7:0], ipv4.flags, ipv4.fragOffset, ipv4.ttl]", 
-                "257": "I [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]", 
+                "257": "I [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window, udp.length_, udp.checksum]", 
                 "258": "I [tcp.checksum, tcp.urgentPtr]", 
-                "264": "E [ipv4.ttl, ipv4.protocol, ipv4.hdrChecksum]", 
-                "265": "E [ipv4.srcAddr]", 
-                "266": "E [ipv4.dstAddr]", 
-                "267": "E [tcp.ackNo, udp.length_, udp.checksum]", 
-                "268": "E [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]", 
-                "269": "E [tcp.checksum, tcp.urgentPtr]", 
-                "270": "E [ethernet.dstAddr[39:8]]", 
-                "271": "E [ethernet.srcAddr[31:0]]", 
+                "260": "E [ipv4.ttl, ipv4.protocol, ipv4.hdrChecksum]", 
+                "261": "E [ipv4.srcAddr]", 
+                "262": "E [ipv4.dstAddr]", 
+                "263": "E [tcp.ackNo, udp.length_, udp.checksum]", 
+                "264": "E [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]", 
+                "265": "E [tcp.checksum, tcp.urgentPtr]", 
+                "266": "E [ethernet.dstAddr[39:8]]", 
+                "267": "E [ethernet.srcAddr[31:0]]", 
                 "288": "I [ipv4.version, ipv4.ihl]", 
-                "289": "I [tcp.srcPort[15:8], udp.length_[15:8]]", 
-                "290": "I [tcp.srcPort[7:0], udp.length_[7:0]]", 
-                "291": "I [tcp.dstPort[15:8]]", 
-                "292": "I [tcp.dstPort[7:0]]", 
-                "296": "E [ipv4.version, ipv4.ihl]", 
-                "297": "E [ipv4.diffserv]", 
-                "298": "E [tcp.srcPort[15:8], udp.srcPort[15:8]]", 
-                "299": "E [tcp.srcPort[7:0], udp.srcPort[7:0]]", 
-                "300": "E [ethernet.dstAddr[47:40]]", 
-                "301": "E [ethernet.srcAddr[39:32]]", 
+                "289": "I [tcp.seqNo[7:0], udp.srcPort[15:8]]", 
+                "292": "E [ipv4.version, ipv4.ihl]", 
+                "293": "E [ipv4.diffserv]", 
+                "294": "E [tcp.srcPort[15:8], udp.srcPort[15:8]]", 
+                "295": "E [tcp.srcPort[7:0], udp.srcPort[7:0]]", 
+                "296": "E [ethernet.dstAddr[47:40]]", 
+                "297": "E [ethernet.srcAddr[39:32]]", 
                 "320": "I [ipv4.diffserv, ipv4.totalLen[15:8]]", 
                 "321": "I [ipv4.totalLen[7:0], ipv4.identification[15:8]]", 
-                "322": "I [tcp.seqNo[31:16], udp.checksum]", 
-                "323": "I [tcp.seqNo[15:0]]", 
-                "324": "I [tcp.ackNo[31:16]]", 
-                "325": "I [tcp.ackNo[15:0]]", 
-                "332": "E [ipv4.totalLen]", 
-                "333": "E [ipv4.identification]", 
-                "334": "E [ipv4.flags, ipv4.fragOffset]", 
-                "335": "E [tcp.dstPort]", 
-                "336": "E [tcp.seqNo[31:16], udp.dstPort]", 
-                "337": "E [tcp.seqNo[15:0]]", 
-                "338": "E [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]", 
-                "339": "E [ethernet.etherType]", 
-                "340": "E [packet_out_hdr.egress_port, packet_out_hdr._padding, packet_in_hdr.ingress_port, packet_in_hdr._padding]"
+                "322": "I [tcp.ackNo[31:16], udp.dstPort]", 
+                "323": "I [tcp.ackNo[15:0]]", 
+                "326": "E [ipv4.totalLen]", 
+                "327": "E [ipv4.identification]", 
+                "328": "E [ipv4.flags, ipv4.fragOffset]", 
+                "329": "E [tcp.dstPort, udp.dstPort]", 
+                "330": "E [tcp.seqNo[31:16]]", 
+                "331": "E [tcp.seqNo[15:0]]", 
+                "332": "E [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]", 
+                "333": "E [ethernet.etherType]", 
+                "334": "E [packet_out_hdr.egress_port, packet_out_hdr._padding, packet_in_hdr.ingress_port, packet_in_hdr._padding]"
             }, 
             "logical_tables": {
                 "0": {
@@ -633,62 +623,59 @@
                 "0": "I [POV[31:0]]", 
                 "1": "I [ipv4.protocol, ipv4.hdrChecksum, ipv4.srcAddr[31:24]]", 
                 "2": "I [ipv4.dstAddr]", 
-                "3": "I [ethernet.dstAddr[39:8]]", 
-                "4": "I [ethernet.srcAddr[31:0]]", 
-                "5": "I [udp.srcPort, udp.dstPort]", 
+                "3": "I [tcp.dstPort[7:0], tcp.seqNo[31:8]]", 
+                "4": "I [ethernet.dstAddr[39:8]]", 
+                "5": "I [ethernet.srcAddr[31:0]]", 
                 "64": "I [ipv4.srcAddr[23:16]]", 
-                "65": "I [ethernet.dstAddr[47:40]]", 
-                "66": "I [ethernet.srcAddr[39:32]]", 
-                "67": "I [POV[39:32]]", 
-                "68": "I [ig_intr_md_for_tm.drop_ctl]", 
+                "65": "I [tcp.srcPort[15:8], udp.srcPort[7:0]]", 
+                "66": "I [ethernet.dstAddr[47:40]]", 
+                "67": "I [ethernet.srcAddr[39:32]]", 
+                "68": "I [POV[39:32]]", 
+                "69": "I [ig_intr_md_for_tm.drop_ctl]", 
                 "80": "E [eg_intr_md._pad7, eg_intr_md.egress_cos]", 
                 "81": "E [POV[7:0]]", 
                 "128": "I [ig_intr_md.resubmit_flag, ig_intr_md._pad1, ig_intr_md._pad2, ig_intr_md._pad3, ig_intr_md.ingress_port]", 
                 "129": "I [packet_out_hdr.egress_port, packet_out_hdr._padding, packet_in_hdr.ingress_port, packet_in_hdr._padding]", 
                 "130": "I [ig_intr_md_for_tm.ucast_egress_port]", 
                 "131": "I [ipv4.srcAddr[15:0]]", 
-                "132": "I [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]", 
-                "133": "I [ethernet.etherType]", 
-                "134": "I [ecmp_metadata.group_id]", 
-                "135": "I [ecmp_metadata.selector]", 
+                "132": "I [tcp.srcPort[7:0], tcp.dstPort[15:8]]", 
+                "133": "I [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]", 
+                "134": "I [ethernet.etherType]", 
+                "135": "I [ecmp_metadata.group_id]", 
+                "136": "I [ecmp_metadata.selector]", 
                 "144": "E [eg_intr_md._pad0, eg_intr_md.egress_port]", 
                 "256": "I [ipv4.identification[7:0], ipv4.flags, ipv4.fragOffset, ipv4.ttl]", 
-                "257": "I [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]", 
+                "257": "I [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window, udp.length_, udp.checksum]", 
                 "258": "I [tcp.checksum, tcp.urgentPtr]", 
-                "264": "E [ipv4.ttl, ipv4.protocol, ipv4.hdrChecksum]", 
-                "265": "E [ipv4.srcAddr]", 
-                "266": "E [ipv4.dstAddr]", 
-                "267": "E [tcp.ackNo, udp.length_, udp.checksum]", 
-                "268": "E [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]", 
-                "269": "E [tcp.checksum, tcp.urgentPtr]", 
-                "270": "E [ethernet.dstAddr[39:8]]", 
-                "271": "E [ethernet.srcAddr[31:0]]", 
+                "260": "E [ipv4.ttl, ipv4.protocol, ipv4.hdrChecksum]", 
+                "261": "E [ipv4.srcAddr]", 
+                "262": "E [ipv4.dstAddr]", 
+                "263": "E [tcp.ackNo, udp.length_, udp.checksum]", 
+                "264": "E [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]", 
+                "265": "E [tcp.checksum, tcp.urgentPtr]", 
+                "266": "E [ethernet.dstAddr[39:8]]", 
+                "267": "E [ethernet.srcAddr[31:0]]", 
                 "288": "I [ipv4.version, ipv4.ihl]", 
-                "289": "I [tcp.srcPort[15:8], udp.length_[15:8]]", 
-                "290": "I [tcp.srcPort[7:0], udp.length_[7:0]]", 
-                "291": "I [tcp.dstPort[15:8]]", 
-                "292": "I [tcp.dstPort[7:0]]", 
-                "296": "E [ipv4.version, ipv4.ihl]", 
-                "297": "E [ipv4.diffserv]", 
-                "298": "E [tcp.srcPort[15:8], udp.srcPort[15:8]]", 
-                "299": "E [tcp.srcPort[7:0], udp.srcPort[7:0]]", 
-                "300": "E [ethernet.dstAddr[47:40]]", 
-                "301": "E [ethernet.srcAddr[39:32]]", 
+                "289": "I [tcp.seqNo[7:0], udp.srcPort[15:8]]", 
+                "292": "E [ipv4.version, ipv4.ihl]", 
+                "293": "E [ipv4.diffserv]", 
+                "294": "E [tcp.srcPort[15:8], udp.srcPort[15:8]]", 
+                "295": "E [tcp.srcPort[7:0], udp.srcPort[7:0]]", 
+                "296": "E [ethernet.dstAddr[47:40]]", 
+                "297": "E [ethernet.srcAddr[39:32]]", 
                 "320": "I [ipv4.diffserv, ipv4.totalLen[15:8]]", 
                 "321": "I [ipv4.totalLen[7:0], ipv4.identification[15:8]]", 
-                "322": "I [tcp.seqNo[31:16], udp.checksum]", 
-                "323": "I [tcp.seqNo[15:0]]", 
-                "324": "I [tcp.ackNo[31:16]]", 
-                "325": "I [tcp.ackNo[15:0]]", 
-                "332": "E [ipv4.totalLen]", 
-                "333": "E [ipv4.identification]", 
-                "334": "E [ipv4.flags, ipv4.fragOffset]", 
-                "335": "E [tcp.dstPort]", 
-                "336": "E [tcp.seqNo[31:16], udp.dstPort]", 
-                "337": "E [tcp.seqNo[15:0]]", 
-                "338": "E [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]", 
-                "339": "E [ethernet.etherType]", 
-                "340": "E [packet_out_hdr.egress_port, packet_out_hdr._padding, packet_in_hdr.ingress_port, packet_in_hdr._padding]"
+                "322": "I [tcp.ackNo[31:16], udp.dstPort]", 
+                "323": "I [tcp.ackNo[15:0]]", 
+                "326": "E [ipv4.totalLen]", 
+                "327": "E [ipv4.identification]", 
+                "328": "E [ipv4.flags, ipv4.fragOffset]", 
+                "329": "E [tcp.dstPort, udp.dstPort]", 
+                "330": "E [tcp.seqNo[31:16]]", 
+                "331": "E [tcp.seqNo[15:0]]", 
+                "332": "E [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]", 
+                "333": "E [ethernet.etherType]", 
+                "334": "E [packet_out_hdr.egress_port, packet_out_hdr._padding, packet_in_hdr.ingress_port, packet_in_hdr._padding]"
             }, 
             "logical_tables": {}, 
             "stateful_tables": []
@@ -698,62 +685,59 @@
                 "0": "I [POV[31:0]]", 
                 "1": "I [ipv4.protocol, ipv4.hdrChecksum, ipv4.srcAddr[31:24]]", 
                 "2": "I [ipv4.dstAddr]", 
-                "3": "I [ethernet.dstAddr[39:8]]", 
-                "4": "I [ethernet.srcAddr[31:0]]", 
-                "5": "I [udp.srcPort, udp.dstPort]", 
+                "3": "I [tcp.dstPort[7:0], tcp.seqNo[31:8]]", 
+                "4": "I [ethernet.dstAddr[39:8]]", 
+                "5": "I [ethernet.srcAddr[31:0]]", 
                 "64": "I [ipv4.srcAddr[23:16]]", 
-                "65": "I [ethernet.dstAddr[47:40]]", 
-                "66": "I [ethernet.srcAddr[39:32]]", 
-                "67": "I [POV[39:32]]", 
-                "68": "I [ig_intr_md_for_tm.drop_ctl]", 
+                "65": "I [tcp.srcPort[15:8], udp.srcPort[7:0]]", 
+                "66": "I [ethernet.dstAddr[47:40]]", 
+                "67": "I [ethernet.srcAddr[39:32]]", 
+                "68": "I [POV[39:32]]", 
+                "69": "I [ig_intr_md_for_tm.drop_ctl]", 
                 "80": "E [eg_intr_md._pad7, eg_intr_md.egress_cos]", 
                 "81": "E [POV[7:0]]", 
                 "128": "I [ig_intr_md.resubmit_flag, ig_intr_md._pad1, ig_intr_md._pad2, ig_intr_md._pad3, ig_intr_md.ingress_port]", 
                 "129": "I [packet_out_hdr.egress_port, packet_out_hdr._padding, packet_in_hdr.ingress_port, packet_in_hdr._padding]", 
                 "130": "I [ig_intr_md_for_tm.ucast_egress_port]", 
                 "131": "I [ipv4.srcAddr[15:0]]", 
-                "132": "I [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]", 
-                "133": "I [ethernet.etherType]", 
-                "134": "I [ecmp_metadata.group_id]", 
-                "135": "I [ecmp_metadata.selector]", 
+                "132": "I [tcp.srcPort[7:0], tcp.dstPort[15:8]]", 
+                "133": "I [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]", 
+                "134": "I [ethernet.etherType]", 
+                "135": "I [ecmp_metadata.group_id]", 
+                "136": "I [ecmp_metadata.selector]", 
                 "144": "E [eg_intr_md._pad0, eg_intr_md.egress_port]", 
                 "256": "I [ipv4.identification[7:0], ipv4.flags, ipv4.fragOffset, ipv4.ttl]", 
-                "257": "I [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]", 
+                "257": "I [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window, udp.length_, udp.checksum]", 
                 "258": "I [tcp.checksum, tcp.urgentPtr]", 
-                "264": "E [ipv4.ttl, ipv4.protocol, ipv4.hdrChecksum]", 
-                "265": "E [ipv4.srcAddr]", 
-                "266": "E [ipv4.dstAddr]", 
-                "267": "E [tcp.ackNo, udp.length_, udp.checksum]", 
-                "268": "E [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]", 
-                "269": "E [tcp.checksum, tcp.urgentPtr]", 
-                "270": "E [ethernet.dstAddr[39:8]]", 
-                "271": "E [ethernet.srcAddr[31:0]]", 
+                "260": "E [ipv4.ttl, ipv4.protocol, ipv4.hdrChecksum]", 
+                "261": "E [ipv4.srcAddr]", 
+                "262": "E [ipv4.dstAddr]", 
+                "263": "E [tcp.ackNo, udp.length_, udp.checksum]", 
+                "264": "E [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]", 
+                "265": "E [tcp.checksum, tcp.urgentPtr]", 
+                "266": "E [ethernet.dstAddr[39:8]]", 
+                "267": "E [ethernet.srcAddr[31:0]]", 
                 "288": "I [ipv4.version, ipv4.ihl]", 
-                "289": "I [tcp.srcPort[15:8], udp.length_[15:8]]", 
-                "290": "I [tcp.srcPort[7:0], udp.length_[7:0]]", 
-                "291": "I [tcp.dstPort[15:8]]", 
-                "292": "I [tcp.dstPort[7:0]]", 
-                "296": "E [ipv4.version, ipv4.ihl]", 
-                "297": "E [ipv4.diffserv]", 
-                "298": "E [tcp.srcPort[15:8], udp.srcPort[15:8]]", 
-                "299": "E [tcp.srcPort[7:0], udp.srcPort[7:0]]", 
-                "300": "E [ethernet.dstAddr[47:40]]", 
-                "301": "E [ethernet.srcAddr[39:32]]", 
+                "289": "I [tcp.seqNo[7:0], udp.srcPort[15:8]]", 
+                "292": "E [ipv4.version, ipv4.ihl]", 
+                "293": "E [ipv4.diffserv]", 
+                "294": "E [tcp.srcPort[15:8], udp.srcPort[15:8]]", 
+                "295": "E [tcp.srcPort[7:0], udp.srcPort[7:0]]", 
+                "296": "E [ethernet.dstAddr[47:40]]", 
+                "297": "E [ethernet.srcAddr[39:32]]", 
                 "320": "I [ipv4.diffserv, ipv4.totalLen[15:8]]", 
                 "321": "I [ipv4.totalLen[7:0], ipv4.identification[15:8]]", 
-                "322": "I [tcp.seqNo[31:16], udp.checksum]", 
-                "323": "I [tcp.seqNo[15:0]]", 
-                "324": "I [tcp.ackNo[31:16]]", 
-                "325": "I [tcp.ackNo[15:0]]", 
-                "332": "E [ipv4.totalLen]", 
-                "333": "E [ipv4.identification]", 
-                "334": "E [ipv4.flags, ipv4.fragOffset]", 
-                "335": "E [tcp.dstPort]", 
-                "336": "E [tcp.seqNo[31:16], udp.dstPort]", 
-                "337": "E [tcp.seqNo[15:0]]", 
-                "338": "E [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]", 
-                "339": "E [ethernet.etherType]", 
-                "340": "E [packet_out_hdr.egress_port, packet_out_hdr._padding, packet_in_hdr.ingress_port, packet_in_hdr._padding]"
+                "322": "I [tcp.ackNo[31:16], udp.dstPort]", 
+                "323": "I [tcp.ackNo[15:0]]", 
+                "326": "E [ipv4.totalLen]", 
+                "327": "E [ipv4.identification]", 
+                "328": "E [ipv4.flags, ipv4.fragOffset]", 
+                "329": "E [tcp.dstPort, udp.dstPort]", 
+                "330": "E [tcp.seqNo[31:16]]", 
+                "331": "E [tcp.seqNo[15:0]]", 
+                "332": "E [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]", 
+                "333": "E [ethernet.etherType]", 
+                "334": "E [packet_out_hdr.egress_port, packet_out_hdr._padding, packet_in_hdr.ingress_port, packet_in_hdr._padding]"
             }, 
             "logical_tables": {}, 
             "stateful_tables": []
@@ -763,62 +747,59 @@
                 "0": "I [POV[31:0]]", 
                 "1": "I [ipv4.protocol, ipv4.hdrChecksum, ipv4.srcAddr[31:24]]", 
                 "2": "I [ipv4.dstAddr]", 
-                "3": "I [ethernet.dstAddr[39:8]]", 
-                "4": "I [ethernet.srcAddr[31:0]]", 
-                "5": "I [udp.srcPort, udp.dstPort]", 
+                "3": "I [tcp.dstPort[7:0], tcp.seqNo[31:8]]", 
+                "4": "I [ethernet.dstAddr[39:8]]", 
+                "5": "I [ethernet.srcAddr[31:0]]", 
                 "64": "I [ipv4.srcAddr[23:16]]", 
-                "65": "I [ethernet.dstAddr[47:40]]", 
-                "66": "I [ethernet.srcAddr[39:32]]", 
-                "67": "I [POV[39:32]]", 
-                "68": "I [ig_intr_md_for_tm.drop_ctl]", 
+                "65": "I [tcp.srcPort[15:8], udp.srcPort[7:0]]", 
+                "66": "I [ethernet.dstAddr[47:40]]", 
+                "67": "I [ethernet.srcAddr[39:32]]", 
+                "68": "I [POV[39:32]]", 
+                "69": "I [ig_intr_md_for_tm.drop_ctl]", 
                 "80": "E [eg_intr_md._pad7, eg_intr_md.egress_cos]", 
                 "81": "E [POV[7:0]]", 
                 "128": "I [ig_intr_md.resubmit_flag, ig_intr_md._pad1, ig_intr_md._pad2, ig_intr_md._pad3, ig_intr_md.ingress_port]", 
                 "129": "I [packet_out_hdr.egress_port, packet_out_hdr._padding, packet_in_hdr.ingress_port, packet_in_hdr._padding]", 
                 "130": "I [ig_intr_md_for_tm.ucast_egress_port]", 
                 "131": "I [ipv4.srcAddr[15:0]]", 
-                "132": "I [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]", 
-                "133": "I [ethernet.etherType]", 
-                "134": "I [ecmp_metadata.group_id]", 
-                "135": "I [ecmp_metadata.selector]", 
+                "132": "I [tcp.srcPort[7:0], tcp.dstPort[15:8]]", 
+                "133": "I [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]", 
+                "134": "I [ethernet.etherType]", 
+                "135": "I [ecmp_metadata.group_id]", 
+                "136": "I [ecmp_metadata.selector]", 
                 "144": "E [eg_intr_md._pad0, eg_intr_md.egress_port]", 
                 "256": "I [ipv4.identification[7:0], ipv4.flags, ipv4.fragOffset, ipv4.ttl]", 
-                "257": "I [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]", 
+                "257": "I [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window, udp.length_, udp.checksum]", 
                 "258": "I [tcp.checksum, tcp.urgentPtr]", 
-                "264": "E [ipv4.ttl, ipv4.protocol, ipv4.hdrChecksum]", 
-                "265": "E [ipv4.srcAddr]", 
-                "266": "E [ipv4.dstAddr]", 
-                "267": "E [tcp.ackNo, udp.length_, udp.checksum]", 
-                "268": "E [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]", 
-                "269": "E [tcp.checksum, tcp.urgentPtr]", 
-                "270": "E [ethernet.dstAddr[39:8]]", 
-                "271": "E [ethernet.srcAddr[31:0]]", 
+                "260": "E [ipv4.ttl, ipv4.protocol, ipv4.hdrChecksum]", 
+                "261": "E [ipv4.srcAddr]", 
+                "262": "E [ipv4.dstAddr]", 
+                "263": "E [tcp.ackNo, udp.length_, udp.checksum]", 
+                "264": "E [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]", 
+                "265": "E [tcp.checksum, tcp.urgentPtr]", 
+                "266": "E [ethernet.dstAddr[39:8]]", 
+                "267": "E [ethernet.srcAddr[31:0]]", 
                 "288": "I [ipv4.version, ipv4.ihl]", 
-                "289": "I [tcp.srcPort[15:8], udp.length_[15:8]]", 
-                "290": "I [tcp.srcPort[7:0], udp.length_[7:0]]", 
-                "291": "I [tcp.dstPort[15:8]]", 
-                "292": "I [tcp.dstPort[7:0]]", 
-                "296": "E [ipv4.version, ipv4.ihl]", 
-                "297": "E [ipv4.diffserv]", 
-                "298": "E [tcp.srcPort[15:8], udp.srcPort[15:8]]", 
-                "299": "E [tcp.srcPort[7:0], udp.srcPort[7:0]]", 
-                "300": "E [ethernet.dstAddr[47:40]]", 
-                "301": "E [ethernet.srcAddr[39:32]]", 
+                "289": "I [tcp.seqNo[7:0], udp.srcPort[15:8]]", 
+                "292": "E [ipv4.version, ipv4.ihl]", 
+                "293": "E [ipv4.diffserv]", 
+                "294": "E [tcp.srcPort[15:8], udp.srcPort[15:8]]", 
+                "295": "E [tcp.srcPort[7:0], udp.srcPort[7:0]]", 
+                "296": "E [ethernet.dstAddr[47:40]]", 
+                "297": "E [ethernet.srcAddr[39:32]]", 
                 "320": "I [ipv4.diffserv, ipv4.totalLen[15:8]]", 
                 "321": "I [ipv4.totalLen[7:0], ipv4.identification[15:8]]", 
-                "322": "I [tcp.seqNo[31:16], udp.checksum]", 
-                "323": "I [tcp.seqNo[15:0]]", 
-                "324": "I [tcp.ackNo[31:16]]", 
-                "325": "I [tcp.ackNo[15:0]]", 
-                "332": "E [ipv4.totalLen]", 
-                "333": "E [ipv4.identification]", 
-                "334": "E [ipv4.flags, ipv4.fragOffset]", 
-                "335": "E [tcp.dstPort]", 
-                "336": "E [tcp.seqNo[31:16], udp.dstPort]", 
-                "337": "E [tcp.seqNo[15:0]]", 
-                "338": "E [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]", 
-                "339": "E [ethernet.etherType]", 
-                "340": "E [packet_out_hdr.egress_port, packet_out_hdr._padding, packet_in_hdr.ingress_port, packet_in_hdr._padding]"
+                "322": "I [tcp.ackNo[31:16], udp.dstPort]", 
+                "323": "I [tcp.ackNo[15:0]]", 
+                "326": "E [ipv4.totalLen]", 
+                "327": "E [ipv4.identification]", 
+                "328": "E [ipv4.flags, ipv4.fragOffset]", 
+                "329": "E [tcp.dstPort, udp.dstPort]", 
+                "330": "E [tcp.seqNo[31:16]]", 
+                "331": "E [tcp.seqNo[15:0]]", 
+                "332": "E [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]", 
+                "333": "E [ethernet.etherType]", 
+                "334": "E [packet_out_hdr.egress_port, packet_out_hdr._padding, packet_in_hdr.ingress_port, packet_in_hdr._padding]"
             }, 
             "logical_tables": {}, 
             "stateful_tables": []
@@ -828,62 +809,59 @@
                 "0": "I [POV[31:0]]", 
                 "1": "I [ipv4.protocol, ipv4.hdrChecksum, ipv4.srcAddr[31:24]]", 
                 "2": "I [ipv4.dstAddr]", 
-                "3": "I [ethernet.dstAddr[39:8]]", 
-                "4": "I [ethernet.srcAddr[31:0]]", 
-                "5": "I [udp.srcPort, udp.dstPort]", 
+                "3": "I [tcp.dstPort[7:0], tcp.seqNo[31:8]]", 
+                "4": "I [ethernet.dstAddr[39:8]]", 
+                "5": "I [ethernet.srcAddr[31:0]]", 
                 "64": "I [ipv4.srcAddr[23:16]]", 
-                "65": "I [ethernet.dstAddr[47:40]]", 
-                "66": "I [ethernet.srcAddr[39:32]]", 
-                "67": "I [POV[39:32]]", 
-                "68": "I [ig_intr_md_for_tm.drop_ctl]", 
+                "65": "I [tcp.srcPort[15:8], udp.srcPort[7:0]]", 
+                "66": "I [ethernet.dstAddr[47:40]]", 
+                "67": "I [ethernet.srcAddr[39:32]]", 
+                "68": "I [POV[39:32]]", 
+                "69": "I [ig_intr_md_for_tm.drop_ctl]", 
                 "80": "E [eg_intr_md._pad7, eg_intr_md.egress_cos]", 
                 "81": "E [POV[7:0]]", 
                 "128": "I [ig_intr_md.resubmit_flag, ig_intr_md._pad1, ig_intr_md._pad2, ig_intr_md._pad3, ig_intr_md.ingress_port]", 
                 "129": "I [packet_out_hdr.egress_port, packet_out_hdr._padding, packet_in_hdr.ingress_port, packet_in_hdr._padding]", 
                 "130": "I [ig_intr_md_for_tm.ucast_egress_port]", 
                 "131": "I [ipv4.srcAddr[15:0]]", 
-                "132": "I [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]", 
-                "133": "I [ethernet.etherType]", 
-                "134": "I [ecmp_metadata.group_id]", 
-                "135": "I [ecmp_metadata.selector]", 
+                "132": "I [tcp.srcPort[7:0], tcp.dstPort[15:8]]", 
+                "133": "I [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]", 
+                "134": "I [ethernet.etherType]", 
+                "135": "I [ecmp_metadata.group_id]", 
+                "136": "I [ecmp_metadata.selector]", 
                 "144": "E [eg_intr_md._pad0, eg_intr_md.egress_port]", 
                 "256": "I [ipv4.identification[7:0], ipv4.flags, ipv4.fragOffset, ipv4.ttl]", 
-                "257": "I [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]", 
+                "257": "I [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window, udp.length_, udp.checksum]", 
                 "258": "I [tcp.checksum, tcp.urgentPtr]", 
-                "264": "E [ipv4.ttl, ipv4.protocol, ipv4.hdrChecksum]", 
-                "265": "E [ipv4.srcAddr]", 
-                "266": "E [ipv4.dstAddr]", 
-                "267": "E [tcp.ackNo, udp.length_, udp.checksum]", 
-                "268": "E [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]", 
-                "269": "E [tcp.checksum, tcp.urgentPtr]", 
-                "270": "E [ethernet.dstAddr[39:8]]", 
-                "271": "E [ethernet.srcAddr[31:0]]", 
+                "260": "E [ipv4.ttl, ipv4.protocol, ipv4.hdrChecksum]", 
+                "261": "E [ipv4.srcAddr]", 
+                "262": "E [ipv4.dstAddr]", 
+                "263": "E [tcp.ackNo, udp.length_, udp.checksum]", 
+                "264": "E [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]", 
+                "265": "E [tcp.checksum, tcp.urgentPtr]", 
+                "266": "E [ethernet.dstAddr[39:8]]", 
+                "267": "E [ethernet.srcAddr[31:0]]", 
                 "288": "I [ipv4.version, ipv4.ihl]", 
-                "289": "I [tcp.srcPort[15:8], udp.length_[15:8]]", 
-                "290": "I [tcp.srcPort[7:0], udp.length_[7:0]]", 
-                "291": "I [tcp.dstPort[15:8]]", 
-                "292": "I [tcp.dstPort[7:0]]", 
-                "296": "E [ipv4.version, ipv4.ihl]", 
-                "297": "E [ipv4.diffserv]", 
-                "298": "E [tcp.srcPort[15:8], udp.srcPort[15:8]]", 
-                "299": "E [tcp.srcPort[7:0], udp.srcPort[7:0]]", 
-                "300": "E [ethernet.dstAddr[47:40]]", 
-                "301": "E [ethernet.srcAddr[39:32]]", 
+                "289": "I [tcp.seqNo[7:0], udp.srcPort[15:8]]", 
+                "292": "E [ipv4.version, ipv4.ihl]", 
+                "293": "E [ipv4.diffserv]", 
+                "294": "E [tcp.srcPort[15:8], udp.srcPort[15:8]]", 
+                "295": "E [tcp.srcPort[7:0], udp.srcPort[7:0]]", 
+                "296": "E [ethernet.dstAddr[47:40]]", 
+                "297": "E [ethernet.srcAddr[39:32]]", 
                 "320": "I [ipv4.diffserv, ipv4.totalLen[15:8]]", 
                 "321": "I [ipv4.totalLen[7:0], ipv4.identification[15:8]]", 
-                "322": "I [tcp.seqNo[31:16], udp.checksum]", 
-                "323": "I [tcp.seqNo[15:0]]", 
-                "324": "I [tcp.ackNo[31:16]]", 
-                "325": "I [tcp.ackNo[15:0]]", 
-                "332": "E [ipv4.totalLen]", 
-                "333": "E [ipv4.identification]", 
-                "334": "E [ipv4.flags, ipv4.fragOffset]", 
-                "335": "E [tcp.dstPort]", 
-                "336": "E [tcp.seqNo[31:16], udp.dstPort]", 
-                "337": "E [tcp.seqNo[15:0]]", 
-                "338": "E [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]", 
-                "339": "E [ethernet.etherType]", 
-                "340": "E [packet_out_hdr.egress_port, packet_out_hdr._padding, packet_in_hdr.ingress_port, packet_in_hdr._padding]"
+                "322": "I [tcp.ackNo[31:16], udp.dstPort]", 
+                "323": "I [tcp.ackNo[15:0]]", 
+                "326": "E [ipv4.totalLen]", 
+                "327": "E [ipv4.identification]", 
+                "328": "E [ipv4.flags, ipv4.fragOffset]", 
+                "329": "E [tcp.dstPort, udp.dstPort]", 
+                "330": "E [tcp.seqNo[31:16]]", 
+                "331": "E [tcp.seqNo[15:0]]", 
+                "332": "E [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]", 
+                "333": "E [ethernet.etherType]", 
+                "334": "E [packet_out_hdr.egress_port, packet_out_hdr._padding, packet_in_hdr.ingress_port, packet_in_hdr._padding]"
             }, 
             "logical_tables": {}, 
             "stateful_tables": []
@@ -893,62 +871,59 @@
                 "0": "I [POV[31:0]]", 
                 "1": "I [ipv4.protocol, ipv4.hdrChecksum, ipv4.srcAddr[31:24]]", 
                 "2": "I [ipv4.dstAddr]", 
-                "3": "I [ethernet.dstAddr[39:8]]", 
-                "4": "I [ethernet.srcAddr[31:0]]", 
-                "5": "I [udp.srcPort, udp.dstPort]", 
+                "3": "I [tcp.dstPort[7:0], tcp.seqNo[31:8]]", 
+                "4": "I [ethernet.dstAddr[39:8]]", 
+                "5": "I [ethernet.srcAddr[31:0]]", 
                 "64": "I [ipv4.srcAddr[23:16]]", 
-                "65": "I [ethernet.dstAddr[47:40]]", 
-                "66": "I [ethernet.srcAddr[39:32]]", 
-                "67": "I [POV[39:32]]", 
-                "68": "I [ig_intr_md_for_tm.drop_ctl]", 
+                "65": "I [tcp.srcPort[15:8], udp.srcPort[7:0]]", 
+                "66": "I [ethernet.dstAddr[47:40]]", 
+                "67": "I [ethernet.srcAddr[39:32]]", 
+                "68": "I [POV[39:32]]", 
+                "69": "I [ig_intr_md_for_tm.drop_ctl]", 
                 "80": "E [eg_intr_md._pad7, eg_intr_md.egress_cos]", 
                 "81": "E [POV[7:0]]", 
                 "128": "I [ig_intr_md.resubmit_flag, ig_intr_md._pad1, ig_intr_md._pad2, ig_intr_md._pad3, ig_intr_md.ingress_port]", 
                 "129": "I [packet_out_hdr.egress_port, packet_out_hdr._padding, packet_in_hdr.ingress_port, packet_in_hdr._padding]", 
                 "130": "I [ig_intr_md_for_tm.ucast_egress_port]", 
                 "131": "I [ipv4.srcAddr[15:0]]", 
-                "132": "I [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]", 
-                "133": "I [ethernet.etherType]", 
-                "134": "I [ecmp_metadata.group_id]", 
-                "135": "I [ecmp_metadata.selector]", 
+                "132": "I [tcp.srcPort[7:0], tcp.dstPort[15:8]]", 
+                "133": "I [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]", 
+                "134": "I [ethernet.etherType]", 
+                "135": "I [ecmp_metadata.group_id]", 
+                "136": "I [ecmp_metadata.selector]", 
                 "144": "E [eg_intr_md._pad0, eg_intr_md.egress_port]", 
                 "256": "I [ipv4.identification[7:0], ipv4.flags, ipv4.fragOffset, ipv4.ttl]", 
-                "257": "I [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]", 
+                "257": "I [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window, udp.length_, udp.checksum]", 
                 "258": "I [tcp.checksum, tcp.urgentPtr]", 
-                "264": "E [ipv4.ttl, ipv4.protocol, ipv4.hdrChecksum]", 
-                "265": "E [ipv4.srcAddr]", 
-                "266": "E [ipv4.dstAddr]", 
-                "267": "E [tcp.ackNo, udp.length_, udp.checksum]", 
-                "268": "E [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]", 
-                "269": "E [tcp.checksum, tcp.urgentPtr]", 
-                "270": "E [ethernet.dstAddr[39:8]]", 
-                "271": "E [ethernet.srcAddr[31:0]]", 
+                "260": "E [ipv4.ttl, ipv4.protocol, ipv4.hdrChecksum]", 
+                "261": "E [ipv4.srcAddr]", 
+                "262": "E [ipv4.dstAddr]", 
+                "263": "E [tcp.ackNo, udp.length_, udp.checksum]", 
+                "264": "E [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]", 
+                "265": "E [tcp.checksum, tcp.urgentPtr]", 
+                "266": "E [ethernet.dstAddr[39:8]]", 
+                "267": "E [ethernet.srcAddr[31:0]]", 
                 "288": "I [ipv4.version, ipv4.ihl]", 
-                "289": "I [tcp.srcPort[15:8], udp.length_[15:8]]", 
-                "290": "I [tcp.srcPort[7:0], udp.length_[7:0]]", 
-                "291": "I [tcp.dstPort[15:8]]", 
-                "292": "I [tcp.dstPort[7:0]]", 
-                "296": "E [ipv4.version, ipv4.ihl]", 
-                "297": "E [ipv4.diffserv]", 
-                "298": "E [tcp.srcPort[15:8], udp.srcPort[15:8]]", 
-                "299": "E [tcp.srcPort[7:0], udp.srcPort[7:0]]", 
-                "300": "E [ethernet.dstAddr[47:40]]", 
-                "301": "E [ethernet.srcAddr[39:32]]", 
+                "289": "I [tcp.seqNo[7:0], udp.srcPort[15:8]]", 
+                "292": "E [ipv4.version, ipv4.ihl]", 
+                "293": "E [ipv4.diffserv]", 
+                "294": "E [tcp.srcPort[15:8], udp.srcPort[15:8]]", 
+                "295": "E [tcp.srcPort[7:0], udp.srcPort[7:0]]", 
+                "296": "E [ethernet.dstAddr[47:40]]", 
+                "297": "E [ethernet.srcAddr[39:32]]", 
                 "320": "I [ipv4.diffserv, ipv4.totalLen[15:8]]", 
                 "321": "I [ipv4.totalLen[7:0], ipv4.identification[15:8]]", 
-                "322": "I [tcp.seqNo[31:16], udp.checksum]", 
-                "323": "I [tcp.seqNo[15:0]]", 
-                "324": "I [tcp.ackNo[31:16]]", 
-                "325": "I [tcp.ackNo[15:0]]", 
-                "332": "E [ipv4.totalLen]", 
-                "333": "E [ipv4.identification]", 
-                "334": "E [ipv4.flags, ipv4.fragOffset]", 
-                "335": "E [tcp.dstPort]", 
-                "336": "E [tcp.seqNo[31:16], udp.dstPort]", 
-                "337": "E [tcp.seqNo[15:0]]", 
-                "338": "E [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]", 
-                "339": "E [ethernet.etherType]", 
-                "340": "E [packet_out_hdr.egress_port, packet_out_hdr._padding, packet_in_hdr.ingress_port, packet_in_hdr._padding]"
+                "322": "I [tcp.ackNo[31:16], udp.dstPort]", 
+                "323": "I [tcp.ackNo[15:0]]", 
+                "326": "E [ipv4.totalLen]", 
+                "327": "E [ipv4.identification]", 
+                "328": "E [ipv4.flags, ipv4.fragOffset]", 
+                "329": "E [tcp.dstPort, udp.dstPort]", 
+                "330": "E [tcp.seqNo[31:16]]", 
+                "331": "E [tcp.seqNo[15:0]]", 
+                "332": "E [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]", 
+                "333": "E [ethernet.etherType]", 
+                "334": "E [packet_out_hdr.egress_port, packet_out_hdr._padding, packet_in_hdr.ingress_port, packet_in_hdr._padding]"
             }, 
             "logical_tables": {}, 
             "stateful_tables": []
@@ -958,62 +933,59 @@
                 "0": "I [POV[31:0]]", 
                 "1": "I [ipv4.protocol, ipv4.hdrChecksum, ipv4.srcAddr[31:24]]", 
                 "2": "I [ipv4.dstAddr]", 
-                "3": "I [ethernet.dstAddr[39:8]]", 
-                "4": "I [ethernet.srcAddr[31:0]]", 
-                "5": "I [udp.srcPort, udp.dstPort]", 
+                "3": "I [tcp.dstPort[7:0], tcp.seqNo[31:8]]", 
+                "4": "I [ethernet.dstAddr[39:8]]", 
+                "5": "I [ethernet.srcAddr[31:0]]", 
                 "64": "I [ipv4.srcAddr[23:16]]", 
-                "65": "I [ethernet.dstAddr[47:40]]", 
-                "66": "I [ethernet.srcAddr[39:32]]", 
-                "67": "I [POV[39:32]]", 
-                "68": "I [ig_intr_md_for_tm.drop_ctl]", 
+                "65": "I [tcp.srcPort[15:8], udp.srcPort[7:0]]", 
+                "66": "I [ethernet.dstAddr[47:40]]", 
+                "67": "I [ethernet.srcAddr[39:32]]", 
+                "68": "I [POV[39:32]]", 
+                "69": "I [ig_intr_md_for_tm.drop_ctl]", 
                 "80": "E [eg_intr_md._pad7, eg_intr_md.egress_cos]", 
                 "81": "E [POV[7:0]]", 
                 "128": "I [ig_intr_md.resubmit_flag, ig_intr_md._pad1, ig_intr_md._pad2, ig_intr_md._pad3, ig_intr_md.ingress_port]", 
                 "129": "I [packet_out_hdr.egress_port, packet_out_hdr._padding, packet_in_hdr.ingress_port, packet_in_hdr._padding]", 
                 "130": "I [ig_intr_md_for_tm.ucast_egress_port]", 
                 "131": "I [ipv4.srcAddr[15:0]]", 
-                "132": "I [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]", 
-                "133": "I [ethernet.etherType]", 
-                "134": "I [ecmp_metadata.group_id]", 
-                "135": "I [ecmp_metadata.selector]", 
+                "132": "I [tcp.srcPort[7:0], tcp.dstPort[15:8]]", 
+                "133": "I [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]", 
+                "134": "I [ethernet.etherType]", 
+                "135": "I [ecmp_metadata.group_id]", 
+                "136": "I [ecmp_metadata.selector]", 
                 "144": "E [eg_intr_md._pad0, eg_intr_md.egress_port]", 
                 "256": "I [ipv4.identification[7:0], ipv4.flags, ipv4.fragOffset, ipv4.ttl]", 
-                "257": "I [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]", 
+                "257": "I [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window, udp.length_, udp.checksum]", 
                 "258": "I [tcp.checksum, tcp.urgentPtr]", 
-                "264": "E [ipv4.ttl, ipv4.protocol, ipv4.hdrChecksum]", 
-                "265": "E [ipv4.srcAddr]", 
-                "266": "E [ipv4.dstAddr]", 
-                "267": "E [tcp.ackNo, udp.length_, udp.checksum]", 
-                "268": "E [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]", 
-                "269": "E [tcp.checksum, tcp.urgentPtr]", 
-                "270": "E [ethernet.dstAddr[39:8]]", 
-                "271": "E [ethernet.srcAddr[31:0]]", 
+                "260": "E [ipv4.ttl, ipv4.protocol, ipv4.hdrChecksum]", 
+                "261": "E [ipv4.srcAddr]", 
+                "262": "E [ipv4.dstAddr]", 
+                "263": "E [tcp.ackNo, udp.length_, udp.checksum]", 
+                "264": "E [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]", 
+                "265": "E [tcp.checksum, tcp.urgentPtr]", 
+                "266": "E [ethernet.dstAddr[39:8]]", 
+                "267": "E [ethernet.srcAddr[31:0]]", 
                 "288": "I [ipv4.version, ipv4.ihl]", 
-                "289": "I [tcp.srcPort[15:8], udp.length_[15:8]]", 
-                "290": "I [tcp.srcPort[7:0], udp.length_[7:0]]", 
-                "291": "I [tcp.dstPort[15:8]]", 
-                "292": "I [tcp.dstPort[7:0]]", 
-                "296": "E [ipv4.version, ipv4.ihl]", 
-                "297": "E [ipv4.diffserv]", 
-                "298": "E [tcp.srcPort[15:8], udp.srcPort[15:8]]", 
-                "299": "E [tcp.srcPort[7:0], udp.srcPort[7:0]]", 
-                "300": "E [ethernet.dstAddr[47:40]]", 
-                "301": "E [ethernet.srcAddr[39:32]]", 
+                "289": "I [tcp.seqNo[7:0], udp.srcPort[15:8]]", 
+                "292": "E [ipv4.version, ipv4.ihl]", 
+                "293": "E [ipv4.diffserv]", 
+                "294": "E [tcp.srcPort[15:8], udp.srcPort[15:8]]", 
+                "295": "E [tcp.srcPort[7:0], udp.srcPort[7:0]]", 
+                "296": "E [ethernet.dstAddr[47:40]]", 
+                "297": "E [ethernet.srcAddr[39:32]]", 
                 "320": "I [ipv4.diffserv, ipv4.totalLen[15:8]]", 
                 "321": "I [ipv4.totalLen[7:0], ipv4.identification[15:8]]", 
-                "322": "I [tcp.seqNo[31:16], udp.checksum]", 
-                "323": "I [tcp.seqNo[15:0]]", 
-                "324": "I [tcp.ackNo[31:16]]", 
-                "325": "I [tcp.ackNo[15:0]]", 
-                "332": "E [ipv4.totalLen]", 
-                "333": "E [ipv4.identification]", 
-                "334": "E [ipv4.flags, ipv4.fragOffset]", 
-                "335": "E [tcp.dstPort]", 
-                "336": "E [tcp.seqNo[31:16], udp.dstPort]", 
-                "337": "E [tcp.seqNo[15:0]]", 
-                "338": "E [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]", 
-                "339": "E [ethernet.etherType]", 
-                "340": "E [packet_out_hdr.egress_port, packet_out_hdr._padding, packet_in_hdr.ingress_port, packet_in_hdr._padding]"
+                "322": "I [tcp.ackNo[31:16], udp.dstPort]", 
+                "323": "I [tcp.ackNo[15:0]]", 
+                "326": "E [ipv4.totalLen]", 
+                "327": "E [ipv4.identification]", 
+                "328": "E [ipv4.flags, ipv4.fragOffset]", 
+                "329": "E [tcp.dstPort, udp.dstPort]", 
+                "330": "E [tcp.seqNo[31:16]]", 
+                "331": "E [tcp.seqNo[15:0]]", 
+                "332": "E [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]", 
+                "333": "E [ethernet.etherType]", 
+                "334": "E [packet_out_hdr.egress_port, packet_out_hdr._padding, packet_in_hdr.ingress_port, packet_in_hdr._padding]"
             }, 
             "logical_tables": {}, 
             "stateful_tables": []
@@ -1023,62 +995,59 @@
                 "0": "I [POV[31:0]]", 
                 "1": "I [ipv4.protocol, ipv4.hdrChecksum, ipv4.srcAddr[31:24]]", 
                 "2": "I [ipv4.dstAddr]", 
-                "3": "I [ethernet.dstAddr[39:8]]", 
-                "4": "I [ethernet.srcAddr[31:0]]", 
-                "5": "I [udp.srcPort, udp.dstPort]", 
+                "3": "I [tcp.dstPort[7:0], tcp.seqNo[31:8]]", 
+                "4": "I [ethernet.dstAddr[39:8]]", 
+                "5": "I [ethernet.srcAddr[31:0]]", 
                 "64": "I [ipv4.srcAddr[23:16]]", 
-                "65": "I [ethernet.dstAddr[47:40]]", 
-                "66": "I [ethernet.srcAddr[39:32]]", 
-                "67": "I [POV[39:32]]", 
-                "68": "I [ig_intr_md_for_tm.drop_ctl]", 
+                "65": "I [tcp.srcPort[15:8], udp.srcPort[7:0]]", 
+                "66": "I [ethernet.dstAddr[47:40]]", 
+                "67": "I [ethernet.srcAddr[39:32]]", 
+                "68": "I [POV[39:32]]", 
+                "69": "I [ig_intr_md_for_tm.drop_ctl]", 
                 "80": "E [eg_intr_md._pad7, eg_intr_md.egress_cos]", 
                 "81": "E [POV[7:0]]", 
                 "128": "I [ig_intr_md.resubmit_flag, ig_intr_md._pad1, ig_intr_md._pad2, ig_intr_md._pad3, ig_intr_md.ingress_port]", 
                 "129": "I [packet_out_hdr.egress_port, packet_out_hdr._padding, packet_in_hdr.ingress_port, packet_in_hdr._padding]", 
                 "130": "I [ig_intr_md_for_tm.ucast_egress_port]", 
                 "131": "I [ipv4.srcAddr[15:0]]", 
-                "132": "I [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]", 
-                "133": "I [ethernet.etherType]", 
-                "134": "I [ecmp_metadata.group_id]", 
-                "135": "I [ecmp_metadata.selector]", 
+                "132": "I [tcp.srcPort[7:0], tcp.dstPort[15:8]]", 
+                "133": "I [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]", 
+                "134": "I [ethernet.etherType]", 
+                "135": "I [ecmp_metadata.group_id]", 
+                "136": "I [ecmp_metadata.selector]", 
                 "144": "E [eg_intr_md._pad0, eg_intr_md.egress_port]", 
                 "256": "I [ipv4.identification[7:0], ipv4.flags, ipv4.fragOffset, ipv4.ttl]", 
-                "257": "I [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]", 
+                "257": "I [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window, udp.length_, udp.checksum]", 
                 "258": "I [tcp.checksum, tcp.urgentPtr]", 
-                "264": "E [ipv4.ttl, ipv4.protocol, ipv4.hdrChecksum]", 
-                "265": "E [ipv4.srcAddr]", 
-                "266": "E [ipv4.dstAddr]", 
-                "267": "E [tcp.ackNo, udp.length_, udp.checksum]", 
-                "268": "E [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]", 
-                "269": "E [tcp.checksum, tcp.urgentPtr]", 
-                "270": "E [ethernet.dstAddr[39:8]]", 
-                "271": "E [ethernet.srcAddr[31:0]]", 
+                "260": "E [ipv4.ttl, ipv4.protocol, ipv4.hdrChecksum]", 
+                "261": "E [ipv4.srcAddr]", 
+                "262": "E [ipv4.dstAddr]", 
+                "263": "E [tcp.ackNo, udp.length_, udp.checksum]", 
+                "264": "E [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]", 
+                "265": "E [tcp.checksum, tcp.urgentPtr]", 
+                "266": "E [ethernet.dstAddr[39:8]]", 
+                "267": "E [ethernet.srcAddr[31:0]]", 
                 "288": "I [ipv4.version, ipv4.ihl]", 
-                "289": "I [tcp.srcPort[15:8], udp.length_[15:8]]", 
-                "290": "I [tcp.srcPort[7:0], udp.length_[7:0]]", 
-                "291": "I [tcp.dstPort[15:8]]", 
-                "292": "I [tcp.dstPort[7:0]]", 
-                "296": "E [ipv4.version, ipv4.ihl]", 
-                "297": "E [ipv4.diffserv]", 
-                "298": "E [tcp.srcPort[15:8], udp.srcPort[15:8]]", 
-                "299": "E [tcp.srcPort[7:0], udp.srcPort[7:0]]", 
-                "300": "E [ethernet.dstAddr[47:40]]", 
-                "301": "E [ethernet.srcAddr[39:32]]", 
+                "289": "I [tcp.seqNo[7:0], udp.srcPort[15:8]]", 
+                "292": "E [ipv4.version, ipv4.ihl]", 
+                "293": "E [ipv4.diffserv]", 
+                "294": "E [tcp.srcPort[15:8], udp.srcPort[15:8]]", 
+                "295": "E [tcp.srcPort[7:0], udp.srcPort[7:0]]", 
+                "296": "E [ethernet.dstAddr[47:40]]", 
+                "297": "E [ethernet.srcAddr[39:32]]", 
                 "320": "I [ipv4.diffserv, ipv4.totalLen[15:8]]", 
                 "321": "I [ipv4.totalLen[7:0], ipv4.identification[15:8]]", 
-                "322": "I [tcp.seqNo[31:16], udp.checksum]", 
-                "323": "I [tcp.seqNo[15:0]]", 
-                "324": "I [tcp.ackNo[31:16]]", 
-                "325": "I [tcp.ackNo[15:0]]", 
-                "332": "E [ipv4.totalLen]", 
-                "333": "E [ipv4.identification]", 
-                "334": "E [ipv4.flags, ipv4.fragOffset]", 
-                "335": "E [tcp.dstPort]", 
-                "336": "E [tcp.seqNo[31:16], udp.dstPort]", 
-                "337": "E [tcp.seqNo[15:0]]", 
-                "338": "E [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]", 
-                "339": "E [ethernet.etherType]", 
-                "340": "E [packet_out_hdr.egress_port, packet_out_hdr._padding, packet_in_hdr.ingress_port, packet_in_hdr._padding]"
+                "322": "I [tcp.ackNo[31:16], udp.dstPort]", 
+                "323": "I [tcp.ackNo[15:0]]", 
+                "326": "E [ipv4.totalLen]", 
+                "327": "E [ipv4.identification]", 
+                "328": "E [ipv4.flags, ipv4.fragOffset]", 
+                "329": "E [tcp.dstPort, udp.dstPort]", 
+                "330": "E [tcp.seqNo[31:16]]", 
+                "331": "E [tcp.seqNo[15:0]]", 
+                "332": "E [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]", 
+                "333": "E [ethernet.etherType]", 
+                "334": "E [packet_out_hdr.egress_port, packet_out_hdr._padding, packet_in_hdr.ingress_port, packet_in_hdr._padding]"
             }, 
             "logical_tables": {}, 
             "stateful_tables": []
@@ -1088,62 +1057,59 @@
                 "0": "I [POV[31:0]]", 
                 "1": "I [ipv4.protocol, ipv4.hdrChecksum, ipv4.srcAddr[31:24]]", 
                 "2": "I [ipv4.dstAddr]", 
-                "3": "I [ethernet.dstAddr[39:8]]", 
-                "4": "I [ethernet.srcAddr[31:0]]", 
-                "5": "I [udp.srcPort, udp.dstPort]", 
+                "3": "I [tcp.dstPort[7:0], tcp.seqNo[31:8]]", 
+                "4": "I [ethernet.dstAddr[39:8]]", 
+                "5": "I [ethernet.srcAddr[31:0]]", 
                 "64": "I [ipv4.srcAddr[23:16]]", 
-                "65": "I [ethernet.dstAddr[47:40]]", 
-                "66": "I [ethernet.srcAddr[39:32]]", 
-                "67": "I [POV[39:32]]", 
-                "68": "I [ig_intr_md_for_tm.drop_ctl]", 
+                "65": "I [tcp.srcPort[15:8], udp.srcPort[7:0]]", 
+                "66": "I [ethernet.dstAddr[47:40]]", 
+                "67": "I [ethernet.srcAddr[39:32]]", 
+                "68": "I [POV[39:32]]", 
+                "69": "I [ig_intr_md_for_tm.drop_ctl]", 
                 "80": "E [eg_intr_md._pad7, eg_intr_md.egress_cos]", 
                 "81": "E [POV[7:0]]", 
                 "128": "I [ig_intr_md.resubmit_flag, ig_intr_md._pad1, ig_intr_md._pad2, ig_intr_md._pad3, ig_intr_md.ingress_port]", 
                 "129": "I [packet_out_hdr.egress_port, packet_out_hdr._padding, packet_in_hdr.ingress_port, packet_in_hdr._padding]", 
                 "130": "I [ig_intr_md_for_tm.ucast_egress_port]", 
                 "131": "I [ipv4.srcAddr[15:0]]", 
-                "132": "I [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]", 
-                "133": "I [ethernet.etherType]", 
-                "134": "I [ecmp_metadata.group_id]", 
-                "135": "I [ecmp_metadata.selector]", 
+                "132": "I [tcp.srcPort[7:0], tcp.dstPort[15:8]]", 
+                "133": "I [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]", 
+                "134": "I [ethernet.etherType]", 
+                "135": "I [ecmp_metadata.group_id]", 
+                "136": "I [ecmp_metadata.selector]", 
                 "144": "E [eg_intr_md._pad0, eg_intr_md.egress_port]", 
                 "256": "I [ipv4.identification[7:0], ipv4.flags, ipv4.fragOffset, ipv4.ttl]", 
-                "257": "I [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]", 
+                "257": "I [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window, udp.length_, udp.checksum]", 
                 "258": "I [tcp.checksum, tcp.urgentPtr]", 
-                "264": "E [ipv4.ttl, ipv4.protocol, ipv4.hdrChecksum]", 
-                "265": "E [ipv4.srcAddr]", 
-                "266": "E [ipv4.dstAddr]", 
-                "267": "E [tcp.ackNo, udp.length_, udp.checksum]", 
-                "268": "E [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]", 
-                "269": "E [tcp.checksum, tcp.urgentPtr]", 
-                "270": "E [ethernet.dstAddr[39:8]]", 
-                "271": "E [ethernet.srcAddr[31:0]]", 
+                "260": "E [ipv4.ttl, ipv4.protocol, ipv4.hdrChecksum]", 
+                "261": "E [ipv4.srcAddr]", 
+                "262": "E [ipv4.dstAddr]", 
+                "263": "E [tcp.ackNo, udp.length_, udp.checksum]", 
+                "264": "E [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]", 
+                "265": "E [tcp.checksum, tcp.urgentPtr]", 
+                "266": "E [ethernet.dstAddr[39:8]]", 
+                "267": "E [ethernet.srcAddr[31:0]]", 
                 "288": "I [ipv4.version, ipv4.ihl]", 
-                "289": "I [tcp.srcPort[15:8], udp.length_[15:8]]", 
-                "290": "I [tcp.srcPort[7:0], udp.length_[7:0]]", 
-                "291": "I [tcp.dstPort[15:8]]", 
-                "292": "I [tcp.dstPort[7:0]]", 
-                "296": "E [ipv4.version, ipv4.ihl]", 
-                "297": "E [ipv4.diffserv]", 
-                "298": "E [tcp.srcPort[15:8], udp.srcPort[15:8]]", 
-                "299": "E [tcp.srcPort[7:0], udp.srcPort[7:0]]", 
-                "300": "E [ethernet.dstAddr[47:40]]", 
-                "301": "E [ethernet.srcAddr[39:32]]", 
+                "289": "I [tcp.seqNo[7:0], udp.srcPort[15:8]]", 
+                "292": "E [ipv4.version, ipv4.ihl]", 
+                "293": "E [ipv4.diffserv]", 
+                "294": "E [tcp.srcPort[15:8], udp.srcPort[15:8]]", 
+                "295": "E [tcp.srcPort[7:0], udp.srcPort[7:0]]", 
+                "296": "E [ethernet.dstAddr[47:40]]", 
+                "297": "E [ethernet.srcAddr[39:32]]", 
                 "320": "I [ipv4.diffserv, ipv4.totalLen[15:8]]", 
                 "321": "I [ipv4.totalLen[7:0], ipv4.identification[15:8]]", 
-                "322": "I [tcp.seqNo[31:16], udp.checksum]", 
-                "323": "I [tcp.seqNo[15:0]]", 
-                "324": "I [tcp.ackNo[31:16]]", 
-                "325": "I [tcp.ackNo[15:0]]", 
-                "332": "E [ipv4.totalLen]", 
-                "333": "E [ipv4.identification]", 
-                "334": "E [ipv4.flags, ipv4.fragOffset]", 
-                "335": "E [tcp.dstPort]", 
-                "336": "E [tcp.seqNo[31:16], udp.dstPort]", 
-                "337": "E [tcp.seqNo[15:0]]", 
-                "338": "E [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]", 
-                "339": "E [ethernet.etherType]", 
-                "340": "E [packet_out_hdr.egress_port, packet_out_hdr._padding, packet_in_hdr.ingress_port, packet_in_hdr._padding]"
+                "322": "I [tcp.ackNo[31:16], udp.dstPort]", 
+                "323": "I [tcp.ackNo[15:0]]", 
+                "326": "E [ipv4.totalLen]", 
+                "327": "E [ipv4.identification]", 
+                "328": "E [ipv4.flags, ipv4.fragOffset]", 
+                "329": "E [tcp.dstPort, udp.dstPort]", 
+                "330": "E [tcp.seqNo[31:16]]", 
+                "331": "E [tcp.seqNo[15:0]]", 
+                "332": "E [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]", 
+                "333": "E [ethernet.etherType]", 
+                "334": "E [packet_out_hdr.egress_port, packet_out_hdr._padding, packet_in_hdr.ingress_port, packet_in_hdr._padding]"
             }, 
             "logical_tables": {}, 
             "stateful_tables": []
@@ -1153,62 +1119,59 @@
                 "0": "I [POV[31:0]]", 
                 "1": "I [ipv4.protocol, ipv4.hdrChecksum, ipv4.srcAddr[31:24]]", 
                 "2": "I [ipv4.dstAddr]", 
-                "3": "I [ethernet.dstAddr[39:8]]", 
-                "4": "I [ethernet.srcAddr[31:0]]", 
-                "5": "I [udp.srcPort, udp.dstPort]", 
+                "3": "I [tcp.dstPort[7:0], tcp.seqNo[31:8]]", 
+                "4": "I [ethernet.dstAddr[39:8]]", 
+                "5": "I [ethernet.srcAddr[31:0]]", 
                 "64": "I [ipv4.srcAddr[23:16]]", 
-                "65": "I [ethernet.dstAddr[47:40]]", 
-                "66": "I [ethernet.srcAddr[39:32]]", 
-                "67": "I [POV[39:32]]", 
-                "68": "I [ig_intr_md_for_tm.drop_ctl]", 
+                "65": "I [tcp.srcPort[15:8], udp.srcPort[7:0]]", 
+                "66": "I [ethernet.dstAddr[47:40]]", 
+                "67": "I [ethernet.srcAddr[39:32]]", 
+                "68": "I [POV[39:32]]", 
+                "69": "I [ig_intr_md_for_tm.drop_ctl]", 
                 "80": "E [eg_intr_md._pad7, eg_intr_md.egress_cos]", 
                 "81": "E [POV[7:0]]", 
                 "128": "I [ig_intr_md.resubmit_flag, ig_intr_md._pad1, ig_intr_md._pad2, ig_intr_md._pad3, ig_intr_md.ingress_port]", 
                 "129": "I [packet_out_hdr.egress_port, packet_out_hdr._padding, packet_in_hdr.ingress_port, packet_in_hdr._padding]", 
                 "130": "I [ig_intr_md_for_tm.ucast_egress_port]", 
                 "131": "I [ipv4.srcAddr[15:0]]", 
-                "132": "I [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]", 
-                "133": "I [ethernet.etherType]", 
-                "134": "I [ecmp_metadata.group_id]", 
-                "135": "I [ecmp_metadata.selector]", 
+                "132": "I [tcp.srcPort[7:0], tcp.dstPort[15:8]]", 
+                "133": "I [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]", 
+                "134": "I [ethernet.etherType]", 
+                "135": "I [ecmp_metadata.group_id]", 
+                "136": "I [ecmp_metadata.selector]", 
                 "144": "E [eg_intr_md._pad0, eg_intr_md.egress_port]", 
                 "256": "I [ipv4.identification[7:0], ipv4.flags, ipv4.fragOffset, ipv4.ttl]", 
-                "257": "I [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]", 
+                "257": "I [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window, udp.length_, udp.checksum]", 
                 "258": "I [tcp.checksum, tcp.urgentPtr]", 
-                "264": "E [ipv4.ttl, ipv4.protocol, ipv4.hdrChecksum]", 
-                "265": "E [ipv4.srcAddr]", 
-                "266": "E [ipv4.dstAddr]", 
-                "267": "E [tcp.ackNo, udp.length_, udp.checksum]", 
-                "268": "E [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]", 
-                "269": "E [tcp.checksum, tcp.urgentPtr]", 
-                "270": "E [ethernet.dstAddr[39:8]]", 
-                "271": "E [ethernet.srcAddr[31:0]]", 
+                "260": "E [ipv4.ttl, ipv4.protocol, ipv4.hdrChecksum]", 
+                "261": "E [ipv4.srcAddr]", 
+                "262": "E [ipv4.dstAddr]", 
+                "263": "E [tcp.ackNo, udp.length_, udp.checksum]", 
+                "264": "E [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]", 
+                "265": "E [tcp.checksum, tcp.urgentPtr]", 
+                "266": "E [ethernet.dstAddr[39:8]]", 
+                "267": "E [ethernet.srcAddr[31:0]]", 
                 "288": "I [ipv4.version, ipv4.ihl]", 
-                "289": "I [tcp.srcPort[15:8], udp.length_[15:8]]", 
-                "290": "I [tcp.srcPort[7:0], udp.length_[7:0]]", 
-                "291": "I [tcp.dstPort[15:8]]", 
-                "292": "I [tcp.dstPort[7:0]]", 
-                "296": "E [ipv4.version, ipv4.ihl]", 
-                "297": "E [ipv4.diffserv]", 
-                "298": "E [tcp.srcPort[15:8], udp.srcPort[15:8]]", 
-                "299": "E [tcp.srcPort[7:0], udp.srcPort[7:0]]", 
-                "300": "E [ethernet.dstAddr[47:40]]", 
-                "301": "E [ethernet.srcAddr[39:32]]", 
+                "289": "I [tcp.seqNo[7:0], udp.srcPort[15:8]]", 
+                "292": "E [ipv4.version, ipv4.ihl]", 
+                "293": "E [ipv4.diffserv]", 
+                "294": "E [tcp.srcPort[15:8], udp.srcPort[15:8]]", 
+                "295": "E [tcp.srcPort[7:0], udp.srcPort[7:0]]", 
+                "296": "E [ethernet.dstAddr[47:40]]", 
+                "297": "E [ethernet.srcAddr[39:32]]", 
                 "320": "I [ipv4.diffserv, ipv4.totalLen[15:8]]", 
                 "321": "I [ipv4.totalLen[7:0], ipv4.identification[15:8]]", 
-                "322": "I [tcp.seqNo[31:16], udp.checksum]", 
-                "323": "I [tcp.seqNo[15:0]]", 
-                "324": "I [tcp.ackNo[31:16]]", 
-                "325": "I [tcp.ackNo[15:0]]", 
-                "332": "E [ipv4.totalLen]", 
-                "333": "E [ipv4.identification]", 
-                "334": "E [ipv4.flags, ipv4.fragOffset]", 
-                "335": "E [tcp.dstPort]", 
-                "336": "E [tcp.seqNo[31:16], udp.dstPort]", 
-                "337": "E [tcp.seqNo[15:0]]", 
-                "338": "E [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]", 
-                "339": "E [ethernet.etherType]", 
-                "340": "E [packet_out_hdr.egress_port, packet_out_hdr._padding, packet_in_hdr.ingress_port, packet_in_hdr._padding]"
+                "322": "I [tcp.ackNo[31:16], udp.dstPort]", 
+                "323": "I [tcp.ackNo[15:0]]", 
+                "326": "E [ipv4.totalLen]", 
+                "327": "E [ipv4.identification]", 
+                "328": "E [ipv4.flags, ipv4.fragOffset]", 
+                "329": "E [tcp.dstPort, udp.dstPort]", 
+                "330": "E [tcp.seqNo[31:16]]", 
+                "331": "E [tcp.seqNo[15:0]]", 
+                "332": "E [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]", 
+                "333": "E [ethernet.etherType]", 
+                "334": "E [packet_out_hdr.egress_port, packet_out_hdr._padding, packet_in_hdr.ingress_port, packet_in_hdr._padding]"
             }, 
             "logical_tables": {}, 
             "stateful_tables": []
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/context/parser.context.json b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/context/parser.context.json
index 22409ec..d8145f6 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/context/parser.context.json
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/context/parser.context.json
@@ -243,6 +243,7 @@
       null, 
       null, 
       null, 
+      null, 
       {
         "origin": "start", 
         "origin-case": 0, 
@@ -280,12 +281,6 @@
         "origin-mask": 511
       }, 
       {
-        "origin": "parse_tcp", 
-        "origin-case": 0, 
-        "state": "parse_tcp//spilled", 
-        "origin-mask": 0
-      }, 
-      {
         "origin": "parse_ipv4", 
         "origin-case": 0, 
         "state": "<leaf>", 
@@ -339,8 +334,7 @@
       "6": "default_parser", 
       "7": "parse_pkt_out", 
       "8": "<POV initialization>_<Ingress intrinsic metadata>_<Phase 0>", 
-      "9": "start", 
-      "10": "parse_tcp//spilled"
+      "9": "start"
     }
   }, 
   "egress": {
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/context/phv.context.json b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/context/phv.context.json
index b387dd4..d15801c 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/context/phv.context.json
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/context/phv.context.json
@@ -57,11 +57,18 @@
       "pipeline": "ingress", 
       "data": [
         {
-          "data_lsb": 8, 
-          "data_msb": 39, 
-          "name": "ethernet.dstAddr", 
-          "container_lsb": 0, 
+          "data_lsb": 0, 
+          "data_msb": 7, 
+          "name": "tcp.dstPort", 
+          "container_lsb": 24, 
           "container_msb": 31
+        }, 
+        {
+          "data_lsb": 8, 
+          "data_msb": 31, 
+          "name": "tcp.seqNo", 
+          "container_lsb": 0, 
+          "container_msb": 23
         }
       ], 
       "address": 3
@@ -70,9 +77,9 @@
       "pipeline": "ingress", 
       "data": [
         {
-          "data_lsb": 0, 
-          "data_msb": 31, 
-          "name": "ethernet.srcAddr", 
+          "data_lsb": 8, 
+          "data_msb": 39, 
+          "name": "ethernet.dstAddr", 
           "container_lsb": 0, 
           "container_msb": 31
         }
@@ -84,17 +91,10 @@
       "data": [
         {
           "data_lsb": 0, 
-          "data_msb": 15, 
-          "name": "udp.srcPort", 
-          "container_lsb": 16, 
-          "container_msb": 31
-        }, 
-        {
-          "data_lsb": 0, 
-          "data_msb": 15, 
-          "name": "udp.dstPort", 
+          "data_msb": 31, 
+          "name": "ethernet.srcAddr", 
           "container_lsb": 0, 
-          "container_msb": 15
+          "container_msb": 31
         }
       ], 
       "address": 5
@@ -406,9 +406,16 @@
       "pipeline": "ingress", 
       "data": [
         {
-          "data_lsb": 40, 
-          "data_msb": 47, 
-          "name": "ethernet.dstAddr", 
+          "data_lsb": 8, 
+          "data_msb": 15, 
+          "name": "tcp.srcPort", 
+          "container_lsb": 0, 
+          "container_msb": 7
+        }, 
+        {
+          "data_lsb": 0, 
+          "data_msb": 7, 
+          "name": "udp.srcPort", 
           "container_lsb": 0, 
           "container_msb": 7
         }
@@ -419,9 +426,9 @@
       "pipeline": "ingress", 
       "data": [
         {
-          "data_lsb": 32, 
-          "data_msb": 39, 
-          "name": "ethernet.srcAddr", 
+          "data_lsb": 40, 
+          "data_msb": 47, 
+          "name": "ethernet.dstAddr", 
           "container_lsb": 0, 
           "container_msb": 7
         }
@@ -434,7 +441,7 @@
         {
           "data_lsb": 32, 
           "data_msb": 39, 
-          "name": "POV", 
+          "name": "ethernet.srcAddr", 
           "container_lsb": 0, 
           "container_msb": 7
         }
@@ -445,6 +452,19 @@
       "pipeline": "ingress", 
       "data": [
         {
+          "data_lsb": 32, 
+          "data_msb": 39, 
+          "name": "POV", 
+          "container_lsb": 0, 
+          "container_msb": 7
+        }
+      ], 
+      "address": 68
+    }, 
+    {
+      "pipeline": "ingress", 
+      "data": [
+        {
           "data_lsb": 0, 
           "data_msb": 2, 
           "name": "ig_intr_md_for_tm.drop_ctl", 
@@ -452,11 +472,6 @@
           "container_msb": 7
         }
       ], 
-      "address": 68
-    }, 
-    {
-      "pipeline": "unused", 
-      "data": [], 
       "address": 69
     }, 
     {
@@ -879,6 +894,26 @@
         {
           "data_lsb": 0, 
           "data_msb": 7, 
+          "name": "tcp.srcPort", 
+          "container_lsb": 8, 
+          "container_msb": 15
+        }, 
+        {
+          "data_lsb": 8, 
+          "data_msb": 15, 
+          "name": "tcp.dstPort", 
+          "container_lsb": 0, 
+          "container_msb": 7
+        }
+      ], 
+      "address": 132
+    }, 
+    {
+      "pipeline": "ingress", 
+      "data": [
+        {
+          "data_lsb": 0, 
+          "data_msb": 7, 
           "name": "ethernet.dstAddr", 
           "container_lsb": 8, 
           "container_msb": 15
@@ -891,7 +926,7 @@
           "container_msb": 7
         }
       ], 
-      "address": 132
+      "address": 133
     }, 
     {
       "pipeline": "ingress", 
@@ -904,7 +939,7 @@
           "container_msb": 15
         }
       ], 
-      "address": 133
+      "address": 134
     }, 
     {
       "pipeline": "ingress", 
@@ -917,7 +952,7 @@
           "container_msb": 15
         }
       ], 
-      "address": 134
+      "address": 135
     }, 
     {
       "pipeline": "ingress", 
@@ -930,11 +965,6 @@
           "container_msb": 15
         }
       ], 
-      "address": 135
-    }, 
-    {
-      "pipeline": "unused", 
-      "data": [], 
       "address": 136
     }, 
     {
@@ -1490,6 +1520,20 @@
           "name": "tcp.window", 
           "container_lsb": 0, 
           "container_msb": 15
+        }, 
+        {
+          "data_lsb": 0, 
+          "data_msb": 15, 
+          "name": "udp.length_", 
+          "container_lsb": 16, 
+          "container_msb": 31
+        }, 
+        {
+          "data_lsb": 0, 
+          "data_msb": 15, 
+          "name": "udp.checksum", 
+          "container_lsb": 0, 
+          "container_msb": 15
         }
       ], 
       "address": 257
@@ -1520,26 +1564,6 @@
       "address": 259
     }, 
     {
-      "pipeline": "unused", 
-      "data": [], 
-      "address": 260
-    }, 
-    {
-      "pipeline": "unused", 
-      "data": [], 
-      "address": 261
-    }, 
-    {
-      "pipeline": "unused", 
-      "data": [], 
-      "address": 262
-    }, 
-    {
-      "pipeline": "unused", 
-      "data": [], 
-      "address": 263
-    }, 
-    {
       "pipeline": "egress", 
       "data": [
         {
@@ -1564,7 +1588,7 @@
           "container_msb": 15
         }
       ], 
-      "address": 264
+      "address": 260
     }, 
     {
       "pipeline": "egress", 
@@ -1577,7 +1601,7 @@
           "container_msb": 31
         }
       ], 
-      "address": 265
+      "address": 261
     }, 
     {
       "pipeline": "egress", 
@@ -1590,7 +1614,7 @@
           "container_msb": 31
         }
       ], 
-      "address": 266
+      "address": 262
     }, 
     {
       "pipeline": "egress", 
@@ -1617,7 +1641,7 @@
           "container_msb": 15
         }
       ], 
-      "address": 267
+      "address": 263
     }, 
     {
       "pipeline": "egress", 
@@ -1658,7 +1682,7 @@
           "container_msb": 15
         }
       ], 
-      "address": 268
+      "address": 264
     }, 
     {
       "pipeline": "egress", 
@@ -1678,7 +1702,7 @@
           "container_msb": 15
         }
       ], 
-      "address": 269
+      "address": 265
     }, 
     {
       "pipeline": "egress", 
@@ -1691,7 +1715,7 @@
           "container_msb": 31
         }
       ], 
-      "address": 270
+      "address": 266
     }, 
     {
       "pipeline": "egress", 
@@ -1704,6 +1728,26 @@
           "container_msb": 31
         }
       ], 
+      "address": 267
+    }, 
+    {
+      "pipeline": "unused", 
+      "data": [], 
+      "address": 268
+    }, 
+    {
+      "pipeline": "unused", 
+      "data": [], 
+      "address": 269
+    }, 
+    {
+      "pipeline": "unused", 
+      "data": [], 
+      "address": 270
+    }, 
+    {
+      "pipeline": "unused", 
+      "data": [], 
       "address": 271
     }, 
     {
@@ -1810,16 +1854,16 @@
       "pipeline": "ingress", 
       "data": [
         {
-          "data_lsb": 8, 
-          "data_msb": 15, 
-          "name": "tcp.srcPort", 
+          "data_lsb": 0, 
+          "data_msb": 7, 
+          "name": "tcp.seqNo", 
           "container_lsb": 0, 
           "container_msb": 7
         }, 
         {
           "data_lsb": 8, 
           "data_msb": 15, 
-          "name": "udp.length_", 
+          "name": "udp.srcPort", 
           "container_lsb": 0, 
           "container_msb": 7
         }
@@ -1827,67 +1871,16 @@
       "address": 289
     }, 
     {
-      "pipeline": "ingress", 
-      "data": [
-        {
-          "data_lsb": 0, 
-          "data_msb": 7, 
-          "name": "tcp.srcPort", 
-          "container_lsb": 0, 
-          "container_msb": 7
-        }, 
-        {
-          "data_lsb": 0, 
-          "data_msb": 7, 
-          "name": "udp.length_", 
-          "container_lsb": 0, 
-          "container_msb": 7
-        }
-      ], 
+      "pipeline": "unused", 
+      "data": [], 
       "address": 290
     }, 
     {
-      "pipeline": "ingress", 
-      "data": [
-        {
-          "data_lsb": 8, 
-          "data_msb": 15, 
-          "name": "tcp.dstPort", 
-          "container_lsb": 0, 
-          "container_msb": 7
-        }
-      ], 
+      "pipeline": "unused", 
+      "data": [], 
       "address": 291
     }, 
     {
-      "pipeline": "ingress", 
-      "data": [
-        {
-          "data_lsb": 0, 
-          "data_msb": 7, 
-          "name": "tcp.dstPort", 
-          "container_lsb": 0, 
-          "container_msb": 7
-        }
-      ], 
-      "address": 292
-    }, 
-    {
-      "pipeline": "unused", 
-      "data": [], 
-      "address": 293
-    }, 
-    {
-      "pipeline": "unused", 
-      "data": [], 
-      "address": 294
-    }, 
-    {
-      "pipeline": "unused", 
-      "data": [], 
-      "address": 295
-    }, 
-    {
       "pipeline": "egress", 
       "data": [
         {
@@ -1905,7 +1898,7 @@
           "container_msb": 3
         }
       ], 
-      "address": 296
+      "address": 292
     }, 
     {
       "pipeline": "egress", 
@@ -1918,7 +1911,7 @@
           "container_msb": 7
         }
       ], 
-      "address": 297
+      "address": 293
     }, 
     {
       "pipeline": "egress", 
@@ -1938,7 +1931,7 @@
           "container_msb": 7
         }
       ], 
-      "address": 298
+      "address": 294
     }, 
     {
       "pipeline": "egress", 
@@ -1958,7 +1951,7 @@
           "container_msb": 7
         }
       ], 
-      "address": 299
+      "address": 295
     }, 
     {
       "pipeline": "egress", 
@@ -1971,7 +1964,7 @@
           "container_msb": 7
         }
       ], 
-      "address": 300
+      "address": 296
     }, 
     {
       "pipeline": "egress", 
@@ -1984,6 +1977,26 @@
           "container_msb": 7
         }
       ], 
+      "address": 297
+    }, 
+    {
+      "pipeline": "unused", 
+      "data": [], 
+      "address": 298
+    }, 
+    {
+      "pipeline": "unused", 
+      "data": [], 
+      "address": 299
+    }, 
+    {
+      "pipeline": "unused", 
+      "data": [], 
+      "address": 300
+    }, 
+    {
+      "pipeline": "unused", 
+      "data": [], 
       "address": 301
     }, 
     {
@@ -2122,14 +2135,14 @@
         {
           "data_lsb": 16, 
           "data_msb": 31, 
-          "name": "tcp.seqNo", 
+          "name": "tcp.ackNo", 
           "container_lsb": 0, 
           "container_msb": 15
         }, 
         {
           "data_lsb": 0, 
           "data_msb": 15, 
-          "name": "udp.checksum", 
+          "name": "udp.dstPort", 
           "container_lsb": 0, 
           "container_msb": 15
         }
@@ -2142,7 +2155,7 @@
         {
           "data_lsb": 0, 
           "data_msb": 15, 
-          "name": "tcp.seqNo", 
+          "name": "tcp.ackNo", 
           "container_lsb": 0, 
           "container_msb": 15
         }
@@ -2150,62 +2163,16 @@
       "address": 323
     }, 
     {
-      "pipeline": "ingress", 
-      "data": [
-        {
-          "data_lsb": 16, 
-          "data_msb": 31, 
-          "name": "tcp.ackNo", 
-          "container_lsb": 0, 
-          "container_msb": 15
-        }
-      ], 
+      "pipeline": "unused", 
+      "data": [], 
       "address": 324
     }, 
     {
-      "pipeline": "ingress", 
-      "data": [
-        {
-          "data_lsb": 0, 
-          "data_msb": 15, 
-          "name": "tcp.ackNo", 
-          "container_lsb": 0, 
-          "container_msb": 15
-        }
-      ], 
+      "pipeline": "unused", 
+      "data": [], 
       "address": 325
     }, 
     {
-      "pipeline": "unused", 
-      "data": [], 
-      "address": 326
-    }, 
-    {
-      "pipeline": "unused", 
-      "data": [], 
-      "address": 327
-    }, 
-    {
-      "pipeline": "unused", 
-      "data": [], 
-      "address": 328
-    }, 
-    {
-      "pipeline": "unused", 
-      "data": [], 
-      "address": 329
-    }, 
-    {
-      "pipeline": "unused", 
-      "data": [], 
-      "address": 330
-    }, 
-    {
-      "pipeline": "unused", 
-      "data": [], 
-      "address": 331
-    }, 
-    {
       "pipeline": "egress", 
       "data": [
         {
@@ -2216,7 +2183,7 @@
           "container_msb": 15
         }
       ], 
-      "address": 332
+      "address": 326
     }, 
     {
       "pipeline": "egress", 
@@ -2229,7 +2196,7 @@
           "container_msb": 15
         }
       ], 
-      "address": 333
+      "address": 327
     }, 
     {
       "pipeline": "egress", 
@@ -2249,7 +2216,7 @@
           "container_msb": 12
         }
       ], 
-      "address": 334
+      "address": 328
     }, 
     {
       "pipeline": "egress", 
@@ -2260,19 +2227,6 @@
           "name": "tcp.dstPort", 
           "container_lsb": 0, 
           "container_msb": 15
-        }
-      ], 
-      "address": 335
-    }, 
-    {
-      "pipeline": "egress", 
-      "data": [
-        {
-          "data_lsb": 16, 
-          "data_msb": 31, 
-          "name": "tcp.seqNo", 
-          "container_lsb": 0, 
-          "container_msb": 15
         }, 
         {
           "data_lsb": 0, 
@@ -2282,7 +2236,20 @@
           "container_msb": 15
         }
       ], 
-      "address": 336
+      "address": 329
+    }, 
+    {
+      "pipeline": "egress", 
+      "data": [
+        {
+          "data_lsb": 16, 
+          "data_msb": 31, 
+          "name": "tcp.seqNo", 
+          "container_lsb": 0, 
+          "container_msb": 15
+        }
+      ], 
+      "address": 330
     }, 
     {
       "pipeline": "egress", 
@@ -2295,7 +2262,7 @@
           "container_msb": 15
         }
       ], 
-      "address": 337
+      "address": 331
     }, 
     {
       "pipeline": "egress", 
@@ -2315,7 +2282,7 @@
           "container_msb": 7
         }
       ], 
-      "address": 338
+      "address": 332
     }, 
     {
       "pipeline": "egress", 
@@ -2328,7 +2295,7 @@
           "container_msb": 15
         }
       ], 
-      "address": 339
+      "address": 333
     }, 
     {
       "pipeline": "egress", 
@@ -2362,6 +2329,36 @@
           "container_msb": 6
         }
       ], 
+      "address": 334
+    }, 
+    {
+      "pipeline": "unused", 
+      "data": [], 
+      "address": 335
+    }, 
+    {
+      "pipeline": "unused", 
+      "data": [], 
+      "address": 336
+    }, 
+    {
+      "pipeline": "unused", 
+      "data": [], 
+      "address": 337
+    }, 
+    {
+      "pipeline": "unused", 
+      "data": [], 
+      "address": 338
+    }, 
+    {
+      "pipeline": "unused", 
+      "data": [], 
+      "address": 339
+    }, 
+    {
+      "pipeline": "unused", 
+      "data": [], 
       "address": 340
     }, 
     {
@@ -2518,7 +2515,7 @@
           "data_lsb": 0, 
           "data_msb": 15, 
           "container_lsb": 0, 
-          "address": 134
+          "address": 135
         }
       ], 
       "tcp.ctrl": [
@@ -2532,18 +2529,11 @@
       ], 
       "udp.length_": [
         {
-          "container_msb": 7, 
-          "data_lsb": 8, 
-          "data_msb": 15, 
-          "container_lsb": 0, 
-          "address": 289
-        }, 
-        {
-          "container_msb": 7, 
+          "container_msb": 31, 
           "data_lsb": 0, 
-          "data_msb": 7, 
-          "container_lsb": 0, 
-          "address": 290
+          "data_msb": 15, 
+          "container_lsb": 16, 
+          "address": 257
         }
       ], 
       "tcp.checksum": [
@@ -2561,30 +2551,23 @@
           "data_lsb": 8, 
           "data_msb": 15, 
           "container_lsb": 0, 
-          "address": 289
+          "address": 65
         }, 
         {
-          "container_msb": 7, 
-          "data_lsb": 0, 
-          "data_msb": 7, 
-          "container_lsb": 0, 
-          "address": 290
-        }
-      ], 
-      "tcp.ackNo": [
-        {
           "container_msb": 15, 
-          "data_lsb": 16, 
-          "data_msb": 31, 
-          "container_lsb": 0, 
-          "address": 324
-        }, 
+          "data_lsb": 0, 
+          "data_msb": 7, 
+          "container_lsb": 8, 
+          "address": 132
+        }
+      ], 
+      "udp.dstPort": [
         {
           "container_msb": 15, 
           "data_lsb": 0, 
           "data_msb": 15, 
           "container_lsb": 0, 
-          "address": 325
+          "address": 322
         }
       ], 
       "ethernet.etherType": [
@@ -2593,7 +2576,7 @@
           "data_lsb": 0, 
           "data_msb": 15, 
           "container_lsb": 0, 
-          "address": 133
+          "address": 134
         }
       ], 
       "packet_in_hdr.ingress_port": [
@@ -2625,18 +2608,18 @@
       ], 
       "tcp.dstPort": [
         {
+          "container_msb": 31, 
+          "data_lsb": 0, 
+          "data_msb": 7, 
+          "container_lsb": 24, 
+          "address": 3
+        }, 
+        {
           "container_msb": 7, 
           "data_lsb": 8, 
           "data_msb": 15, 
           "container_lsb": 0, 
-          "address": 291
-        }, 
-        {
-          "container_msb": 7, 
-          "data_lsb": 0, 
-          "data_msb": 7, 
-          "container_lsb": 0, 
-          "address": 292
+          "address": 132
         }
       ], 
       "ig_intr_md._pad1": [
@@ -2672,7 +2655,7 @@
           "data_lsb": 0, 
           "data_msb": 15, 
           "container_lsb": 0, 
-          "address": 135
+          "address": 136
         }
       ], 
       "ig_intr_md_for_tm.drop_ctl": [
@@ -2681,7 +2664,7 @@
           "data_lsb": 0, 
           "data_msb": 2, 
           "container_lsb": 5, 
-          "address": 68
+          "address": 69
         }
       ], 
       "POV": [
@@ -2697,7 +2680,7 @@
           "data_lsb": 32, 
           "data_msb": 39, 
           "container_lsb": 0, 
-          "address": 67
+          "address": 68
         }
       ], 
       "tcp.res": [
@@ -2715,21 +2698,21 @@
           "data_lsb": 8, 
           "data_msb": 39, 
           "container_lsb": 0, 
-          "address": 3
+          "address": 4
         }, 
         {
           "container_msb": 7, 
           "data_lsb": 40, 
           "data_msb": 47, 
           "container_lsb": 0, 
-          "address": 65
+          "address": 66
         }, 
         {
           "container_msb": 15, 
           "data_lsb": 0, 
           "data_msb": 7, 
           "container_lsb": 8, 
-          "address": 132
+          "address": 133
         }
       ], 
       "ipv4.ihl": [
@@ -2765,21 +2748,21 @@
           "data_lsb": 0, 
           "data_msb": 31, 
           "container_lsb": 0, 
-          "address": 4
+          "address": 5
         }, 
         {
           "container_msb": 7, 
           "data_lsb": 32, 
           "data_msb": 39, 
           "container_lsb": 0, 
-          "address": 66
+          "address": 67
         }, 
         {
           "container_msb": 7, 
           "data_lsb": 40, 
           "data_msb": 47, 
           "container_lsb": 0, 
-          "address": 132
+          "address": 133
         }
       ], 
       "ipv4.diffserv": [
@@ -2856,23 +2839,23 @@
           "data_lsb": 0, 
           "data_msb": 15, 
           "container_lsb": 0, 
-          "address": 322
+          "address": 257
         }
       ], 
       "tcp.seqNo": [
         {
-          "container_msb": 15, 
-          "data_lsb": 16, 
+          "container_msb": 23, 
+          "data_lsb": 8, 
           "data_msb": 31, 
           "container_lsb": 0, 
-          "address": 322
+          "address": 3
         }, 
         {
-          "container_msb": 15, 
+          "container_msb": 7, 
           "data_lsb": 0, 
-          "data_msb": 15, 
+          "data_msb": 7, 
           "container_lsb": 0, 
-          "address": 323
+          "address": 289
         }
       ], 
       "ipv4.ttl": [
@@ -2886,20 +2869,34 @@
       ], 
       "udp.srcPort": [
         {
-          "container_msb": 31, 
+          "container_msb": 7, 
           "data_lsb": 0, 
+          "data_msb": 7, 
+          "container_lsb": 0, 
+          "address": 65
+        }, 
+        {
+          "container_msb": 7, 
+          "data_lsb": 8, 
           "data_msb": 15, 
-          "container_lsb": 16, 
-          "address": 5
+          "container_lsb": 0, 
+          "address": 289
         }
       ], 
-      "udp.dstPort": [
+      "tcp.ackNo": [
+        {
+          "container_msb": 15, 
+          "data_lsb": 16, 
+          "data_msb": 31, 
+          "container_lsb": 0, 
+          "address": 322
+        }, 
         {
           "container_msb": 15, 
           "data_lsb": 0, 
           "data_msb": 15, 
           "container_lsb": 0, 
-          "address": 5
+          "address": 323
         }
       ], 
       "ipv4.version": [
@@ -3005,7 +3002,7 @@
           "data_lsb": 0, 
           "data_msb": 15, 
           "container_lsb": 0, 
-          "address": 264
+          "address": 260
         }
       ], 
       "packet_in_hdr.ingress_port": [
@@ -3014,7 +3011,7 @@
           "data_lsb": 0, 
           "data_msb": 8, 
           "container_lsb": 7, 
-          "address": 340
+          "address": 334
         }
       ], 
       "tcp.srcPort": [
@@ -3023,14 +3020,14 @@
           "data_lsb": 8, 
           "data_msb": 15, 
           "container_lsb": 0, 
-          "address": 298
+          "address": 294
         }, 
         {
           "container_msb": 7, 
           "data_lsb": 0, 
           "data_msb": 7, 
           "container_lsb": 0, 
-          "address": 299
+          "address": 295
         }
       ], 
       "udp.dstPort": [
@@ -3039,7 +3036,7 @@
           "data_lsb": 0, 
           "data_msb": 15, 
           "container_lsb": 0, 
-          "address": 336
+          "address": 329
         }
       ], 
       "ethernet.etherType": [
@@ -3048,7 +3045,7 @@
           "data_lsb": 0, 
           "data_msb": 15, 
           "container_lsb": 0, 
-          "address": 339
+          "address": 333
         }
       ], 
       "tcp.ctrl": [
@@ -3057,7 +3054,7 @@
           "data_lsb": 0, 
           "data_msb": 5, 
           "container_lsb": 16, 
-          "address": 268
+          "address": 264
         }
       ], 
       "packet_out_hdr._padding": [
@@ -3066,7 +3063,7 @@
           "data_lsb": 0, 
           "data_msb": 6, 
           "container_lsb": 0, 
-          "address": 340
+          "address": 334
         }
       ], 
       "tcp.dstPort": [
@@ -3075,7 +3072,7 @@
           "data_lsb": 0, 
           "data_msb": 15, 
           "container_lsb": 0, 
-          "address": 335
+          "address": 329
         }
       ], 
       "eg_intr_md._pad0": [
@@ -3120,7 +3117,7 @@
           "data_lsb": 0, 
           "data_msb": 2, 
           "container_lsb": 25, 
-          "address": 268
+          "address": 264
         }
       ], 
       "ethernet.dstAddr": [
@@ -3129,21 +3126,21 @@
           "data_lsb": 8, 
           "data_msb": 39, 
           "container_lsb": 0, 
-          "address": 270
+          "address": 266
         }, 
         {
           "container_msb": 7, 
           "data_lsb": 40, 
           "data_msb": 47, 
           "container_lsb": 0, 
-          "address": 300
+          "address": 296
         }, 
         {
           "container_msb": 15, 
           "data_lsb": 0, 
           "data_msb": 7, 
           "container_lsb": 8, 
-          "address": 338
+          "address": 332
         }
       ], 
       "ipv4.ihl": [
@@ -3152,7 +3149,7 @@
           "data_lsb": 0, 
           "data_msb": 3, 
           "container_lsb": 0, 
-          "address": 296
+          "address": 292
         }
       ], 
       "ipv4.dstAddr": [
@@ -3161,7 +3158,7 @@
           "data_lsb": 0, 
           "data_msb": 31, 
           "container_lsb": 0, 
-          "address": 266
+          "address": 262
         }
       ], 
       "ipv4.diffserv": [
@@ -3170,7 +3167,7 @@
           "data_lsb": 0, 
           "data_msb": 7, 
           "container_lsb": 0, 
-          "address": 297
+          "address": 293
         }
       ], 
       "ipv4.totalLen": [
@@ -3179,7 +3176,7 @@
           "data_lsb": 0, 
           "data_msb": 15, 
           "container_lsb": 0, 
-          "address": 332
+          "address": 326
         }
       ], 
       "ethernet.srcAddr": [
@@ -3188,21 +3185,21 @@
           "data_lsb": 0, 
           "data_msb": 31, 
           "container_lsb": 0, 
-          "address": 271
+          "address": 267
         }, 
         {
           "container_msb": 7, 
           "data_lsb": 32, 
           "data_msb": 39, 
           "container_lsb": 0, 
-          "address": 301
+          "address": 297
         }, 
         {
           "container_msb": 7, 
           "data_lsb": 40, 
           "data_msb": 47, 
           "container_lsb": 0, 
-          "address": 338
+          "address": 332
         }
       ], 
       "packet_in_hdr._padding": [
@@ -3211,7 +3208,7 @@
           "data_lsb": 0, 
           "data_msb": 6, 
           "container_lsb": 0, 
-          "address": 340
+          "address": 334
         }
       ], 
       "ipv4.flags": [
@@ -3220,7 +3217,7 @@
           "data_lsb": 0, 
           "data_msb": 2, 
           "container_lsb": 13, 
-          "address": 334
+          "address": 328
         }
       ], 
       "ipv4.identification": [
@@ -3229,7 +3226,7 @@
           "data_lsb": 0, 
           "data_msb": 15, 
           "container_lsb": 0, 
-          "address": 333
+          "address": 327
         }
       ], 
       "eg_intr_md.egress_port": [
@@ -3247,7 +3244,7 @@
           "data_lsb": 0, 
           "data_msb": 8, 
           "container_lsb": 7, 
-          "address": 340
+          "address": 334
         }
       ], 
       "ipv4.protocol": [
@@ -3256,7 +3253,7 @@
           "data_lsb": 0, 
           "data_msb": 7, 
           "container_lsb": 16, 
-          "address": 264
+          "address": 260
         }
       ], 
       "udp.checksum": [
@@ -3265,7 +3262,7 @@
           "data_lsb": 0, 
           "data_msb": 15, 
           "container_lsb": 0, 
-          "address": 267
+          "address": 263
         }
       ], 
       "tcp.seqNo": [
@@ -3274,14 +3271,14 @@
           "data_lsb": 16, 
           "data_msb": 31, 
           "container_lsb": 0, 
-          "address": 336
+          "address": 330
         }, 
         {
           "container_msb": 15, 
           "data_lsb": 0, 
           "data_msb": 15, 
           "container_lsb": 0, 
-          "address": 337
+          "address": 331
         }
       ], 
       "udp.length_": [
@@ -3290,7 +3287,7 @@
           "data_lsb": 0, 
           "data_msb": 15, 
           "container_lsb": 16, 
-          "address": 267
+          "address": 263
         }
       ], 
       "udp.srcPort": [
@@ -3299,14 +3296,14 @@
           "data_lsb": 8, 
           "data_msb": 15, 
           "container_lsb": 0, 
-          "address": 298
+          "address": 294
         }, 
         {
           "container_msb": 7, 
           "data_lsb": 0, 
           "data_msb": 7, 
           "container_lsb": 0, 
-          "address": 299
+          "address": 295
         }
       ], 
       "tcp.ackNo": [
@@ -3315,7 +3312,7 @@
           "data_lsb": 0, 
           "data_msb": 31, 
           "container_lsb": 0, 
-          "address": 267
+          "address": 263
         }
       ], 
       "ipv4.version": [
@@ -3324,7 +3321,7 @@
           "data_lsb": 0, 
           "data_msb": 3, 
           "container_lsb": 4, 
-          "address": 296
+          "address": 292
         }
       ], 
       "ipv4.srcAddr": [
@@ -3333,7 +3330,7 @@
           "data_lsb": 0, 
           "data_msb": 31, 
           "container_lsb": 0, 
-          "address": 265
+          "address": 261
         }
       ], 
       "tcp.ecn": [
@@ -3342,7 +3339,7 @@
           "data_lsb": 0, 
           "data_msb": 2, 
           "container_lsb": 22, 
-          "address": 268
+          "address": 264
         }
       ], 
       "tcp.window": [
@@ -3351,7 +3348,7 @@
           "data_lsb": 0, 
           "data_msb": 15, 
           "container_lsb": 0, 
-          "address": 268
+          "address": 264
         }
       ], 
       "tcp.checksum": [
@@ -3360,7 +3357,7 @@
           "data_lsb": 0, 
           "data_msb": 15, 
           "container_lsb": 16, 
-          "address": 269
+          "address": 265
         }
       ], 
       "tcp.dataOffset": [
@@ -3369,7 +3366,7 @@
           "data_lsb": 0, 
           "data_msb": 3, 
           "container_lsb": 28, 
-          "address": 268
+          "address": 264
         }
       ], 
       "ipv4.fragOffset": [
@@ -3378,7 +3375,7 @@
           "data_lsb": 0, 
           "data_msb": 12, 
           "container_lsb": 0, 
-          "address": 334
+          "address": 328
         }
       ], 
       "ipv4.ttl": [
@@ -3387,7 +3384,7 @@
           "data_lsb": 0, 
           "data_msb": 7, 
           "container_lsb": 24, 
-          "address": 264
+          "address": 260
         }
       ], 
       "tcp.urgentPtr": [
@@ -3396,7 +3393,7 @@
           "data_lsb": 0, 
           "data_msb": 15, 
           "container_lsb": 0, 
-          "address": 269
+          "address": 265
         }
       ]
     }
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/ecmp.json b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/ecmp.json
index 6bd3422..c995bf3 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/ecmp.json
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/ecmp.json
@@ -9,10 +9,8 @@
       "name" : "scalars_0",
       "id" : 0,
       "fields" : [
-        ["tmp_0", 104, false],
-        ["tmp", 8, false],
-        ["tmp_1", 32, false],
-        ["tmp_2", 32, false]
+        ["tmp", 32, false],
+        ["tmp_0", 32, false]
       ]
     },
     {
@@ -209,7 +207,7 @@
           "parser_ops" : [],
           "transitions" : [
             {
-              "value" : "0xff",
+              "value" : "0x00ff",
               "mask" : null,
               "next_state" : "parse_pkt_out"
             },
@@ -396,50 +394,10 @@
         {
           "name" : "start",
           "id" : 7,
-          "parser_ops" : [
-            {
-              "parameters" : [
-                {
-                  "type" : "field",
-                  "value" : ["scalars", "tmp_0"]
-                },
-                {
-                  "type" : "lookahead",
-                  "value" : [0, 104]
-                }
-              ],
-              "op" : "set"
-            },
-            {
-              "parameters" : [
-                {
-                  "type" : "field",
-                  "value" : ["scalars", "tmp"]
-                },
-                {
-                  "type" : "expression",
-                  "value" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "&",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "tmp_0"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0xff"
-                      }
-                    }
-                  }
-                }
-              ],
-              "op" : "set"
-            }
-          ],
+          "parser_ops" : [],
           "transitions" : [
             {
-              "value" : "0x00",
+              "value" : "0x00ff",
               "mask" : null,
               "next_state" : "parse_pkt_in"
             },
@@ -452,7 +410,7 @@
           "transition_key" : [
             {
               "type" : "field",
-              "value" : ["scalars", "tmp"]
+              "value" : ["ig_intr_md", "egress_spec"]
             }
           ]
         }
@@ -498,7 +456,7 @@
     {
       "name" : "calc",
       "id" : 0,
-      "algo" : "crc32",
+      "algo" : "crc16",
       "input" : [
         {
           "type" : "field",
@@ -633,7 +591,7 @@
             },
             {
               "type" : "hexstr",
-              "value" : "0x00000000"
+              "value" : "0x0000"
             },
             {
               "type" : "calculation",
@@ -641,7 +599,7 @@
             },
             {
               "type" : "hexstr",
-              "value" : "0x0000000000000002"
+              "value" : "0x00000002"
             }
           ],
           "source_info" : {
@@ -790,7 +748,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "tmp_1"]
+              "value" : ["scalars", "tmp"]
             },
             {
               "type" : "expression",
@@ -820,7 +778,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "tmp_1"]
+              "value" : ["scalars", "tmp"]
             }
           ],
           "source_info" : {
@@ -842,7 +800,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "tmp_2"]
+              "value" : ["scalars", "tmp_0"]
             },
             {
               "type" : "expression",
@@ -872,7 +830,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "tmp_2"]
+              "value" : ["scalars", "tmp_0"]
             }
           ],
           "source_info" : {
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/logs/asm.log b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/logs/asm.log
index f641fdc..8d36d53 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/logs/asm.log
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/logs/asm.log
@@ -1,6 +1,6 @@
 +---------------------------------------------------------------------+
 |  Log file: asm.log                                                  |
 |  Compiler version: 5.1.0 (fca32d1)                                  |
-|  Created on: Tue Sep 12 11:15:53 2017                               |
+|  Created on: Wed Sep 13 00:59:40 2017                               |
 +---------------------------------------------------------------------+
 
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/logs/mau.characterize.log b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/logs/mau.characterize.log
index 40c8ad6..a096fd4 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/logs/mau.characterize.log
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/logs/mau.characterize.log
@@ -1,7 +1,7 @@
 +---------------------------------------------------------------------+
 |  Log file: mau.characterize.log                                     |
 |  Compiler version: 5.1.0 (fca32d1)                                  |
-|  Created on: Tue Sep 12 11:15:53 2017                               |
+|  Created on: Wed Sep 13 00:59:40 2017                               |
 +---------------------------------------------------------------------+
 
 Match+Action Resource Usage
@@ -23,8 +23,8 @@
 |     ecmp_group_table     | ingress |   1   |  exact  | sram |  5 (3/0/2/0/0)  |   0   | 1024 / 3072 (2048) | 32 / 22 (-10) |    0    |   20  |   0/0/0/0/0/0/4/16  | 9 / 16 (7) |   0 / 0 (0)   | 52 / 42 (-10) |   9    |  0 / 0 (0)  | 3 in 1 (128) | 1 in 1 (128) |     - / -     | 96.1% / 29.7% |      - / -      |
 |      stage 1 totals      |    -    |   -   |    -    |  -   |  5 (3/0/2/0/0)  |   0   |         -          |       -       |    -    |   -   |          -          |     -      |       -       |       -       |   -    |      -      |      -       |      -       |       -       |       -       |        -        |
 |                          |         |       |         |      |                 |       |                    |               |         |       |                     |            |               |               |        |             |              |              |               |               |                 |
-| ingress_port_count_table | ingress |   2   |         |  -   |  2 (0/0/2/0/0)  |   0   |  1024 / 1 (-1023)  |   0 / 0 (0)   |    0    |   0   |   0/0/0/0/0/0/0/0   | 0 / 0 (0)  |   0 / 0 (0)   |   0 / 0 (0)   |   0    |  0 / 0 (0)  |  0 in 0 (0)  |  1 in 0 (0)  |     - / -     |     - / -     |      - / -      |
-| egress_port_count_table  | ingress |   2   |         |  -   |  2 (0/0/2/0/0)  |   0   |  1024 / 1 (-1023)  |   0 / 0 (0)   |    0    |   0   |   0/0/0/0/0/0/0/0   | 0 / 0 (0)  |   0 / 0 (0)   |   0 / 0 (0)   |   0    |  0 / 0 (0)  |  0 in 0 (0)  |  1 in 0 (0)  |     - / -     |     - / -     |      - / -      |
+| ingress_port_count_table | ingress |   2   |         |  -   |  2 (0/0/2/0/0)  |   0   |  1024 / 1024 (0)   |   0 / 0 (0)   |    0    |   0   |   0/0/0/0/0/0/0/0   | 0 / 0 (0)  |   0 / 0 (0)   |   0 / 0 (0)   |   0    |  0 / 0 (0)  |  0 in 0 (0)  |  0 in 0 (0)  |     - / -     |     - / -     |      - / -      |
+| egress_port_count_table  | ingress |   2   |         |  -   |  2 (0/0/2/0/0)  |   0   |  1024 / 1024 (0)   |   0 / 0 (0)   |    0    |   0   |   0/0/0/0/0/0/0/0   | 0 / 0 (0)  |   0 / 0 (0)   |   0 / 0 (0)   |   0    |  0 / 0 (0)  |  0 in 0 (0)  |  0 in 0 (0)  |     - / -     |     - / -     |      - / -      |
 |      stage 2 totals      |    -    |   -   |    -    |  -   |  4 (0/0/4/0/0)  |   0   |         -          |       -       |    -    |   -   |          -          |     -      |       -       |       -       |   -    |      -      |      -       |      -       |       -       |       -       |        -        |
 |                          |         |       |         |      |                 |       |                    |               |         |       |                     |            |               |               |        |             |              |              |               |               |                 |
 |      overall totals      |    -    |   -   |    -    |  -   |  13 (3/1/8/0/1) |   3   |         -          |       -       |    -    |   -   |          -          |     -      |       -       |       -       |   -    |      -      |      -       |      -       |       -       |       -       |        -        |
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/logs/mau.config.log b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/logs/mau.config.log
index b0c43cd..0e6c149 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/logs/mau.config.log
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/logs/mau.config.log
@@ -1,7 +1,7 @@
 +---------------------------------------------------------------------+
 |  Log file: mau.config.log                                           |
 |  Compiler version: 5.1.0 (fca32d1)                                  |
-|  Created on: Tue Sep 12 11:15:53 2017                               |
+|  Created on: Wed Sep 13 00:59:40 2017                               |
 +---------------------------------------------------------------------+
 
 Final Stage dependencies are:
@@ -50,11 +50,11 @@
 Configuring rams.match.merge.logical_table_thread[copy_index=2].logical_table_thread_ingress to be 0x1 (previous_value=0x0 OR new_value=0x1).
 Configuring dp.mau_match_input_xbar_exact_match_enable[direction_index=0].mau_match_input_xbar_exact_match_enable to be 0x2.  (old value = 0x0 OR new value = 0x2)
 Configuring dp.xbar_hash.xbar.mau_match_input_xbar_ternary_match_enable[direction_index=0].mau_match_input_xbar_ternary_match_enable to be 0x0.  (old value = 0x0 OR new value = 0x0)
-Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=12].match_input_xbar_816b_ctl_address to be 3.
+Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=12].match_input_xbar_816b_ctl_address to be 4.
 Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=12].match_input_xbar_816b_ctl_enable to be 1.
-Configuring match input crossbar byte 12 to come from 8-bit PHV container 3.
+Configuring match input crossbar byte 12 to come from 8-bit PHV container 4.
   That PHV byte contains {unused[5:0], --validity_check--packet_out_hdr[0:0], unused[0:0]}.
-Configuring dp.match_input_xbar_din_power_ctl[14_byte_group=0][byte_position=4].match_input_xbar_din_power_ctl to be 0x8.  (previous value = 0x0  OR new value = 0x8)
+Configuring dp.match_input_xbar_din_power_ctl[14_byte_group=0][byte_position=4].match_input_xbar_din_power_ctl to be 0x10.  (previous value = 0x0  OR new value = 0x10)
 Configuring dp.xbar_hash.hash.parity_group_mask[parity_group_mask_index=0][byte_number=0].parity_group_mask to be 0x2.  (previous value = 0x0  OR  new value = 0x2)
 Configuring dp.xbar_hash.hash.parity_group_mask[parity_group_mask_index=0][byte_number=1].parity_group_mask to be 0x0.  (previous value = 0x0  OR  new value = 0x0)
 Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=6][hash_bit_index=40].byte0 to be 0x2.
@@ -128,13 +128,13 @@
     Field right_rotate [3:0]   : 0x7   (4 bits in instruction bits [19:16])
     Field low_bit_hi [2:0]     : 0x0   (3 bits in instruction bits [22:20])
 
-Configuring dp.imem.imem_subword8[unit_number=3][vliw_instruction_number=2].imem_subword8_instr to be 0x74d83.
-Configuring dp.imem.imem_subword8[unit_number=3][vliw_instruction_number=2].imem_subword8_color to be 1.
-Configuring dp.imem.imem_subword8[unit_number=3][vliw_instruction_number=2].imem_subword8_parity to be 1.
-Micro instruction added in VLIW 2 for 8-bit position 3 for table process_packet_out_table.
-  Assembled as 0x74d83 (or decimal 478595)
-  Micro Instruction deposit-field for PHV Container 67 has bit width 20
-    Field Src2 [3:0]           : 0x3   (4 bits in instruction bits [3:0])
+Configuring dp.imem.imem_subword8[unit_number=4][vliw_instruction_number=2].imem_subword8_instr to be 0x74d84.
+Configuring dp.imem.imem_subword8[unit_number=4][vliw_instruction_number=2].imem_subword8_color to be 1.
+Configuring dp.imem.imem_subword8[unit_number=4][vliw_instruction_number=2].imem_subword8_parity to be 0.
+Micro instruction added in VLIW 2 for 8-bit position 4 for table process_packet_out_table.
+  Assembled as 0x74d84 (or decimal 478596)
+  Micro Instruction deposit-field for PHV Container 68 has bit width 20
+    Field Src2 [3:0]           : 0x4   (4 bits in instruction bits [3:0])
     Field Src1 [4:0]           : 0x18   (5 bits in instruction bits [8:4])
     Field Src1i [0:0]          : 0x0   (1 bits in instruction bits [9:9])
     Field opcode [0:0]         : 0x1   (1 bits in instruction bits [10:10])
@@ -143,7 +143,7 @@
     Field right_rotate [2:0]   : 0x7   (3 bits in instruction bits [18:16])
     Field low_bit_hi [0:0]     : 0x0   (1 bits in instruction bits [19:19])
 
-Configuring dp.actionmux_din_power_ctl[14_byte_group=0][byte_position=4].actionmux_din_power_ctl to be 0x8.  (previous value = 0x0  OR new value = 0x8)
+Configuring dp.actionmux_din_power_ctl[14_byte_group=0][byte_position=4].actionmux_din_power_ctl to be 0x10.  (previous value = 0x0  OR new value = 0x10)
 Configuring dp.actionmux_din_power_ctl[14_byte_group=0][byte_position=8].actionmux_din_power_ctl to be 0x6.  (previous value = 0x0  OR new value = 0x6)
 --> Stage Gateway Table for condition process_packet_out_table_always_true_condition in stage 0
 Configuring rams.match.merge.predication_ctl[direction_index=0].table_thread to be 0x3 (previous_value=0x3 OR new_value=0x2).
@@ -215,72 +215,71 @@
 ---- Hash Distribution Units for table table0__action__ ----
 Configuring dp.mau_match_input_xbar_exact_match_enable[direction_index=0].mau_match_input_xbar_exact_match_enable to be 0x3.  (old value = 0x2 OR new value = 0x3)
 Configuring dp.xbar_hash.xbar.mau_match_input_xbar_ternary_match_enable[direction_index=0].mau_match_input_xbar_ternary_match_enable to be 0x0.  (old value = 0x0 OR new value = 0x0)
-Configuring dp.xbar_hash.xbar.match_input_xbar_32b_ctl[word_group=0][output_byte=0].match_input_xbar_32b_ctl_address to be 5.
+Configuring dp.xbar_hash.xbar.match_input_xbar_32b_ctl[word_group=0][output_byte=0].match_input_xbar_32b_ctl_address to be 2.
 Configuring dp.xbar_hash.xbar.match_input_xbar_32b_ctl[word_group=0][output_byte=0].match_input_xbar_32b_ctl_lo_enable to be 1.
-Configuring match input crossbar byte 0 to come from 32-bit PHV container 5.
-  That PHV byte contains {udp.dstPort[7:0]}.
-Configuring dp.xbar_hash.xbar.match_input_xbar_32b_ctl[word_group=0][output_byte=1].match_input_xbar_32b_ctl_address to be 5.
-Configuring dp.xbar_hash.xbar.match_input_xbar_32b_ctl[word_group=0][output_byte=1].match_input_xbar_32b_ctl_lo_enable to be 1.
-Configuring match input crossbar byte 1 to come from 32-bit PHV container 5.
-  That PHV byte contains {udp.dstPort[15:8]}.
-Configuring dp.xbar_hash.xbar.match_input_xbar_32b_ctl[word_group=0][output_byte=2].match_input_xbar_32b_ctl_address to be 5.
-Configuring dp.xbar_hash.xbar.match_input_xbar_32b_ctl[word_group=0][output_byte=2].match_input_xbar_32b_ctl_lo_enable to be 1.
-Configuring match input crossbar byte 2 to come from 32-bit PHV container 5.
-  That PHV byte contains {udp.srcPort[7:0]}.
-Configuring dp.xbar_hash.xbar.match_input_xbar_32b_ctl[word_group=0][output_byte=3].match_input_xbar_32b_ctl_address to be 5.
-Configuring dp.xbar_hash.xbar.match_input_xbar_32b_ctl[word_group=0][output_byte=3].match_input_xbar_32b_ctl_lo_enable to be 1.
-Configuring match input crossbar byte 3 to come from 32-bit PHV container 5.
-  That PHV byte contains {udp.srcPort[15:8]}.
-Configuring dp.xbar_hash.xbar.match_input_xbar_32b_ctl[word_group=0][output_byte=4].match_input_xbar_32b_ctl_address to be 2.
-Configuring dp.xbar_hash.xbar.match_input_xbar_32b_ctl[word_group=0][output_byte=4].match_input_xbar_32b_ctl_lo_enable to be 1.
-Configuring match input crossbar byte 4 to come from 32-bit PHV container 2.
+Configuring match input crossbar byte 0 to come from 32-bit PHV container 2.
   That PHV byte contains {ipv4.dstAddr[7:0]}.
-Configuring dp.xbar_hash.xbar.match_input_xbar_32b_ctl[word_group=0][output_byte=5].match_input_xbar_32b_ctl_address to be 2.
-Configuring dp.xbar_hash.xbar.match_input_xbar_32b_ctl[word_group=0][output_byte=5].match_input_xbar_32b_ctl_lo_enable to be 1.
-Configuring match input crossbar byte 5 to come from 32-bit PHV container 2.
+Configuring dp.xbar_hash.xbar.match_input_xbar_32b_ctl[word_group=0][output_byte=1].match_input_xbar_32b_ctl_address to be 2.
+Configuring dp.xbar_hash.xbar.match_input_xbar_32b_ctl[word_group=0][output_byte=1].match_input_xbar_32b_ctl_lo_enable to be 1.
+Configuring match input crossbar byte 1 to come from 32-bit PHV container 2.
   That PHV byte contains {ipv4.dstAddr[15:8]}.
-Configuring dp.xbar_hash.xbar.match_input_xbar_32b_ctl[word_group=0][output_byte=6].match_input_xbar_32b_ctl_address to be 2.
-Configuring dp.xbar_hash.xbar.match_input_xbar_32b_ctl[word_group=0][output_byte=6].match_input_xbar_32b_ctl_lo_enable to be 1.
-Configuring match input crossbar byte 6 to come from 32-bit PHV container 2.
+Configuring dp.xbar_hash.xbar.match_input_xbar_32b_ctl[word_group=0][output_byte=2].match_input_xbar_32b_ctl_address to be 2.
+Configuring dp.xbar_hash.xbar.match_input_xbar_32b_ctl[word_group=0][output_byte=2].match_input_xbar_32b_ctl_lo_enable to be 1.
+Configuring match input crossbar byte 2 to come from 32-bit PHV container 2.
   That PHV byte contains {ipv4.dstAddr[23:16]}.
+Configuring dp.xbar_hash.xbar.match_input_xbar_32b_ctl[word_group=0][output_byte=3].match_input_xbar_32b_ctl_address to be 3.
+Configuring dp.xbar_hash.xbar.match_input_xbar_32b_ctl[word_group=0][output_byte=3].match_input_xbar_32b_ctl_lo_enable to be 1.
+Configuring match input crossbar byte 3 to come from 32-bit PHV container 3.
+  That PHV byte contains {tcp.dstPort[7:0]}.
+Configuring dp.xbar_hash.xbar.match_input_xbar_32b_ctl[word_group=0][output_byte=4].match_input_xbar_32b_ctl_address to be 1.
+Configuring dp.xbar_hash.xbar.match_input_xbar_32b_ctl[word_group=0][output_byte=4].match_input_xbar_32b_ctl_lo_enable to be 1.
+Configuring match input crossbar byte 4 to come from 32-bit PHV container 1.
+  That PHV byte contains {ipv4.srcAddr[31:24]}.
+Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=5].match_input_xbar_816b_ctl_address to be 20.
+Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=5].match_input_xbar_816b_ctl_enable to be 1.
+Configuring match input crossbar byte 5 to come from 16-bit PHV container 4.
+  That PHV byte contains {tcp.srcPort[7:0]}.
+Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=6].match_input_xbar_816b_ctl_address to be 20.
+Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=6].match_input_xbar_816b_ctl_enable to be 1.
+Configuring match input crossbar byte 6 to come from 16-bit PHV container 4.
+  That PHV byte contains {tcp.dstPort[15:8]}.
 Configuring dp.xbar_hash.xbar.match_input_xbar_32b_ctl[word_group=0][output_byte=7].match_input_xbar_32b_ctl_address to be 2.
 Configuring dp.xbar_hash.xbar.match_input_xbar_32b_ctl[word_group=0][output_byte=7].match_input_xbar_32b_ctl_lo_enable to be 1.
 Configuring match input crossbar byte 7 to come from 32-bit PHV container 2.
   That PHV byte contains {ipv4.dstAddr[31:24]}.
-Configuring dp.xbar_hash.xbar.match_input_xbar_32b_ctl[word_group=0][output_byte=8].match_input_xbar_32b_ctl_address to be 1.
-Configuring dp.xbar_hash.xbar.match_input_xbar_32b_ctl[word_group=0][output_byte=8].match_input_xbar_32b_ctl_lo_enable to be 1.
-Configuring match input crossbar byte 8 to come from 32-bit PHV container 1.
-  That PHV byte contains {ipv4.srcAddr[31:24]}.
+Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=8].match_input_xbar_816b_ctl_address to be 19.
+Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=8].match_input_xbar_816b_ctl_enable to be 1.
+Configuring match input crossbar byte 8 to come from 16-bit PHV container 3.
+  That PHV byte contains {ipv4.srcAddr[7:0]}.
 Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=9].match_input_xbar_816b_ctl_address to be 19.
 Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=9].match_input_xbar_816b_ctl_enable to be 1.
 Configuring match input crossbar byte 9 to come from 16-bit PHV container 3.
   That PHV byte contains {ipv4.srcAddr[15:8]}.
-Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=10].match_input_xbar_816b_ctl_address to be 19.
+Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=10].match_input_xbar_816b_ctl_address to be 1.
 Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=10].match_input_xbar_816b_ctl_enable to be 1.
-Configuring match input crossbar byte 10 to come from 16-bit PHV container 3.
-  That PHV byte contains {ipv4.srcAddr[7:0]}.
+Configuring match input crossbar byte 10 to come from 8-bit PHV container 1.
+  That PHV byte contains {tcp.srcPort[15:8]}.
 Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=11].match_input_xbar_816b_ctl_address to be 0.
 Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=11].match_input_xbar_816b_ctl_enable to be 1.
 Configuring match input crossbar byte 11 to come from 8-bit PHV container 0.
   That PHV byte contains {ipv4.srcAddr[23:16]}.
-Configuring dp.match_input_xbar_din_power_ctl[14_byte_group=0][byte_position=0].match_input_xbar_din_power_ctl to be 0x26.  (previous value = 0x0  OR new value = 0x26)
-Configuring dp.match_input_xbar_din_power_ctl[14_byte_group=0][byte_position=4].match_input_xbar_din_power_ctl to be 0x9.  (previous value = 0x8  OR new value = 0x1)
-Configuring dp.match_input_xbar_din_power_ctl[14_byte_group=0][byte_position=8].match_input_xbar_din_power_ctl to be 0x8.  (previous value = 0x0  OR new value = 0x8)
-Configuring dp.xbar_hash.hash.hash_seed[output_bit=0].hash_seed to be 0x1 (previous value = 0x0  OR  new value = 0x1)
+Configuring dp.match_input_xbar_din_power_ctl[14_byte_group=0][byte_position=0].match_input_xbar_din_power_ctl to be 0xe.  (previous value = 0x0  OR new value = 0xe)
+Configuring dp.match_input_xbar_din_power_ctl[14_byte_group=0][byte_position=4].match_input_xbar_din_power_ctl to be 0x13.  (previous value = 0x10  OR new value = 0x3)
+Configuring dp.match_input_xbar_din_power_ctl[14_byte_group=0][byte_position=8].match_input_xbar_din_power_ctl to be 0x18.  (previous value = 0x0  OR new value = 0x18)
 Configuring dp.xbar_hash.hash.parity_group_mask[parity_group_mask_index=0][byte_number=0].parity_group_mask to be 0x3.  (previous value = 0x2  OR  new value = 0x3)
 Configuring dp.xbar_hash.hash.parity_group_mask[parity_group_mask_index=0][byte_number=1].parity_group_mask to be 0x0.  (previous value = 0x0  OR  new value = 0x0)
-Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=0][hash_bit_index=0].byte0 to be 0x4.
-Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=0][hash_bit_index=0].byte1 to be 0xd1.
-Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=1][hash_bit_index=0].byte0 to be 0x1.
-Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=1][hash_bit_index=0].byte1 to be 0xdf.
-Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=2][hash_bit_index=0].byte0 to be 0x48.
-Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=2][hash_bit_index=0].byte1 to be 0x1b.
-Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=3][hash_bit_index=0].byte0 to be 0x4e.
-Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=3][hash_bit_index=0].byte1 to be 0x5a.
-Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=4][hash_bit_index=0].byte0 to be 0x7.
-Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=4][hash_bit_index=0].byte1 to be 0x82.
-Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=5][hash_bit_index=0].byte0 to be 0xf1.
-Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=5][hash_bit_index=0].byte1 to be 0xfa.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=0][hash_bit_index=0].byte0 to be 0xff.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=0][hash_bit_index=0].byte1 to be 0xaf.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=1][hash_bit_index=0].byte0 to be 0xfe.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=1][hash_bit_index=0].byte1 to be 0xff.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=2][hash_bit_index=0].byte0 to be 0x7f.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=2][hash_bit_index=0].byte1 to be 0xff.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=3][hash_bit_index=0].byte0 to be 0xfb.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=3][hash_bit_index=0].byte1 to be 0x1f.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=4][hash_bit_index=0].byte0 to be 0xfb.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=4][hash_bit_index=0].byte1 to be 0xbf.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=5][hash_bit_index=0].byte0 to be 0xe7.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=5][hash_bit_index=0].byte1 to be 0xe6.
 Configuring dp.hashout_ctl.hash_group_ingress_enable to be 0x1.  (previous value = 0x1 OR new value = 0x1)
 Configuring rams.match.merge.mau_hash_group_config.hash_group_enable to be 1. (old value = 0 OR new value = 1).
 Configuring rams.match.merge.mau_hash_group_config.hash_group_sel to be 8. (old value = 0 OR new value = 8).
@@ -325,69 +324,69 @@
 Configuring match input crossbar byte 133 to come from 16-bit PHV container 0.
   That PHV byte contains version/valid
 {unused[6:0], ig_intr_md.ingress_port[8:8]}.
-Configuring dp.xbar_hash.xbar.match_input_xbar_32b_ctl[word_group=0][output_byte=128].match_input_xbar_32b_ctl_address to be 4.
+Configuring dp.xbar_hash.xbar.match_input_xbar_32b_ctl[word_group=0][output_byte=128].match_input_xbar_32b_ctl_address to be 5.
 Configuring dp.xbar_hash.xbar.match_input_xbar_32b_ctl[word_group=0][output_byte=128].match_input_xbar_32b_ctl_lo_enable to be 1.
-Configuring match input crossbar byte 128 to come from 32-bit PHV container 4.
+Configuring match input crossbar byte 128 to come from 32-bit PHV container 5.
   That PHV byte contains {ethernet.srcAddr[7:0]}.
-Configuring dp.xbar_hash.xbar.match_input_xbar_32b_ctl[word_group=0][output_byte=129].match_input_xbar_32b_ctl_address to be 4.
+Configuring dp.xbar_hash.xbar.match_input_xbar_32b_ctl[word_group=0][output_byte=129].match_input_xbar_32b_ctl_address to be 5.
 Configuring dp.xbar_hash.xbar.match_input_xbar_32b_ctl[word_group=0][output_byte=129].match_input_xbar_32b_ctl_lo_enable to be 1.
-Configuring match input crossbar byte 129 to come from 32-bit PHV container 4.
+Configuring match input crossbar byte 129 to come from 32-bit PHV container 5.
   That PHV byte contains {ethernet.srcAddr[15:8]}.
-Configuring dp.xbar_hash.xbar.match_input_xbar_32b_ctl[word_group=0][output_byte=130].match_input_xbar_32b_ctl_address to be 4.
+Configuring dp.xbar_hash.xbar.match_input_xbar_32b_ctl[word_group=0][output_byte=130].match_input_xbar_32b_ctl_address to be 5.
 Configuring dp.xbar_hash.xbar.match_input_xbar_32b_ctl[word_group=0][output_byte=130].match_input_xbar_32b_ctl_lo_enable to be 1.
-Configuring match input crossbar byte 130 to come from 32-bit PHV container 4.
+Configuring match input crossbar byte 130 to come from 32-bit PHV container 5.
   That PHV byte contains {ethernet.srcAddr[23:16]}.
-Configuring dp.xbar_hash.xbar.match_input_xbar_32b_ctl[word_group=0][output_byte=131].match_input_xbar_32b_ctl_address to be 4.
+Configuring dp.xbar_hash.xbar.match_input_xbar_32b_ctl[word_group=0][output_byte=131].match_input_xbar_32b_ctl_address to be 5.
 Configuring dp.xbar_hash.xbar.match_input_xbar_32b_ctl[word_group=0][output_byte=131].match_input_xbar_32b_ctl_lo_enable to be 1.
-Configuring match input crossbar byte 131 to come from 32-bit PHV container 4.
+Configuring match input crossbar byte 131 to come from 32-bit PHV container 5.
   That PHV byte contains {ethernet.srcAddr[31:24]}.
-Configuring dp.xbar_hash.xbar.match_input_xbar_32b_ctl[word_group=0][output_byte=132].match_input_xbar_32b_ctl_address to be 3.
+Configuring dp.xbar_hash.xbar.match_input_xbar_32b_ctl[word_group=0][output_byte=132].match_input_xbar_32b_ctl_address to be 4.
 Configuring dp.xbar_hash.xbar.match_input_xbar_32b_ctl[word_group=0][output_byte=132].match_input_xbar_32b_ctl_lo_enable to be 1.
-Configuring match input crossbar byte 132 to come from 32-bit PHV container 3.
+Configuring match input crossbar byte 132 to come from 32-bit PHV container 4.
   That PHV byte contains {ethernet.dstAddr[15:8]}.
-Configuring dp.xbar_hash.xbar.match_input_xbar_32b_ctl[word_group=0][output_byte=134].match_input_xbar_32b_ctl_address to be 3.
+Configuring dp.xbar_hash.xbar.match_input_xbar_32b_ctl[word_group=0][output_byte=134].match_input_xbar_32b_ctl_address to be 4.
 Configuring dp.xbar_hash.xbar.match_input_xbar_32b_ctl[word_group=0][output_byte=134].match_input_xbar_32b_ctl_lo_enable to be 1.
-Configuring match input crossbar byte 134 to come from 32-bit PHV container 3.
+Configuring match input crossbar byte 134 to come from 32-bit PHV container 4.
   That PHV byte contains {ethernet.dstAddr[31:24]}.
-Configuring dp.xbar_hash.xbar.match_input_xbar_32b_ctl[word_group=0][output_byte=135].match_input_xbar_32b_ctl_address to be 3.
+Configuring dp.xbar_hash.xbar.match_input_xbar_32b_ctl[word_group=0][output_byte=135].match_input_xbar_32b_ctl_address to be 4.
 Configuring dp.xbar_hash.xbar.match_input_xbar_32b_ctl[word_group=0][output_byte=135].match_input_xbar_32b_ctl_lo_enable to be 1.
-Configuring match input crossbar byte 135 to come from 32-bit PHV container 3.
+Configuring match input crossbar byte 135 to come from 32-bit PHV container 4.
   That PHV byte contains {ethernet.dstAddr[39:32]}.
-Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=136].match_input_xbar_816b_ctl_address to be 21.
+Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=136].match_input_xbar_816b_ctl_address to be 22.
 Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=136].match_input_xbar_816b_ctl_enable to be 1.
-Configuring match input crossbar byte 136 to come from 16-bit PHV container 5.
+Configuring match input crossbar byte 136 to come from 16-bit PHV container 6.
   That PHV byte contains {ethernet.etherType[7:0]}.
-Configuring dp.xbar_hash.xbar.match_input_xbar_32b_ctl[word_group=0][output_byte=137].match_input_xbar_32b_ctl_address to be 3.
+Configuring dp.xbar_hash.xbar.match_input_xbar_32b_ctl[word_group=0][output_byte=137].match_input_xbar_32b_ctl_address to be 4.
 Configuring dp.xbar_hash.xbar.match_input_xbar_32b_ctl[word_group=0][output_byte=137].match_input_xbar_32b_ctl_lo_enable to be 1.
-Configuring match input crossbar byte 137 to come from 32-bit PHV container 3.
+Configuring match input crossbar byte 137 to come from 32-bit PHV container 4.
   That PHV byte contains {ethernet.dstAddr[23:16]}.
-Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=138].match_input_xbar_816b_ctl_address to be 20.
+Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=138].match_input_xbar_816b_ctl_address to be 21.
 Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=138].match_input_xbar_816b_ctl_enable to be 1.
-Configuring match input crossbar byte 138 to come from 16-bit PHV container 4.
+Configuring match input crossbar byte 138 to come from 16-bit PHV container 5.
   That PHV byte contains {ethernet.srcAddr[47:40]}.
-Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=139].match_input_xbar_816b_ctl_address to be 21.
+Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=139].match_input_xbar_816b_ctl_address to be 22.
 Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=139].match_input_xbar_816b_ctl_enable to be 1.
-Configuring match input crossbar byte 139 to come from 16-bit PHV container 5.
+Configuring match input crossbar byte 139 to come from 16-bit PHV container 6.
   That PHV byte contains {ethernet.etherType[15:8]}.
 Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=140].match_input_xbar_816b_ctl_address to be 16.
 Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=140].match_input_xbar_816b_ctl_enable to be 1.
 Configuring match input crossbar byte 140 to come from 16-bit PHV container 0.
   That PHV byte contains {ig_intr_md.ingress_port[7:0]}.
-Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=141].match_input_xbar_816b_ctl_address to be 20.
+Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=141].match_input_xbar_816b_ctl_address to be 21.
 Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=141].match_input_xbar_816b_ctl_enable to be 1.
-Configuring match input crossbar byte 141 to come from 16-bit PHV container 4.
+Configuring match input crossbar byte 141 to come from 16-bit PHV container 5.
   That PHV byte contains {ethernet.dstAddr[7:0]}.
-Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=142].match_input_xbar_816b_ctl_address to be 2.
+Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=142].match_input_xbar_816b_ctl_address to be 3.
 Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=142].match_input_xbar_816b_ctl_enable to be 1.
-Configuring match input crossbar byte 142 to come from 8-bit PHV container 2.
+Configuring match input crossbar byte 142 to come from 8-bit PHV container 3.
   That PHV byte contains {ethernet.srcAddr[39:32]}.
-Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=143].match_input_xbar_816b_ctl_address to be 1.
+Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=143].match_input_xbar_816b_ctl_address to be 2.
 Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=143].match_input_xbar_816b_ctl_enable to be 1.
-Configuring match input crossbar byte 143 to come from 8-bit PHV container 1.
+Configuring match input crossbar byte 143 to come from 8-bit PHV container 2.
   That PHV byte contains {ethernet.dstAddr[47:40]}.
-Configuring dp.match_input_xbar_din_power_ctl[14_byte_group=0][byte_position=0].match_input_xbar_din_power_ctl to be 0x3e.  (previous value = 0x26  OR new value = 0x18)
-Configuring dp.match_input_xbar_din_power_ctl[14_byte_group=0][byte_position=4].match_input_xbar_din_power_ctl to be 0xf.  (previous value = 0x9  OR new value = 0x6)
-Configuring dp.match_input_xbar_din_power_ctl[14_byte_group=0][byte_position=8].match_input_xbar_din_power_ctl to be 0x39.  (previous value = 0x8  OR new value = 0x31)
+Configuring dp.match_input_xbar_din_power_ctl[14_byte_group=0][byte_position=0].match_input_xbar_din_power_ctl to be 0x3e.  (previous value = 0xe  OR new value = 0x30)
+Configuring dp.match_input_xbar_din_power_ctl[14_byte_group=0][byte_position=4].match_input_xbar_din_power_ctl to be 0x1f.  (previous value = 0x13  OR new value = 0xc)
+Configuring dp.match_input_xbar_din_power_ctl[14_byte_group=0][byte_position=8].match_input_xbar_din_power_ctl to be 0x79.  (previous value = 0x18  OR new value = 0x61)
 
 --> Idletime Table for match table table0 in stage 0
 Looking at Map RAM: Row 7 Unit 0
@@ -447,25 +446,25 @@
     Field low_bit_hi [2:0]     : 0x0   (3 bits in instruction bits [22:20])
 
 Configuring dp.actionmux_din_power_ctl[14_byte_group=0][byte_position=8].actionmux_din_power_ctl to be 0x6.  (previous value = 0x6  OR new value = 0x4)
-Configuring dp.imem.imem_subword16[unit_number=6][vliw_instruction_number=1].imem_subword16_instr to be 0xc7a06.
-Configuring dp.imem.imem_subword16[unit_number=6][vliw_instruction_number=1].imem_subword16_color to be 0.
-Configuring dp.imem.imem_subword16[unit_number=6][vliw_instruction_number=1].imem_subword16_parity to be 1.
-Micro instruction added in VLIW 1 for 16-bit position 6 for table table0.
-  Assembled as 0xc7a06 (or decimal 817670)
-  Micro Instruction alu_a for PHV Container 134 has bit width 23
-    Field Src2 [3:0]     : 0x6   (4 bits in instruction bits [3:0])
+Configuring dp.imem.imem_subword16[unit_number=7][vliw_instruction_number=1].imem_subword16_instr to be 0xc7a07.
+Configuring dp.imem.imem_subword16[unit_number=7][vliw_instruction_number=1].imem_subword16_color to be 0.
+Configuring dp.imem.imem_subword16[unit_number=7][vliw_instruction_number=1].imem_subword16_parity to be 0.
+Micro instruction added in VLIW 1 for 16-bit position 7 for table table0.
+  Assembled as 0xc7a07 (or decimal 817671)
+  Micro Instruction alu_a for PHV Container 135 has bit width 23
+    Field Src2 [3:0]     : 0x7   (4 bits in instruction bits [3:0])
     Field Src1 [4:0]     : 0x0   (5 bits in instruction bits [8:4])
     Field Src1i [0:0]    : 0x1   (1 bits in instruction bits [9:9])
     Field opcode [9:0]   : 0x31e   (10 bits in instruction bits [19:10])
     Field unused [2:0]   : 0x0   (3 bits in instruction bits [22:20])
 
-Configuring dp.imem.imem_subword16[unit_number=7][vliw_instruction_number=1].imem_subword16_instr to be 0xc7a27.
-Configuring dp.imem.imem_subword16[unit_number=7][vliw_instruction_number=1].imem_subword16_color to be 0.
-Configuring dp.imem.imem_subword16[unit_number=7][vliw_instruction_number=1].imem_subword16_parity to be 1.
-Micro instruction added in VLIW 1 for 16-bit position 7 for table table0.
-  Assembled as 0xc7a27 (or decimal 817703)
-  Micro Instruction alu_a for PHV Container 135 has bit width 23
-    Field Src2 [3:0]     : 0x7   (4 bits in instruction bits [3:0])
+Configuring dp.imem.imem_subword16[unit_number=8][vliw_instruction_number=1].imem_subword16_instr to be 0xc7a28.
+Configuring dp.imem.imem_subword16[unit_number=8][vliw_instruction_number=1].imem_subword16_color to be 0.
+Configuring dp.imem.imem_subword16[unit_number=8][vliw_instruction_number=1].imem_subword16_parity to be 1.
+Micro instruction added in VLIW 1 for 16-bit position 8 for table table0.
+  Assembled as 0xc7a28 (or decimal 817704)
+  Micro Instruction alu_a for PHV Container 136 has bit width 23
+    Field Src2 [3:0]     : 0x8   (4 bits in instruction bits [3:0])
     Field Src1 [4:0]     : 0x2   (5 bits in instruction bits [8:4])
     Field Src1i [0:0]    : 0x1   (1 bits in instruction bits [9:9])
     Field opcode [9:0]   : 0x31e   (10 bits in instruction bits [19:10])
@@ -486,13 +485,13 @@
     Field right_rotate [3:0]   : 0x0   (4 bits in instruction bits [19:16])
     Field low_bit_hi [2:0]     : 0x0   (3 bits in instruction bits [22:20])
 
-Configuring dp.imem.imem_subword8[unit_number=3][vliw_instruction_number=1].imem_subword8_instr to be 0x593.
-Configuring dp.imem.imem_subword8[unit_number=3][vliw_instruction_number=1].imem_subword8_color to be 1.
-Configuring dp.imem.imem_subword8[unit_number=3][vliw_instruction_number=1].imem_subword8_parity to be 1.
-Micro instruction added in VLIW 1 for 8-bit position 3 for table table0.
-  Assembled as 0x593 (or decimal 1427)
-  Micro Instruction deposit-field for PHV Container 67 has bit width 20
-    Field Src2 [3:0]           : 0x3   (4 bits in instruction bits [3:0])
+Configuring dp.imem.imem_subword8[unit_number=4][vliw_instruction_number=1].imem_subword8_instr to be 0x594.
+Configuring dp.imem.imem_subword8[unit_number=4][vliw_instruction_number=1].imem_subword8_color to be 1.
+Configuring dp.imem.imem_subword8[unit_number=4][vliw_instruction_number=1].imem_subword8_parity to be 0.
+Micro instruction added in VLIW 1 for 8-bit position 4 for table table0.
+  Assembled as 0x594 (or decimal 1428)
+  Micro Instruction deposit-field for PHV Container 68 has bit width 20
+    Field Src2 [3:0]           : 0x4   (4 bits in instruction bits [3:0])
     Field Src1 [4:0]           : 0x19   (5 bits in instruction bits [8:4])
     Field Src1i [0:0]          : 0x0   (1 bits in instruction bits [9:9])
     Field opcode [0:0]         : 0x1   (1 bits in instruction bits [10:10])
@@ -516,15 +515,15 @@
     Field right_rotate [3:0]   : 0x9   (4 bits in instruction bits [19:16])
     Field low_bit_hi [2:0]     : 0x3   (3 bits in instruction bits [22:20])
 
-Configuring dp.actionmux_din_power_ctl[14_byte_group=0][byte_position=4].actionmux_din_power_ctl to be 0x8.  (previous value = 0x8  OR new value = 0x8)
+Configuring dp.actionmux_din_power_ctl[14_byte_group=0][byte_position=4].actionmux_din_power_ctl to be 0x10.  (previous value = 0x10  OR new value = 0x10)
 Configuring dp.actionmux_din_power_ctl[14_byte_group=0][byte_position=8].actionmux_din_power_ctl to be 0x7.  (previous value = 0x6  OR new value = 0x7)
-Configuring dp.imem.imem_subword8[unit_number=4][vliw_instruction_number=2].imem_subword8_instr to be 0xb7d94.
-Configuring dp.imem.imem_subword8[unit_number=4][vliw_instruction_number=2].imem_subword8_color to be 0.
-Configuring dp.imem.imem_subword8[unit_number=4][vliw_instruction_number=2].imem_subword8_parity to be 0.
-Micro instruction added in VLIW 2 for 8-bit position 4 for table table0.
-  Assembled as 0xb7d94 (or decimal 753044)
-  Micro Instruction deposit-field for PHV Container 68 has bit width 20
-    Field Src2 [3:0]           : 0x4   (4 bits in instruction bits [3:0])
+Configuring dp.imem.imem_subword8[unit_number=5][vliw_instruction_number=2].imem_subword8_instr to be 0xb7d95.
+Configuring dp.imem.imem_subword8[unit_number=5][vliw_instruction_number=2].imem_subword8_color to be 0.
+Configuring dp.imem.imem_subword8[unit_number=5][vliw_instruction_number=2].imem_subword8_parity to be 1.
+Micro instruction added in VLIW 2 for 8-bit position 5 for table table0.
+  Assembled as 0xb7d95 (or decimal 753045)
+  Micro Instruction deposit-field for PHV Container 69 has bit width 20
+    Field Src2 [3:0]           : 0x5   (4 bits in instruction bits [3:0])
     Field Src1 [4:0]           : 0x19   (5 bits in instruction bits [8:4])
     Field Src1i [0:0]          : 0x0   (1 bits in instruction bits [9:9])
     Field opcode [0:0]         : 0x1   (1 bits in instruction bits [10:10])
@@ -533,7 +532,7 @@
     Field right_rotate [2:0]   : 0x3   (3 bits in instruction bits [18:16])
     Field low_bit_hi [0:0]     : 0x1   (1 bits in instruction bits [19:19])
 
-Configuring dp.actionmux_din_power_ctl[14_byte_group=0][byte_position=4].actionmux_din_power_ctl to be 0x18.  (previous value = 0x8  OR new value = 0x10)
+Configuring dp.actionmux_din_power_ctl[14_byte_group=0][byte_position=4].actionmux_din_power_ctl to be 0x30.  (previous value = 0x10  OR new value = 0x20)
 Configuring rams.match.merge.mau_payload_shifter_enable[table_type=1][result_bus=0].idletime_adr_payload_shifter_en to be 1.
 Configuring rams.match.merge.mau_payload_shifter_enable[table_type=1][result_bus=0].stats_adr_payload_shifter_en to be 1.
 Configuring rams.match.merge.mau_payload_shifter_enable[table_type=1][result_bus=0].actiondata_adr_payload_shifter_en to be 1.
@@ -773,12 +772,15 @@
 Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=0].phv_ingress_thread to be 0x3f.
 Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=0].phv_ingress_thread_alu to be 0x3f.
 Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=0].phv_ingress_thread_imem to be 0x3f.
-Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=4].phv_ingress_thread to be 0x1f.
-Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=4].phv_ingress_thread_alu to be 0x1f.
-Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=4].phv_ingress_thread_imem to be 0x1f.
+Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=4].phv_ingress_thread to be 0x3f.
+Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=4].phv_ingress_thread_alu to be 0x3f.
+Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=4].phv_ingress_thread_imem to be 0x3f.
 Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=8].phv_ingress_thread to be 0xff.
 Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=8].phv_ingress_thread_alu to be 0xff.
 Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=8].phv_ingress_thread_imem to be 0xff.
+Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=9].phv_ingress_thread to be 0x1.
+Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=9].phv_ingress_thread_alu to be 0x1.
+Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=9].phv_ingress_thread_imem to be 0x1.
 Configuring dp.phv_egress_thread[14_byte_group=0][byte_position=6].phv_egress_thread to be 0x3.
 Configuring dp.phv_egress_thread_alu[14_byte_group=0][byte_position=6].phv_egress_thread_alu to be 0x3.
 Configuring dp.phv_egress_thread_imem[14_byte_group=0][byte_position=6].phv_egress_thread_imem to be 0x3.
@@ -853,23 +855,24 @@
 Configuring rams.match.merge.mau_stats_adr_default[table_type_index=0][result_bus_number=14].mau_stats_adr_default to be 0x80000.
 Configuring dp.mau_match_input_xbar_exact_match_enable[direction_index=0].mau_match_input_xbar_exact_match_enable to be 0x1.  (old value = 0x0 OR new value = 0x1)
 Configuring dp.xbar_hash.xbar.mau_match_input_xbar_ternary_match_enable[direction_index=0].mau_match_input_xbar_ternary_match_enable to be 0x0.  (old value = 0x0 OR new value = 0x0)
-Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=0].match_input_xbar_816b_ctl_address to be 23.
+Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=0].match_input_xbar_816b_ctl_address to be 24.
 Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=0].match_input_xbar_816b_ctl_enable to be 1.
-Configuring match input crossbar byte 0 to come from 16-bit PHV container 7.
+Configuring match input crossbar byte 0 to come from 16-bit PHV container 8.
   That PHV byte contains {ecmp_metadata.selector[7:0]}.
-Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=1].match_input_xbar_816b_ctl_address to be 23.
+Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=1].match_input_xbar_816b_ctl_address to be 24.
 Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=1].match_input_xbar_816b_ctl_enable to be 1.
-Configuring match input crossbar byte 1 to come from 16-bit PHV container 7.
+Configuring match input crossbar byte 1 to come from 16-bit PHV container 8.
   That PHV byte contains {ecmp_metadata.selector[15:8]}.
-Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=2].match_input_xbar_816b_ctl_address to be 22.
+Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=2].match_input_xbar_816b_ctl_address to be 23.
 Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=2].match_input_xbar_816b_ctl_enable to be 1.
-Configuring match input crossbar byte 2 to come from 16-bit PHV container 6.
+Configuring match input crossbar byte 2 to come from 16-bit PHV container 7.
   That PHV byte contains {ecmp_metadata.group_id[7:0]}.
-Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=3].match_input_xbar_816b_ctl_address to be 22.
+Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=3].match_input_xbar_816b_ctl_address to be 23.
 Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=3].match_input_xbar_816b_ctl_enable to be 1.
-Configuring match input crossbar byte 3 to come from 16-bit PHV container 6.
+Configuring match input crossbar byte 3 to come from 16-bit PHV container 7.
   That PHV byte contains {ecmp_metadata.group_id[15:8]}.
-Configuring dp.match_input_xbar_din_power_ctl[14_byte_group=0][byte_position=8].match_input_xbar_din_power_ctl to be 0xc0.  (previous value = 0x0  OR new value = 0xc0)
+Configuring dp.match_input_xbar_din_power_ctl[14_byte_group=0][byte_position=8].match_input_xbar_din_power_ctl to be 0x80.  (previous value = 0x0  OR new value = 0x80)
+Configuring dp.match_input_xbar_din_power_ctl[14_byte_group=0][byte_position=9].match_input_xbar_din_power_ctl to be 0x1.  (previous value = 0x0  OR new value = 0x1)
 Configuring dp.xbar_hash.hash.hash_seed[output_bit=2].hash_seed to be 0x1 (previous value = 0x0  OR  new value = 0x1)
 Configuring dp.xbar_hash.hash.hash_seed[output_bit=3].hash_seed to be 0x1 (previous value = 0x0  OR  new value = 0x1)
 Configuring dp.xbar_hash.hash.hash_seed[output_bit=5].hash_seed to be 0x1 (previous value = 0x0  OR  new value = 0x1)
@@ -1765,12 +1768,15 @@
 Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=0].phv_ingress_thread to be 0x3f.
 Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=0].phv_ingress_thread_alu to be 0x3f.
 Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=0].phv_ingress_thread_imem to be 0x3f.
-Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=4].phv_ingress_thread to be 0x1f.
-Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=4].phv_ingress_thread_alu to be 0x1f.
-Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=4].phv_ingress_thread_imem to be 0x1f.
+Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=4].phv_ingress_thread to be 0x3f.
+Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=4].phv_ingress_thread_alu to be 0x3f.
+Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=4].phv_ingress_thread_imem to be 0x3f.
 Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=8].phv_ingress_thread to be 0xff.
 Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=8].phv_ingress_thread_alu to be 0xff.
 Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=8].phv_ingress_thread_imem to be 0xff.
+Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=9].phv_ingress_thread to be 0x1.
+Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=9].phv_ingress_thread_alu to be 0x1.
+Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=9].phv_ingress_thread_imem to be 0x1.
 Configuring dp.phv_egress_thread[14_byte_group=0][byte_position=6].phv_egress_thread to be 0x3.
 Configuring dp.phv_egress_thread_alu[14_byte_group=0][byte_position=6].phv_egress_thread_alu to be 0x3.
 Configuring dp.phv_egress_thread_imem[14_byte_group=0][byte_position=6].phv_egress_thread_imem to be 0x3.
@@ -1821,26 +1827,26 @@
 Configuring rams.match.merge.logical_table_thread[copy_index=2].logical_table_thread_ingress to be 0x1 (previous_value=0x0 OR new_value=0x1).
 Configuring dp.mau_match_input_xbar_exact_match_enable[direction_index=0].mau_match_input_xbar_exact_match_enable to be 0x1.  (old value = 0x0 OR new value = 0x1)
 Configuring dp.xbar_hash.xbar.mau_match_input_xbar_ternary_match_enable[direction_index=0].mau_match_input_xbar_ternary_match_enable to be 0x0.  (old value = 0x0 OR new value = 0x0)
-Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=0].match_input_xbar_816b_ctl_address to be 18.
-Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=0].match_input_xbar_816b_ctl_enable to be 1.
-Configuring match input crossbar byte 0 to come from 16-bit PHV container 2.
+Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=2].match_input_xbar_816b_ctl_address to be 18.
+Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=2].match_input_xbar_816b_ctl_enable to be 1.
+Configuring match input crossbar byte 2 to come from 16-bit PHV container 2.
   That PHV byte contains {ig_intr_md_for_tm.ucast_egress_port[7:0]}.
-Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=1].match_input_xbar_816b_ctl_address to be 18.
-Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=1].match_input_xbar_816b_ctl_enable to be 1.
-Configuring match input crossbar byte 1 to come from 16-bit PHV container 2.
+Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=3].match_input_xbar_816b_ctl_address to be 18.
+Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=3].match_input_xbar_816b_ctl_enable to be 1.
+Configuring match input crossbar byte 3 to come from 16-bit PHV container 2.
   That PHV byte contains {unused[6:0], ig_intr_md_for_tm.ucast_egress_port[8:8]}.
 Configuring dp.match_input_xbar_din_power_ctl[14_byte_group=0][byte_position=8].match_input_xbar_din_power_ctl to be 0x4.  (previous value = 0x0  OR new value = 0x4)
 Configuring dp.xbar_hash.hash.parity_group_mask[parity_group_mask_index=0][byte_number=0].parity_group_mask to be 0x1.  (previous value = 0x0  OR  new value = 0x1)
 Configuring dp.xbar_hash.hash.parity_group_mask[parity_group_mask_index=0][byte_number=1].parity_group_mask to be 0x0.  (previous value = 0x0  OR  new value = 0x0)
-Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=0][hash_bit_index=40].byte1 to be 0x1.
-Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=0][hash_bit_index=41].byte0 to be 0x1.
-Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=0][hash_bit_index=42].byte0 to be 0x2.
-Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=0][hash_bit_index=43].byte0 to be 0x4.
-Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=0][hash_bit_index=44].byte0 to be 0x8.
-Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=0][hash_bit_index=45].byte0 to be 0x10.
-Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=0][hash_bit_index=46].byte0 to be 0x20.
-Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=0][hash_bit_index=47].byte0 to be 0x40.
-Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=0][hash_bit_index=48].byte0 to be 0x80.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=1][hash_bit_index=40].byte1 to be 0x1.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=1][hash_bit_index=41].byte0 to be 0x1.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=1][hash_bit_index=42].byte0 to be 0x2.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=1][hash_bit_index=43].byte0 to be 0x4.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=1][hash_bit_index=44].byte0 to be 0x8.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=1][hash_bit_index=45].byte0 to be 0x10.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=1][hash_bit_index=46].byte0 to be 0x20.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=1][hash_bit_index=47].byte0 to be 0x40.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=1][hash_bit_index=48].byte0 to be 0x80.
 Configuring dp.hashout_ctl.hash_group_ingress_enable to be 0x1.  (previous value = 0x0 OR new value = 0x1)
 Configuring rams.array.row[row=7].vh_xbar[search_bus_index=0].exactmatch_row_vh_xbar_ctl.exactmatch_row_vh_xbar_select to be 0.
 Configuring rams.array.row[row=7].vh_xbar[search_bus_index=0].exactmatch_row_vh_xbar_ctl.exactmatch_row_vh_xbar_enable to be 1.
@@ -1858,23 +1864,23 @@
 Configuring rams.array.row[7].gateway_table[1].gateway_table_entry_matchdata[3][0] to be 0xffffffff
 Configuring rams.array.row[7].gateway_table[1].gateway_table_entry_matchdata[3][1] to be 0xffffffff
 Configuring rams.array.row[7].gateway_table[1].gateway_table_ctl.gateway_table_mode to be 0x2
-Configuring rams.array.row[7].gateway_table[1].gateway_table_data_entry[3][0] to be 0xffffff
-Configuring rams.array.row[7].gateway_table[1].gateway_table_data_entry[3][1] to be 0xffff3f
+Configuring rams.array.row[7].gateway_table[1].gateway_table_data_entry[3][0] to be 0xffff00
+Configuring rams.array.row[7].gateway_table[1].gateway_table_data_entry[3][1] to be 0xffff00
 Configuring rams.match.merge.gateway_inhibit_lut[0] to be 0x8
 Configuring rams.match.merge.gateway_next_table_lut[0][3] to be 0x21
 Configuring rams.array.row[7].gateway_table[1].gateway_table_vv_entry[2].gateway_table_entry_versionvalid0 to be 0x3
 Configuring rams.array.row[7].gateway_table[1].gateway_table_vv_entry[2].gateway_table_entry_versionvalid1 to be 0x3
 Configuring rams.array.row[7].gateway_table[1].gateway_table_entry_matchdata[2][0] to be 0xffffffff
 Configuring rams.array.row[7].gateway_table[1].gateway_table_entry_matchdata[2][1] to be 0xffffffff
-Configuring rams.array.row[7].gateway_table[1].gateway_table_data_entry[2][0] to be 0xffffff
-Configuring rams.array.row[7].gateway_table[1].gateway_table_data_entry[2][1] to be 0xff7fff
+Configuring rams.array.row[7].gateway_table[1].gateway_table_data_entry[2][0] to be 0xff00ff
+Configuring rams.array.row[7].gateway_table[1].gateway_table_data_entry[2][1] to be 0xff00ff
 Configuring rams.match.merge.gateway_inhibit_lut[0] to be 0xc (previous value 0x8 OR new value 0x4)
 Configuring rams.match.merge.gateway_next_table_lut[0][2] to be 0x21
 Configuring rams.array.row[7].gateway_table[1].gateway_table_vv_entry[1].gateway_table_entry_versionvalid0 to be 0x3
 Configuring rams.array.row[7].gateway_table[1].gateway_table_vv_entry[1].gateway_table_entry_versionvalid1 to be 0x3
 Configuring rams.array.row[7].gateway_table[1].gateway_table_entry_matchdata[1][0] to be 0xffffffff
 Configuring rams.array.row[7].gateway_table[1].gateway_table_entry_matchdata[1][1] to be 0xffffffff
-Configuring rams.array.row[7].gateway_table[1].gateway_table_data_entry[1][0] to be 0x1ffff
+Configuring rams.array.row[7].gateway_table[1].gateway_table_data_entry[1][0] to be 0x3ffff
 Configuring rams.array.row[7].gateway_table[1].gateway_table_data_entry[1][1] to be 0xffff
 Configuring rams.match.merge.gateway_inhibit_lut[0] to be 0xe (previous value 0xc OR new value 0x2)
 Configuring rams.match.merge.gateway_next_table_lut[0][1] to be 0x21
@@ -1900,7 +1906,7 @@
 +------------------------------------------------------------------------
 |  Working on table ingress_port_count_table in stage 2 ---
 +------------------------------------------------------------------------
---> Match Table with no key ingress_port_count_table with logical_table_id 0
+--> Hash Action Table ingress_port_count_table with logical_table_id 0
 allocated_result_bus = Ram Data Bus MatchResult2R 0 left_and_right is 83 bits
 Configuring rams.match.merge.predication_ctl[direction_index=0].table_thread to be 0x1 (previous_value=0x1 OR new_value=0x1).
 Configuring rams.match.merge.logical_table_thread[copy_index=0].logical_table_thread_ingress to be 0x1 (previous_value=0x1 OR new_value=0x1).
@@ -1920,6 +1926,37 @@
 Configuring rams.match.merge.mau_action_instruction_adr_map_en[table_type_index=0].mau_action_instruction_adr_map_en to be 0x1 (previous_value=0x0 OR new_value=0x1).
 Configuring rams.match.merge.mau_action_instruction_adr_map_data[table_type_index=0][logical_table=0][entry_index=0].mau_action_instruction_adr_map_data to be 0x2000.
 Configuring rams.match.merge.mau_action_instruction_adr_map_data[table_type_index=0][logical_table=0][entry_index=1].mau_action_instruction_adr_map_data to be 0x0.
+
+---- Hash Distribution Units for table ingress_port_count_table ----
+Configuring dp.mau_match_input_xbar_exact_match_enable[direction_index=0].mau_match_input_xbar_exact_match_enable to be 0x1.  (old value = 0x1 OR new value = 0x1)
+Configuring dp.xbar_hash.xbar.mau_match_input_xbar_ternary_match_enable[direction_index=0].mau_match_input_xbar_ternary_match_enable to be 0x0.  (old value = 0x0 OR new value = 0x0)
+Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=0].match_input_xbar_816b_ctl_address to be 16.
+Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=0].match_input_xbar_816b_ctl_enable to be 1.
+Configuring match input crossbar byte 0 to come from 16-bit PHV container 0.
+  That PHV byte contains {ig_intr_md.ingress_port[7:0]}.
+Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=1].match_input_xbar_816b_ctl_address to be 16.
+Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=1].match_input_xbar_816b_ctl_enable to be 1.
+Configuring match input crossbar byte 1 to come from 16-bit PHV container 0.
+  That PHV byte contains {unused[6:0], ig_intr_md.ingress_port[8:8]}.
+Configuring dp.match_input_xbar_din_power_ctl[14_byte_group=0][byte_position=8].match_input_xbar_din_power_ctl to be 0x5.  (previous value = 0x4  OR new value = 0x1)
+Configuring dp.xbar_hash.hash.parity_group_mask[parity_group_mask_index=0][byte_number=0].parity_group_mask to be 0x1.  (previous value = 0x1  OR  new value = 0x1)
+Configuring dp.xbar_hash.hash.parity_group_mask[parity_group_mask_index=0][byte_number=1].parity_group_mask to be 0x0.  (previous value = 0x0  OR  new value = 0x0)
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=0][hash_bit_index=0].byte0 to be 0x1.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=0][hash_bit_index=1].byte0 to be 0x2.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=0][hash_bit_index=2].byte0 to be 0x4.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=0][hash_bit_index=3].byte0 to be 0x8.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=0][hash_bit_index=4].byte0 to be 0x10.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=0][hash_bit_index=5].byte0 to be 0x20.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=0][hash_bit_index=6].byte0 to be 0x40.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=0][hash_bit_index=7].byte0 to be 0x80.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=0][hash_bit_index=8].byte1 to be 0x1.
+Configuring dp.hashout_ctl.hash_group_ingress_enable to be 0x1.  (previous value = 0x1 OR new value = 0x1)
+Configuring rams.match.merge.mau_hash_group_config.hash_group_enable to be 1. (old value = 0 OR new value = 1).
+Configuring rams.match.merge.mau_hash_group_config.hash_group_sel to be 8. (old value = 0 OR new value = 8).
+Configuring rams.match.merge.mau_hash_group_config.hash_group_ctl to be 1. (old value = 0 OR new value = 1).
+Configuring rams.match.merge.mau_hash_group_shiftcount.mau_hash_group_shiftcount to be 0x1. (old value = 0x0 OR new value = 0x1).
+Configuring rams.match.merge.mau_hash_group_mask[which_16=0].mau_hash_group_mask to be 0x3ff.  (previous value = 0x0  OR new value = 0x3ff)
+Configuring rams.match.merge.mau_hash_group_xbar_ctl[output_type_index=3][control_group_index=0].mau_hash_group_xbar_ctl to be 0x8 (old value = 0x0 OR new value = 0x8).
 Configuring rams.match.merge.mau_payload_shifter_enable[table_type=0][result_bus=1].stats_adr_payload_shifter_en to be 1.
 Configuring rams.match.merge.mau_payload_shifter_enable[table_type=0][result_bus=1].action_instruction_adr_payload_shifter_en to be 1.
 
@@ -1931,7 +1968,7 @@
 +------------------------------------------------------------------------
 |  Working on table egress_port_count_table in stage 2 ---
 +------------------------------------------------------------------------
---> Match Table with no key egress_port_count_table with logical_table_id 1
+--> Hash Action Table egress_port_count_table with logical_table_id 1
 allocated_result_bus = Ram Data Bus MatchResult1R 0 left_and_right is 83 bits
 Configuring rams.match.merge.predication_ctl[direction_index=0].table_thread to be 0x3 (previous_value=0x1 OR new_value=0x2).
 Configuring rams.match.merge.logical_table_thread[copy_index=0].logical_table_thread_ingress to be 0x3 (previous_value=0x1 OR new_value=0x2).
@@ -1951,6 +1988,37 @@
 Configuring rams.match.merge.mau_action_instruction_adr_map_en[table_type_index=0].mau_action_instruction_adr_map_en to be 0x3 (previous_value=0x1 OR new_value=0x2).
 Configuring rams.match.merge.mau_action_instruction_adr_map_data[table_type_index=0][logical_table=1][entry_index=0].mau_action_instruction_adr_map_data to be 0x40.
 Configuring rams.match.merge.mau_action_instruction_adr_map_data[table_type_index=0][logical_table=1][entry_index=1].mau_action_instruction_adr_map_data to be 0x0.
+
+---- Hash Distribution Units for table egress_port_count_table ----
+Configuring dp.mau_match_input_xbar_exact_match_enable[direction_index=0].mau_match_input_xbar_exact_match_enable to be 0x3.  (old value = 0x1 OR new value = 0x2)
+Configuring dp.xbar_hash.xbar.mau_match_input_xbar_ternary_match_enable[direction_index=0].mau_match_input_xbar_ternary_match_enable to be 0x0.  (old value = 0x0 OR new value = 0x0)
+Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=8].match_input_xbar_816b_ctl_address to be 18.
+Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=8].match_input_xbar_816b_ctl_enable to be 1.
+Configuring match input crossbar byte 8 to come from 16-bit PHV container 2.
+  That PHV byte contains {ig_intr_md_for_tm.ucast_egress_port[7:0]}.
+Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=9].match_input_xbar_816b_ctl_address to be 18.
+Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=9].match_input_xbar_816b_ctl_enable to be 1.
+Configuring match input crossbar byte 9 to come from 16-bit PHV container 2.
+  That PHV byte contains {unused[6:0], ig_intr_md_for_tm.ucast_egress_port[8:8]}.
+Configuring dp.match_input_xbar_din_power_ctl[14_byte_group=0][byte_position=8].match_input_xbar_din_power_ctl to be 0x5.  (previous value = 0x5  OR new value = 0x4)
+Configuring dp.xbar_hash.hash.parity_group_mask[parity_group_mask_index=1][byte_number=0].parity_group_mask to be 0x2.  (previous value = 0x0  OR  new value = 0x2)
+Configuring dp.xbar_hash.hash.parity_group_mask[parity_group_mask_index=1][byte_number=1].parity_group_mask to be 0x0.  (previous value = 0x0  OR  new value = 0x0)
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=4][hash_bit_index=0].byte0 to be 0x1.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=4][hash_bit_index=1].byte0 to be 0x2.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=4][hash_bit_index=2].byte0 to be 0x4.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=4][hash_bit_index=3].byte0 to be 0x8.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=4][hash_bit_index=4].byte0 to be 0x10.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=4][hash_bit_index=5].byte0 to be 0x20.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=4][hash_bit_index=6].byte0 to be 0x40.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=4][hash_bit_index=7].byte0 to be 0x80.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=4][hash_bit_index=8].byte1 to be 0x1.
+Configuring dp.hashout_ctl.hash_group_ingress_enable to be 0x3.  (previous value = 0x1 OR new value = 0x2)
+Configuring rams.match.merge.mau_hash_group_config.hash_group_enable to be 9. (old value = 1 OR new value = 8).
+Configuring rams.match.merge.mau_hash_group_config.hash_group_sel to be 152. (old value = 8 OR new value = 144).
+Configuring rams.match.merge.mau_hash_group_config.hash_group_ctl to be 65. (old value = 1 OR new value = 64).
+Configuring rams.match.merge.mau_hash_group_shiftcount.mau_hash_group_shiftcount to be 0x201. (old value = 0x1 OR new value = 0x200).
+Configuring rams.match.merge.mau_hash_group_mask[which_16=3].mau_hash_group_mask to be 0x3ff.  (previous value = 0x0  OR new value = 0x3ff)
+Configuring rams.match.merge.mau_hash_group_xbar_ctl[output_type_index=3][control_group_index=0].mau_hash_group_xbar_ctl to be 0xb8 (old value = 0x8 OR new value = 0xb0).
 --> Stage Gateway Table for condition egress_port_count_table_always_true_condition in stage 2
 Configuring rams.match.merge.predication_ctl[direction_index=0].table_thread to be 0x3 (previous_value=0x3 OR new_value=0x2).
 Configuring rams.match.adrdist.adr_dist_table_thread[direction_index=0][copy_index=0].adr_dist_table_thread to be 0x3 (previous_value=0x3 OR new_value=0x2).
@@ -1958,11 +2026,11 @@
 Configuring rams.match.merge.logical_table_thread[copy_index=0].logical_table_thread_ingress to be 0x3 (previous_value=0x3 OR new_value=0x2).
 Configuring rams.match.merge.logical_table_thread[copy_index=1].logical_table_thread_ingress to be 0x3 (previous_value=0x3 OR new_value=0x2).
 Configuring rams.match.merge.logical_table_thread[copy_index=2].logical_table_thread_ingress to be 0x3 (previous_value=0x3 OR new_value=0x2).
-Configuring dp.mau_match_input_xbar_exact_match_enable[direction_index=0].mau_match_input_xbar_exact_match_enable to be 0x1.  (old value = 0x1 OR new value = 0x0)
+Configuring dp.mau_match_input_xbar_exact_match_enable[direction_index=0].mau_match_input_xbar_exact_match_enable to be 0x3.  (old value = 0x3 OR new value = 0x0)
 Configuring dp.xbar_hash.xbar.mau_match_input_xbar_ternary_match_enable[direction_index=0].mau_match_input_xbar_ternary_match_enable to be 0x0.  (old value = 0x0 OR new value = 0x0)
 Configuring dp.xbar_hash.hash.parity_group_mask[parity_group_mask_index=0][byte_number=0].parity_group_mask to be 0x1.  (previous value = 0x1  OR  new value = 0x0)
 Configuring dp.xbar_hash.hash.parity_group_mask[parity_group_mask_index=0][byte_number=1].parity_group_mask to be 0x0.  (previous value = 0x0  OR  new value = 0x0)
-Configuring dp.hashout_ctl.hash_group_ingress_enable to be 0x1.  (previous value = 0x1 OR new value = 0x1)
+Configuring dp.hashout_ctl.hash_group_ingress_enable to be 0x3.  (previous value = 0x3 OR new value = 0x1)
 Configuring rams.array.row[7].gateway_table[0].gateway_table_ctl.gateway_table_input_data0_select to be 0x1
 Configuring rams.array.row[7].gateway_table[0].gateway_table_ctl.gateway_table_input_data1_select to be 0x0
 Configuring rams.array.row[7].gateway_table[0].gateway_table_ctl.gateway_table_input_hash0_select to be 0x1
@@ -2199,12 +2267,15 @@
 Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=0].phv_ingress_thread to be 0x3f.
 Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=0].phv_ingress_thread_alu to be 0x3f.
 Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=0].phv_ingress_thread_imem to be 0x3f.
-Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=4].phv_ingress_thread to be 0x1f.
-Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=4].phv_ingress_thread_alu to be 0x1f.
-Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=4].phv_ingress_thread_imem to be 0x1f.
+Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=4].phv_ingress_thread to be 0x3f.
+Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=4].phv_ingress_thread_alu to be 0x3f.
+Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=4].phv_ingress_thread_imem to be 0x3f.
 Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=8].phv_ingress_thread to be 0xff.
 Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=8].phv_ingress_thread_alu to be 0xff.
 Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=8].phv_ingress_thread_imem to be 0xff.
+Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=9].phv_ingress_thread to be 0x1.
+Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=9].phv_ingress_thread_alu to be 0x1.
+Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=9].phv_ingress_thread_imem to be 0x1.
 Configuring dp.phv_egress_thread[14_byte_group=0][byte_position=6].phv_egress_thread to be 0x3.
 Configuring dp.phv_egress_thread_alu[14_byte_group=0][byte_position=6].phv_egress_thread_alu to be 0x3.
 Configuring dp.phv_egress_thread_imem[14_byte_group=0][byte_position=6].phv_egress_thread_imem to be 0x3.
@@ -2281,12 +2352,15 @@
 Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=0].phv_ingress_thread to be 0x3f.
 Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=0].phv_ingress_thread_alu to be 0x3f.
 Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=0].phv_ingress_thread_imem to be 0x3f.
-Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=4].phv_ingress_thread to be 0x1f.
-Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=4].phv_ingress_thread_alu to be 0x1f.
-Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=4].phv_ingress_thread_imem to be 0x1f.
+Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=4].phv_ingress_thread to be 0x3f.
+Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=4].phv_ingress_thread_alu to be 0x3f.
+Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=4].phv_ingress_thread_imem to be 0x3f.
 Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=8].phv_ingress_thread to be 0xff.
 Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=8].phv_ingress_thread_alu to be 0xff.
 Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=8].phv_ingress_thread_imem to be 0xff.
+Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=9].phv_ingress_thread to be 0x1.
+Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=9].phv_ingress_thread_alu to be 0x1.
+Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=9].phv_ingress_thread_imem to be 0x1.
 Configuring dp.phv_egress_thread[14_byte_group=0][byte_position=6].phv_egress_thread to be 0x3.
 Configuring dp.phv_egress_thread_alu[14_byte_group=0][byte_position=6].phv_egress_thread_alu to be 0x3.
 Configuring dp.phv_egress_thread_imem[14_byte_group=0][byte_position=6].phv_egress_thread_imem to be 0x3.
@@ -2363,12 +2437,15 @@
 Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=0].phv_ingress_thread to be 0x3f.
 Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=0].phv_ingress_thread_alu to be 0x3f.
 Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=0].phv_ingress_thread_imem to be 0x3f.
-Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=4].phv_ingress_thread to be 0x1f.
-Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=4].phv_ingress_thread_alu to be 0x1f.
-Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=4].phv_ingress_thread_imem to be 0x1f.
+Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=4].phv_ingress_thread to be 0x3f.
+Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=4].phv_ingress_thread_alu to be 0x3f.
+Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=4].phv_ingress_thread_imem to be 0x3f.
 Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=8].phv_ingress_thread to be 0xff.
 Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=8].phv_ingress_thread_alu to be 0xff.
 Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=8].phv_ingress_thread_imem to be 0xff.
+Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=9].phv_ingress_thread to be 0x1.
+Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=9].phv_ingress_thread_alu to be 0x1.
+Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=9].phv_ingress_thread_imem to be 0x1.
 Configuring dp.phv_egress_thread[14_byte_group=0][byte_position=6].phv_egress_thread to be 0x3.
 Configuring dp.phv_egress_thread_alu[14_byte_group=0][byte_position=6].phv_egress_thread_alu to be 0x3.
 Configuring dp.phv_egress_thread_imem[14_byte_group=0][byte_position=6].phv_egress_thread_imem to be 0x3.
@@ -2445,12 +2522,15 @@
 Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=0].phv_ingress_thread to be 0x3f.
 Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=0].phv_ingress_thread_alu to be 0x3f.
 Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=0].phv_ingress_thread_imem to be 0x3f.
-Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=4].phv_ingress_thread to be 0x1f.
-Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=4].phv_ingress_thread_alu to be 0x1f.
-Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=4].phv_ingress_thread_imem to be 0x1f.
+Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=4].phv_ingress_thread to be 0x3f.
+Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=4].phv_ingress_thread_alu to be 0x3f.
+Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=4].phv_ingress_thread_imem to be 0x3f.
 Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=8].phv_ingress_thread to be 0xff.
 Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=8].phv_ingress_thread_alu to be 0xff.
 Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=8].phv_ingress_thread_imem to be 0xff.
+Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=9].phv_ingress_thread to be 0x1.
+Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=9].phv_ingress_thread_alu to be 0x1.
+Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=9].phv_ingress_thread_imem to be 0x1.
 Configuring dp.phv_egress_thread[14_byte_group=0][byte_position=6].phv_egress_thread to be 0x3.
 Configuring dp.phv_egress_thread_alu[14_byte_group=0][byte_position=6].phv_egress_thread_alu to be 0x3.
 Configuring dp.phv_egress_thread_imem[14_byte_group=0][byte_position=6].phv_egress_thread_imem to be 0x3.
@@ -2527,12 +2607,15 @@
 Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=0].phv_ingress_thread to be 0x3f.
 Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=0].phv_ingress_thread_alu to be 0x3f.
 Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=0].phv_ingress_thread_imem to be 0x3f.
-Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=4].phv_ingress_thread to be 0x1f.
-Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=4].phv_ingress_thread_alu to be 0x1f.
-Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=4].phv_ingress_thread_imem to be 0x1f.
+Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=4].phv_ingress_thread to be 0x3f.
+Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=4].phv_ingress_thread_alu to be 0x3f.
+Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=4].phv_ingress_thread_imem to be 0x3f.
 Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=8].phv_ingress_thread to be 0xff.
 Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=8].phv_ingress_thread_alu to be 0xff.
 Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=8].phv_ingress_thread_imem to be 0xff.
+Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=9].phv_ingress_thread to be 0x1.
+Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=9].phv_ingress_thread_alu to be 0x1.
+Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=9].phv_ingress_thread_imem to be 0x1.
 Configuring dp.phv_egress_thread[14_byte_group=0][byte_position=6].phv_egress_thread to be 0x3.
 Configuring dp.phv_egress_thread_alu[14_byte_group=0][byte_position=6].phv_egress_thread_alu to be 0x3.
 Configuring dp.phv_egress_thread_imem[14_byte_group=0][byte_position=6].phv_egress_thread_imem to be 0x3.
@@ -2609,12 +2692,15 @@
 Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=0].phv_ingress_thread to be 0x3f.
 Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=0].phv_ingress_thread_alu to be 0x3f.
 Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=0].phv_ingress_thread_imem to be 0x3f.
-Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=4].phv_ingress_thread to be 0x1f.
-Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=4].phv_ingress_thread_alu to be 0x1f.
-Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=4].phv_ingress_thread_imem to be 0x1f.
+Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=4].phv_ingress_thread to be 0x3f.
+Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=4].phv_ingress_thread_alu to be 0x3f.
+Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=4].phv_ingress_thread_imem to be 0x3f.
 Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=8].phv_ingress_thread to be 0xff.
 Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=8].phv_ingress_thread_alu to be 0xff.
 Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=8].phv_ingress_thread_imem to be 0xff.
+Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=9].phv_ingress_thread to be 0x1.
+Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=9].phv_ingress_thread_alu to be 0x1.
+Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=9].phv_ingress_thread_imem to be 0x1.
 Configuring dp.phv_egress_thread[14_byte_group=0][byte_position=6].phv_egress_thread to be 0x3.
 Configuring dp.phv_egress_thread_alu[14_byte_group=0][byte_position=6].phv_egress_thread_alu to be 0x3.
 Configuring dp.phv_egress_thread_imem[14_byte_group=0][byte_position=6].phv_egress_thread_imem to be 0x3.
@@ -2691,12 +2777,15 @@
 Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=0].phv_ingress_thread to be 0x3f.
 Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=0].phv_ingress_thread_alu to be 0x3f.
 Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=0].phv_ingress_thread_imem to be 0x3f.
-Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=4].phv_ingress_thread to be 0x1f.
-Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=4].phv_ingress_thread_alu to be 0x1f.
-Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=4].phv_ingress_thread_imem to be 0x1f.
+Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=4].phv_ingress_thread to be 0x3f.
+Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=4].phv_ingress_thread_alu to be 0x3f.
+Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=4].phv_ingress_thread_imem to be 0x3f.
 Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=8].phv_ingress_thread to be 0xff.
 Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=8].phv_ingress_thread_alu to be 0xff.
 Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=8].phv_ingress_thread_imem to be 0xff.
+Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=9].phv_ingress_thread to be 0x1.
+Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=9].phv_ingress_thread_alu to be 0x1.
+Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=9].phv_ingress_thread_imem to be 0x1.
 Configuring dp.phv_egress_thread[14_byte_group=0][byte_position=6].phv_egress_thread to be 0x3.
 Configuring dp.phv_egress_thread_alu[14_byte_group=0][byte_position=6].phv_egress_thread_alu to be 0x3.
 Configuring dp.phv_egress_thread_imem[14_byte_group=0][byte_position=6].phv_egress_thread_imem to be 0x3.
@@ -2773,12 +2862,15 @@
 Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=0].phv_ingress_thread to be 0x3f.
 Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=0].phv_ingress_thread_alu to be 0x3f.
 Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=0].phv_ingress_thread_imem to be 0x3f.
-Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=4].phv_ingress_thread to be 0x1f.
-Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=4].phv_ingress_thread_alu to be 0x1f.
-Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=4].phv_ingress_thread_imem to be 0x1f.
+Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=4].phv_ingress_thread to be 0x3f.
+Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=4].phv_ingress_thread_alu to be 0x3f.
+Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=4].phv_ingress_thread_imem to be 0x3f.
 Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=8].phv_ingress_thread to be 0xff.
 Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=8].phv_ingress_thread_alu to be 0xff.
 Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=8].phv_ingress_thread_imem to be 0xff.
+Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=9].phv_ingress_thread to be 0x1.
+Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=9].phv_ingress_thread_alu to be 0x1.
+Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=9].phv_ingress_thread_imem to be 0x1.
 Configuring dp.phv_egress_thread[14_byte_group=0][byte_position=6].phv_egress_thread to be 0x3.
 Configuring dp.phv_egress_thread_alu[14_byte_group=0][byte_position=6].phv_egress_thread_alu to be 0x3.
 Configuring dp.phv_egress_thread_imem[14_byte_group=0][byte_position=6].phv_egress_thread_imem to be 0x3.
@@ -2855,12 +2947,15 @@
 Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=0].phv_ingress_thread to be 0x3f.
 Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=0].phv_ingress_thread_alu to be 0x3f.
 Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=0].phv_ingress_thread_imem to be 0x3f.
-Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=4].phv_ingress_thread to be 0x1f.
-Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=4].phv_ingress_thread_alu to be 0x1f.
-Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=4].phv_ingress_thread_imem to be 0x1f.
+Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=4].phv_ingress_thread to be 0x3f.
+Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=4].phv_ingress_thread_alu to be 0x3f.
+Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=4].phv_ingress_thread_imem to be 0x3f.
 Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=8].phv_ingress_thread to be 0xff.
 Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=8].phv_ingress_thread_alu to be 0xff.
 Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=8].phv_ingress_thread_imem to be 0xff.
+Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=9].phv_ingress_thread to be 0x1.
+Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=9].phv_ingress_thread_alu to be 0x1.
+Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=9].phv_ingress_thread_imem to be 0x1.
 Configuring dp.phv_egress_thread[14_byte_group=0][byte_position=6].phv_egress_thread to be 0x3.
 Configuring dp.phv_egress_thread_alu[14_byte_group=0][byte_position=6].phv_egress_thread_alu to be 0x3.
 Configuring dp.phv_egress_thread_imem[14_byte_group=0][byte_position=6].phv_egress_thread_imem to be 0x3.
@@ -2937,12 +3032,15 @@
 Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=0].phv_ingress_thread to be 0x3f.
 Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=0].phv_ingress_thread_alu to be 0x3f.
 Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=0].phv_ingress_thread_imem to be 0x3f.
-Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=4].phv_ingress_thread to be 0x1f.
-Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=4].phv_ingress_thread_alu to be 0x1f.
-Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=4].phv_ingress_thread_imem to be 0x1f.
+Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=4].phv_ingress_thread to be 0x3f.
+Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=4].phv_ingress_thread_alu to be 0x3f.
+Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=4].phv_ingress_thread_imem to be 0x3f.
 Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=8].phv_ingress_thread to be 0xff.
 Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=8].phv_ingress_thread_alu to be 0xff.
 Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=8].phv_ingress_thread_imem to be 0xff.
+Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=9].phv_ingress_thread to be 0x1.
+Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=9].phv_ingress_thread_alu to be 0x1.
+Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=9].phv_ingress_thread_imem to be 0x1.
 Configuring dp.phv_egress_thread[14_byte_group=0][byte_position=6].phv_egress_thread to be 0x3.
 Configuring dp.phv_egress_thread_alu[14_byte_group=0][byte_position=6].phv_egress_thread_alu to be 0x3.
 Configuring dp.phv_egress_thread_imem[14_byte_group=0][byte_position=6].phv_egress_thread_imem to be 0x3.
@@ -2978,7 +3076,7 @@
 Configuring dp.phv_fifo_enable.phv_fifo_egress_final_output_enable to be 0.
 
 +------------------------------------------------------------------------
-|  Number of configuration field values set in Match-Action Stages: 2100
+|  Number of configuration field values set in Match-Action Stages: 2186
 +------------------------------------------------------------------------
 
 +------------------------------------------------------------------------
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/logs/mau.gateway.log b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/logs/mau.gateway.log
index e48a0ef..88fe123 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/logs/mau.gateway.log
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/logs/mau.gateway.log
@@ -1,7 +1,7 @@
 +---------------------------------------------------------------------+
 |  Log file: mau.gateway.log                                          |
 |  Compiler version: 5.1.0 (fca32d1)                                  |
-|  Created on: Tue Sep 12 11:15:53 2017                               |
+|  Created on: Wed Sep 13 00:59:40 2017                               |
 +---------------------------------------------------------------------+
 
 
@@ -135,13 +135,13 @@
 Call to _place_fields_for_constant_comparison
 constant_match_key_partition is:
 Byte Position 0
-  (67, 0)
+  (68, 0)
 Byte Position 1
-  (67, 0)
+  (68, 0)
 Byte Position 2
-  (67, 0)
+  (68, 0)
 Byte Position 3
-  (67, 0)
+  (68, 0)
 
 Available bytes in ram word is [0, 1, 2, 3, 4, 5, 6, 7]
 Available data bytes for constants are [0, 1, 2, 3]
@@ -366,13 +366,13 @@
 Call to _place_fields_for_constant_comparison
 constant_match_key_partition is:
 Byte Position 0
-  (67, 0)
+  (68, 0)
 Byte Position 1
-  (67, 0)
+  (68, 0)
 Byte Position 2
-  (67, 0)
+  (68, 0)
 Byte Position 3
-  (67, 0)
+  (68, 0)
 
 Available bytes in ram word is [0, 1, 2, 3, 4, 5, 6, 7]
 Available data bytes for constants are [0, 1, 2, 3]
@@ -610,13 +610,13 @@
 Call to _place_fields_for_constant_comparison
 constant_match_key_partition is:
 Byte Position 0
-  (67, 0)
+  (68, 0)
 Byte Position 1
-  (67, 0)
+  (68, 0)
 Byte Position 2
-  (67, 0)
+  (68, 0)
 Byte Position 3
-  (67, 0)
+  (68, 0)
 
 Available bytes in ram word is [0, 1, 2, 3, 4, 5, 6, 7]
 Available data bytes for constants are [0, 1, 2, 3]
@@ -757,7 +757,7 @@
 Gateway 14
 ------- Phase 0 -------------
 Looking at gateway table 14
-match_groups_attached_to_gateway = OrderedDict([(0, (0, [1], 0, [0], [(<p4c_tofino.target.tofino.device.pipeline.mau.match_keys.packed_gateway_key.PackedGatewayKey object at 0x7f5739d6e1d0>, 0)])), (1, (None, [], None, [], []))])
+match_groups_attached_to_gateway = OrderedDict([(0, (0, [1], 0, [0], [(<p4c_tofino.target.tofino.device.pipeline.mau.match_keys.packed_gateway_key.PackedGatewayKey object at 0x7faa2f2f0f10>, 0)])), (1, (None, [], None, [], []))])
 Search bus 0 on row 7
 ----------------------------
  Trying to place Gateway Resource Request for table process_packet_out_table_always_true_condition needs access to 0 input bits in exact match group 0 (parity groups [1]) and hash group 0 for gateway 14.
@@ -979,13 +979,13 @@
 Call to _place_fields_for_constant_comparison
 constant_match_key_partition is:
 Byte Position 0
-  (67, 0)
+  (68, 0)
 Byte Position 1
-  (67, 0)
+  (68, 0)
 Byte Position 2
-  (67, 0)
+  (68, 0)
 Byte Position 3
-  (67, 0)
+  (68, 0)
 
 Available bytes in ram word is [0, 1, 2, 3, 4, 5, 6, 7]
 Available data bytes for constants are [0, 1, 2, 3]
@@ -1126,7 +1126,7 @@
 Gateway 14
 ------- Phase 0 -------------
 Looking at gateway table 14
-match_groups_attached_to_gateway = OrderedDict([(0, (0, [1], 0, [0], [(<p4c_tofino.target.tofino.device.pipeline.mau.match_keys.packed_gateway_key.PackedGatewayKey object at 0x7f573a226b90>, 0)])), (1, (None, [], None, [], []))])
+match_groups_attached_to_gateway = OrderedDict([(0, (0, [1], 0, [0], [(<p4c_tofino.target.tofino.device.pipeline.mau.match_keys.packed_gateway_key.PackedGatewayKey object at 0x7faa2f2cc910>, 0)])), (1, (None, [], None, [], []))])
 Search bus 0 on row 7
 ----------------------------
  Trying to place Gateway Resource Request for table process_packet_out_table_always_true_condition needs access to 0 input bits in exact match group 0 (parity groups [1]) and hash group 0 for gateway 14.
@@ -1510,15 +1510,15 @@
   [42] = None
   [43] = None
  Hash Bit Mapping:
-   (1, 0) --> 40
-   (0, 0) --> 41
-   (0, 1) --> 42
-   (0, 2) --> 43
-   (0, 3) --> 44
-   (0, 4) --> 45
-   (0, 5) --> 46
-   (0, 6) --> 47
-   (0, 7) --> 48
+   (3, 0) --> 40
+   (2, 0) --> 41
+   (2, 1) --> 42
+   (2, 2) --> 43
+   (2, 3) --> 44
+   (2, 4) --> 45
+   (2, 5) --> 46
+   (2, 6) --> 47
+   (2, 7) --> 48
 
 Allocating: Ram Data Bus MatchSearch1 7 left_and_right is 128 bits in stage 2 for gateway
 Allocating: Gateway 15 in stage 2 for _condition_2.
@@ -1757,15 +1757,15 @@
   [42] = None
   [43] = None
  Hash Bit Mapping:
-   (1, 0) --> 40
-   (0, 0) --> 41
-   (0, 1) --> 42
-   (0, 2) --> 43
-   (0, 3) --> 44
-   (0, 4) --> 45
-   (0, 5) --> 46
-   (0, 6) --> 47
-   (0, 7) --> 48
+   (3, 0) --> 40
+   (2, 0) --> 41
+   (2, 1) --> 42
+   (2, 2) --> 43
+   (2, 3) --> 44
+   (2, 4) --> 45
+   (2, 5) --> 46
+   (2, 6) --> 47
+   (2, 7) --> 48
 
 Allocating: Ram Data Bus MatchSearch1 7 left_and_right is 128 bits in stage 2 for gateway
 Allocating: Gateway 15 in stage 2 for _condition_2.
@@ -1861,7 +1861,7 @@
 match_groups_attached_to_gateway = OrderedDict([(0, (None, [], None, [], [])), (1, (None, [], None, [], []))])
 Search bus 0 on row 7
 
- final_parity_group_ids = [(0, []), (1, [])] 
+ final_parity_group_ids = [(0, [0]), (1, [])] 
 
  open_parity_group_ids = [0, 1] 
 ----------------------------
@@ -2004,15 +2004,15 @@
   [42] = None
   [43] = None
  Hash Bit Mapping:
-   (1, 0) --> 40
-   (0, 0) --> 41
-   (0, 1) --> 42
-   (0, 2) --> 43
-   (0, 3) --> 44
-   (0, 4) --> 45
-   (0, 5) --> 46
-   (0, 6) --> 47
-   (0, 7) --> 48
+   (3, 0) --> 40
+   (2, 0) --> 41
+   (2, 1) --> 42
+   (2, 2) --> 43
+   (2, 3) --> 44
+   (2, 4) --> 45
+   (2, 5) --> 46
+   (2, 6) --> 47
+   (2, 7) --> 48
 
 Allocating: Ram Data Bus MatchSearch1 7 left_and_right is 128 bits in stage 2 for gateway
 Allocating: Gateway 15 in stage 2 for _condition_2.
@@ -2121,7 +2121,7 @@
 match_groups_attached_to_gateway = OrderedDict([(0, (None, [], None, [], [])), (1, (None, [], None, [], []))])
 Search bus 0 on row 7
 
- final_parity_group_ids = [(0, []), (1, [])] 
+ final_parity_group_ids = [(0, [0]), (1, [])] 
 
  open_parity_group_ids = [0, 1] 
 ----------------------------
@@ -2264,15 +2264,15 @@
   [42] = None
   [43] = None
  Hash Bit Mapping:
-   (1, 0) --> 40
-   (0, 0) --> 41
-   (0, 1) --> 42
-   (0, 2) --> 43
-   (0, 3) --> 44
-   (0, 4) --> 45
-   (0, 5) --> 46
-   (0, 6) --> 47
-   (0, 7) --> 48
+   (3, 0) --> 40
+   (2, 0) --> 41
+   (2, 1) --> 42
+   (2, 2) --> 43
+   (2, 3) --> 44
+   (2, 4) --> 45
+   (2, 5) --> 46
+   (2, 6) --> 47
+   (2, 7) --> 48
 
 Allocating: Ram Data Bus MatchSearch1 7 left_and_right is 128 bits in stage 2 for gateway
 Allocating: Gateway 15 in stage 2 for _condition_2.
@@ -2294,7 +2294,7 @@
 Gateway 14
 ------- Phase 0 -------------
 Looking at gateway table 14
-match_groups_attached_to_gateway = OrderedDict([(0, (0, [0], 0, [0], [(<p4c_tofino.target.tofino.device.pipeline.mau.match_keys.packed_gateway_key.PackedGatewayKey object at 0x7f573df7c290>, 0)])), (1, (None, [], None, [], []))])
+match_groups_attached_to_gateway = OrderedDict([(0, (0, [0], 0, [0], [(<p4c_tofino.target.tofino.device.pipeline.mau.match_keys.packed_gateway_key.PackedGatewayKey object at 0x7faa32fe2250>, 0)])), (1, (None, [], None, [], []))])
 Search bus 0 on row 7
 ----------------------------
  Trying to place Gateway Resource Request for table egress_port_count_table_always_true_condition needs access to 0 input bits in exact match group 0 (parity groups [0]) and hash group 0 for gateway 14.
@@ -2506,7 +2506,7 @@
 match_groups_attached_to_gateway = OrderedDict([(0, (None, [], None, [], [])), (1, (None, [], None, [], []))])
 Search bus 0 on row 7
 
- final_parity_group_ids = [(0, []), (1, [])] 
+ final_parity_group_ids = [(0, [0]), (1, [])] 
 
  open_parity_group_ids = [0, 1] 
 ----------------------------
@@ -2649,15 +2649,15 @@
   [42] = None
   [43] = None
  Hash Bit Mapping:
-   (1, 0) --> 40
-   (0, 0) --> 41
-   (0, 1) --> 42
-   (0, 2) --> 43
-   (0, 3) --> 44
-   (0, 4) --> 45
-   (0, 5) --> 46
-   (0, 6) --> 47
-   (0, 7) --> 48
+   (3, 0) --> 40
+   (2, 0) --> 41
+   (2, 1) --> 42
+   (2, 2) --> 43
+   (2, 3) --> 44
+   (2, 4) --> 45
+   (2, 5) --> 46
+   (2, 6) --> 47
+   (2, 7) --> 48
 
 Allocating: Ram Data Bus MatchSearch1 7 left_and_right is 128 bits in stage 2 for gateway
 Allocating: Gateway 15 in stage 2 for _condition_2.
@@ -2679,7 +2679,7 @@
 Gateway 14
 ------- Phase 0 -------------
 Looking at gateway table 14
-match_groups_attached_to_gateway = OrderedDict([(0, (0, [0], 0, [0], [(<p4c_tofino.target.tofino.device.pipeline.mau.match_keys.packed_gateway_key.PackedGatewayKey object at 0x7f573a425a10>, 0)])), (1, (None, [], None, [], []))])
+match_groups_attached_to_gateway = OrderedDict([(0, (0, [0], 0, [0], [(<p4c_tofino.target.tofino.device.pipeline.mau.match_keys.packed_gateway_key.PackedGatewayKey object at 0x7faa2f4d0790>, 0)])), (1, (None, [], None, [], []))])
 Search bus 0 on row 7
 ----------------------------
  Trying to place Gateway Resource Request for table egress_port_count_table_always_true_condition needs access to 0 input bits in exact match group 0 (parity groups [0]) and hash group 0 for gateway 14.
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/logs/mau.gw.log b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/logs/mau.gw.log
index 97a672b..84d4242 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/logs/mau.gw.log
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/logs/mau.gw.log
@@ -1,7 +1,7 @@
 +---------------------------------------------------------------------+
 |  Log file: mau.gw.log                                               |
 |  Compiler version: 5.1.0 (fca32d1)                                  |
-|  Created on: Tue Sep 12 11:15:53 2017                               |
+|  Created on: Wed Sep 13 00:59:40 2017                               |
 +---------------------------------------------------------------------+
 
 cond _condition_0: not valid packet_out_hdr
@@ -10,13 +10,13 @@
 cond _condition_0 can be gateway (1+0)x1
 cond !_condition_0 can be gateway (1+0)x1
 _condition_0 is gateway for table0
-cond _condition_2: ig_intr_md_for_tm.ucast_egress_port < 510
-     ig_intr_md_for_tm.ucast_egress_port < 510
-   ! ig_intr_md_for_tm.ucast_egress_port >= 510
+cond _condition_2: ig_intr_md_for_tm.ucast_egress_port < 512
+     ig_intr_md_for_tm.ucast_egress_port < 512
+   ! ig_intr_md_for_tm.ucast_egress_port >= 512
 cond _condition_2 can be gateway (9+0)x1
 cond !_condition_2 can be gateway (9+0)x1
 _condition_2 is gateway for ingress_port_count_table
-fields = OrderedSet([<p4_hlir.hlir.p4_headers.p4_field object at 0x7f573eab9c90>]) and and xor_fields is OrderedSet()
+fields = OrderedSet([<p4_hlir.hlir.p4_headers.p4_field object at 0x7faa33b02c50>]) and and xor_fields is OrderedSet()
 fields = OrderedSet() and and xor_fields is OrderedSet()
 cond _condition_0: not valid packet_out_hdr
      not valid packet_out_hdr
@@ -24,13 +24,13 @@
 cond _condition_0 can be gateway (1+0)x1
 cond !_condition_0 can be gateway (1+0)x1
 _condition_0 is gateway for table0
-cond _condition_2: ig_intr_md_for_tm.ucast_egress_port < 510
-     ig_intr_md_for_tm.ucast_egress_port < 510
-   ! ig_intr_md_for_tm.ucast_egress_port >= 510
+cond _condition_2: ig_intr_md_for_tm.ucast_egress_port < 512
+     ig_intr_md_for_tm.ucast_egress_port < 512
+   ! ig_intr_md_for_tm.ucast_egress_port >= 512
 cond _condition_2 can be gateway (9+0)x1
 cond !_condition_2 can be gateway (9+0)x1
 _condition_2 is gateway for ingress_port_count_table
-fields = OrderedSet([<p4_hlir.hlir.p4_headers.p4_field object at 0x7f573eab9c90>]) and and xor_fields is OrderedSet()
+fields = OrderedSet([<p4_hlir.hlir.p4_headers.p4_field object at 0x7faa33b02c50>]) and and xor_fields is OrderedSet()
 fields = OrderedSet() and and xor_fields is OrderedSet()
 cond _condition_0: not valid packet_out_hdr
      not valid packet_out_hdr
@@ -38,13 +38,13 @@
 cond _condition_0 can be gateway (1+0)x1
 cond !_condition_0 can be gateway (1+0)x1
 _condition_0 is gateway for table0
-cond _condition_2: ig_intr_md_for_tm.ucast_egress_port < 510
-     ig_intr_md_for_tm.ucast_egress_port < 510
-   ! ig_intr_md_for_tm.ucast_egress_port >= 510
+cond _condition_2: ig_intr_md_for_tm.ucast_egress_port < 512
+     ig_intr_md_for_tm.ucast_egress_port < 512
+   ! ig_intr_md_for_tm.ucast_egress_port >= 512
 cond _condition_2 can be gateway (9+0)x1
 cond !_condition_2 can be gateway (9+0)x1
 _condition_2 is gateway for ingress_port_count_table
-fields = OrderedSet([<p4_hlir.hlir.p4_headers.p4_field object at 0x7f573eab9c90>]) and and xor_fields is OrderedSet()
+fields = OrderedSet([<p4_hlir.hlir.p4_headers.p4_field object at 0x7faa33b02c50>]) and and xor_fields is OrderedSet()
 fields = OrderedSet() and and xor_fields is OrderedSet()
 cond _always_true: True == True
      True
@@ -66,12 +66,12 @@
 final.tcam: [(match=0 mask=0 T)], miss=False
 --> Stage Gateway Table for condition _condition_2 in stage 2
 T -> ingress_port_count_table(32),  F -> None(255)
-building tcam for GatewayTest('ig_intr_md_for_tm.ucast_egress_port < 510')
-  adding line (range=[ffff ffff 3fff] match=0 mask=0 T)
-  adding line (range=[ffff 7fff ffff] match=0 mask=0 T)
-  adding line (range=[1 ffff ffff] match=0 mask=0 T)
-tcam data: [(range=[ffff ffff 3fff] match=0 mask=0 T), (range=[ffff 7fff ffff] match=0 mask=0 T), (range=[1 ffff ffff] match=0 mask=0 T)]
-final.tcam: [(range=[ffff ffff 3fff] match=0 mask=0 T), (range=[ffff 7fff ffff] match=0 mask=0 T), (range=[1 ffff ffff] match=0 mask=0 T)], miss=False
+building tcam for GatewayTest('ig_intr_md_for_tm.ucast_egress_port < 512')
+  adding line (range=[ffff ffff 0] match=0 mask=0 T)
+  adding line (range=[ffff 0 ffff] match=0 mask=0 T)
+  adding line (range=[3 ffff ffff] match=0 mask=0 T)
+tcam data: [(range=[ffff ffff 0] match=0 mask=0 T), (range=[ffff 0 ffff] match=0 mask=0 T), (range=[3 ffff ffff] match=0 mask=0 T)]
+final.tcam: [(range=[ffff ffff 0] match=0 mask=0 T), (range=[ffff 0 ffff] match=0 mask=0 T), (range=[3 ffff ffff] match=0 mask=0 T)], miss=False
 --> Stage Gateway Table for condition egress_port_count_table_always_true_condition in stage 2
 T -> egress_port_count_table(33),  F -> egress_port_count_table(33)
 building tcam for GatewayTest('True')
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/logs/mau.log b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/logs/mau.log
index d04ab40..bf2704f 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/logs/mau.log
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/logs/mau.log
@@ -1,7 +1,7 @@
 +---------------------------------------------------------------------+
 |  Log file: mau.log                                                  |
 |  Compiler version: 5.1.0 (fca32d1)                                  |
-|  Created on: Tue Sep 12 11:15:53 2017                               |
+|  Created on: Wed Sep 13 00:59:40 2017                               |
 +---------------------------------------------------------------------+
 
 Match Table table0 did not specify the number of entries required. A default value (512) will be used.
@@ -21,129 +21,7 @@
 Match Entry Table table0 has already been associated with stat Table table0_counter.
 Match Entry Table ecmp_group_table has already been associated with stat Table ecmp_group_table_counter.
 Match table ingress_port_count_table has no match key fields
-Cannot use hash-action for table ingress_port_count_table with no key because the number of entries required by side-effect table ingress_port_counter is not a power of 2 -- 510.
-
-##########################################
-  Call to decide_action_data_placement(stage=0, table=ingress_port_count_table)
-##########################################
-
-
-Max immediate bits used in any action is 0 bits.
-Overhead bit width for table ingress_port_count_table is 22 bits.
-Bits available in overhead for non-essential immediate data is 32 bits.
-~~~~~~~~~~~~~~~~~~~~~
- Examining placing 0 bits in match overhead
-Overhead bit width for table ingress_port_count_table is 22 bits.
-Overhead SRAMs to use = 97
-  Entries requested = 1024  and match entries get = 0
-ram_size_matrix = 
- (8, 8, False)  (8, 8, True)  (8, 32, False)  (16, 16, False)  (16, 16, True)  (16, 32, False)  (32, 32, False)  (32, 32, True) 
-       0              0              0               0                0               0                0                0        # 0
-
-immediate_size_matrix = 
- (8, 8, False)  (8, 8, True)  (8, 32, False)  (16, 16, False)  (16, 16, True)  (16, 32, False)  (32, 32, False)  (32, 32, True) 
-       0              0              0               0                0               0                0                0        # 0
-
-hash_to_phv_matrix = 
- (8, 8, False)  (8, 8, True)  (8, 32, False)  (16, 16, False)  (16, 16, True)  (16, 32, False)  (32, 32, False)  (32, 32, True) 
-       0              0              0               0                0               0                0                0        # 0
-
-total action ram packing size = [0, 0, 0]
-action_ram_packing:
-  action count_ingress has []
-total action ram packing size = [0, 0, 0]
-action_ram_packing:
-  action count_ingress has []
-total action ram packing size = [0, 0, 0]
-action_ram_packing:
-  action count_ingress has []
-byte_enables = []
-After allocation of 32s, available_slots is []
-final packing is []
-byte_enables = []
-After allocation of 32s, available_slots is []
-final packing is []
-byte_enables = []
-After allocation of 32s, available_slots is []
-final packing is []
-Action Data SRAMs to use = 0
-TODO: Total RAMs use when put 0 bits in match overhead: 97
-TODO: Total RAMs use when put 0 bits in match overhead: 97
-~~~~~~~~~~~~~~~~~~~~~
- Examining placing 8 bits in match overhead
-~~~~~~~~~~~~~~~~~~~~~
- Examining placing 16 bits in match overhead
-~~~~~~~~~~~~~~~~~~~~~
- Examining placing 24 bits in match overhead
-~~~~~~~~~~~~~~~~~~~~~
- Examining placing 32 bits in match overhead
-
-##########################################
-
-Best Ram Usage is 97 rams
-Best Immediate placement is 0 bits
 Match table egress_port_count_table has no match key fields
-Cannot use hash-action for table egress_port_count_table with no key because the number of entries required by side-effect table egress_port_counter is not a power of 2 -- 510.
-
-##########################################
-  Call to decide_action_data_placement(stage=0, table=egress_port_count_table)
-##########################################
-
-
-Max immediate bits used in any action is 0 bits.
-Overhead bit width for table egress_port_count_table is 20 bits.
-Bits available in overhead for non-essential immediate data is 32 bits.
-~~~~~~~~~~~~~~~~~~~~~
- Examining placing 0 bits in match overhead
-Overhead bit width for table egress_port_count_table is 20 bits.
-Overhead SRAMs to use = 97
-  Entries requested = 1024  and match entries get = 0
-ram_size_matrix = 
- (8, 8, False)  (8, 8, True)  (8, 32, False)  (16, 16, False)  (16, 16, True)  (16, 32, False)  (32, 32, False)  (32, 32, True) 
-       0              0              0               0                0               0                0                0        # 0
-
-immediate_size_matrix = 
- (8, 8, False)  (8, 8, True)  (8, 32, False)  (16, 16, False)  (16, 16, True)  (16, 32, False)  (32, 32, False)  (32, 32, True) 
-       0              0              0               0                0               0                0                0        # 0
-
-hash_to_phv_matrix = 
- (8, 8, False)  (8, 8, True)  (8, 32, False)  (16, 16, False)  (16, 16, True)  (16, 32, False)  (32, 32, False)  (32, 32, True) 
-       0              0              0               0                0               0                0                0        # 0
-
-total action ram packing size = [0, 0, 0]
-action_ram_packing:
-  action count_egress has []
-total action ram packing size = [0, 0, 0]
-action_ram_packing:
-  action count_egress has []
-total action ram packing size = [0, 0, 0]
-action_ram_packing:
-  action count_egress has []
-byte_enables = []
-After allocation of 32s, available_slots is []
-final packing is []
-byte_enables = []
-After allocation of 32s, available_slots is []
-final packing is []
-byte_enables = []
-After allocation of 32s, available_slots is []
-final packing is []
-Action Data SRAMs to use = 0
-TODO: Total RAMs use when put 0 bits in match overhead: 97
-TODO: Total RAMs use when put 0 bits in match overhead: 97
-~~~~~~~~~~~~~~~~~~~~~
- Examining placing 8 bits in match overhead
-~~~~~~~~~~~~~~~~~~~~~
- Examining placing 16 bits in match overhead
-~~~~~~~~~~~~~~~~~~~~~
- Examining placing 24 bits in match overhead
-~~~~~~~~~~~~~~~~~~~~~
- Examining placing 32 bits in match overhead
-
-##########################################
-
-Best Ram Usage is 97 rams
-Best Immediate placement is 0 bits
 
 ##########################################
   Call to decide_action_data_placement(stage=0, table=process_packet_out_table)
@@ -515,8 +393,8 @@
 final packing is [(16, 0, False)]
 ----------------------------------------------
  Call to allocate_hash_distribution_units with
-    hash_algorithm = crc32
-    hash_output_width = 32
+    hash_algorithm = crc16
+    hash_output_width = 16
     hash_bits_need = 1
     output_hash_bit_start = 0
     immediate_bit_positions = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]
@@ -525,17 +403,17 @@
 available_tuples_sorted_by_parity_bytes_available = [(0, 3, 0), (1, 3, 0)]
 available_tuples_split_sorted_by_parity_bytes_available = []
 Allocate fresh exact match group / hash group
-Allocating: Byte 0 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {udp.dstPort[7:0]}.
-Allocating: Byte 1 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {udp.dstPort[15:8]}.
-Allocating: Byte 2 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {udp.srcPort[7:0]}.
-Allocating: Byte 3 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {udp.srcPort[15:8]}.
-Allocating: Byte 4 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ipv4.dstAddr[7:0]}.
-Allocating: Byte 5 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ipv4.dstAddr[15:8]}.
-Allocating: Byte 6 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ipv4.dstAddr[23:16]}.
+Allocating: Byte 0 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ipv4.dstAddr[7:0]}.
+Allocating: Byte 1 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ipv4.dstAddr[15:8]}.
+Allocating: Byte 2 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ipv4.dstAddr[23:16]}.
+Allocating: Byte 3 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {tcp.dstPort[7:0]}.
+Allocating: Byte 4 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ipv4.srcAddr[31:24]}.
+Allocating: Byte 5 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {tcp.srcPort[7:0]}.
+Allocating: Byte 6 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {tcp.dstPort[15:8]}.
 Allocating: Byte 7 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ipv4.dstAddr[31:24]}.
-Allocating: Byte 8 is of type exact and member of group 0 (parity group 1) with 16 bytes. for {ipv4.srcAddr[31:24]}.
+Allocating: Byte 8 is of type exact and member of group 0 (parity group 1) with 16 bytes. for {ipv4.srcAddr[7:0]}.
 Allocating: Byte 9 is of type exact and member of group 0 (parity group 1) with 16 bytes. for {ipv4.srcAddr[15:8]}.
-Allocating: Byte 10 is of type exact and member of group 0 (parity group 1) with 16 bytes. for {ipv4.srcAddr[7:0]}.
+Allocating: Byte 10 is of type exact and member of group 0 (parity group 1) with 16 bytes. for {tcp.srcPort[15:8]}.
 Allocating: Byte 11 is of type exact and member of group 0 (parity group 1) with 16 bytes. for {ipv4.srcAddr[23:16]}.
 -------------------
 Call to _allocate_hash_distribution_and_hash_bits
@@ -548,10 +426,12 @@
 -------------------
 Allocating Hash Distribution Group 0/0 for table table0__action__ in stage 0.
 Allocating Hash Bit 0 in hash match group 0 for table table0__action__ in stage 0.
-seed = 0x7bd5c66f
-set the seed to be [1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
+total_hash_result_bits = 16
+polynomial_as_hex_int = 0x18005
+seed = 0x0
+set the seed to be [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
 Hash Function 0
-hash_bit_0 = udp.dstPort[2] ^ udp.dstPort[8] ^ udp.dstPort[12] ^ udp.dstPort[14] ^ udp.dstPort[15] ^ udp.srcPort[0] ^ udp.srcPort[8] ^ udp.srcPort[9] ^ udp.srcPort[10] ^ udp.srcPort[11] ^ udp.srcPort[12] ^ udp.srcPort[14] ^ udp.srcPort[15] ^ ipv4.dstAddr[3] ^ ipv4.dstAddr[6] ^ ipv4.dstAddr[8] ^ ipv4.dstAddr[9] ^ ipv4.dstAddr[11] ^ ipv4.dstAddr[12] ^ ipv4.dstAddr[17] ^ ipv4.dstAddr[18] ^ ipv4.dstAddr[19] ^ ipv4.dstAddr[22] ^ ipv4.dstAddr[25] ^ ipv4.dstAddr[27] ^ ipv4.dstAddr[28] ^ ipv4.dstAddr[30] ^ ipv4.srcAddr[24] ^ ipv4.srcAddr[25] ^ ipv4.srcAddr[26] ^ ipv4.srcAddr[9] ^ ipv4.srcAddr[15] ^ ipv4.srcAddr[0] ^ ipv4.srcAddr[4] ^ ipv4.srcAddr[5] ^ ipv4.srcAddr[6] ^ ipv4.srcAddr[7] ^ ipv4.srcAddr[17] ^ ipv4.srcAddr[19] ^ ipv4.srcAddr[20] ^ ipv4.srcAddr[21] ^ ipv4.srcAddr[22] ^ ipv4.srcAddr[23] ^ 1
+hash_bit_0 = ipv4.dstAddr[0] ^ ipv4.dstAddr[1] ^ ipv4.dstAddr[2] ^ ipv4.dstAddr[3] ^ ipv4.dstAddr[4] ^ ipv4.dstAddr[5] ^ ipv4.dstAddr[6] ^ ipv4.dstAddr[7] ^ ipv4.dstAddr[8] ^ ipv4.dstAddr[9] ^ ipv4.dstAddr[10] ^ ipv4.dstAddr[11] ^ ipv4.dstAddr[13] ^ ipv4.dstAddr[15] ^ ipv4.dstAddr[17] ^ ipv4.dstAddr[18] ^ ipv4.dstAddr[19] ^ ipv4.dstAddr[20] ^ ipv4.dstAddr[21] ^ ipv4.dstAddr[22] ^ ipv4.dstAddr[23] ^ tcp.dstPort[0] ^ tcp.dstPort[1] ^ tcp.dstPort[2] ^ tcp.dstPort[3] ^ tcp.dstPort[4] ^ tcp.dstPort[5] ^ tcp.dstPort[6] ^ tcp.dstPort[7] ^ ipv4.srcAddr[24] ^ ipv4.srcAddr[25] ^ ipv4.srcAddr[26] ^ ipv4.srcAddr[27] ^ ipv4.srcAddr[28] ^ ipv4.srcAddr[29] ^ ipv4.srcAddr[30] ^ tcp.srcPort[0] ^ tcp.srcPort[1] ^ tcp.srcPort[2] ^ tcp.srcPort[3] ^ tcp.srcPort[4] ^ tcp.srcPort[5] ^ tcp.srcPort[6] ^ tcp.srcPort[7] ^ tcp.dstPort[8] ^ tcp.dstPort[9] ^ tcp.dstPort[11] ^ tcp.dstPort[12] ^ tcp.dstPort[13] ^ tcp.dstPort[14] ^ tcp.dstPort[15] ^ ipv4.dstAddr[24] ^ ipv4.dstAddr[25] ^ ipv4.dstAddr[26] ^ ipv4.dstAddr[27] ^ ipv4.dstAddr[28] ^ ipv4.srcAddr[0] ^ ipv4.srcAddr[1] ^ ipv4.srcAddr[3] ^ ipv4.srcAddr[4] ^ ipv4.srcAddr[5] ^ ipv4.srcAddr[6] ^ ipv4.srcAddr[7] ^ ipv4.srcAddr[8] ^ ipv4.srcAddr[9] ^ ipv4.srcAddr[10] ^ ipv4.srcAddr[11] ^ ipv4.srcAddr[12] ^ ipv4.srcAddr[13] ^ ipv4.srcAddr[15] ^ tcp.srcPort[8] ^ tcp.srcPort[9] ^ tcp.srcPort[10] ^ tcp.srcPort[13] ^ tcp.srcPort[14] ^ tcp.srcPort[15] ^ ipv4.srcAddr[17] ^ ipv4.srcAddr[18] ^ ipv4.srcAddr[21] ^ ipv4.srcAddr[22] ^ ipv4.srcAddr[23] ^ 0
 hash_bit_1 = 0
 hash_bit_2 = 0
 hash_bit_3 = 0
@@ -710,23 +590,23 @@
 Allocating Action ALU 2 (16 bits) in stage 0 for match table table0's action set_egress_port
 Allocating VLIW Instruction : 0 in stage 0 for match table table0's action set_egress_port
 For action ecmp_group, formed micro_instruction:
-Micro Instruction alu_a for PHV Container 134 has bit width 23
-  Field Src2 [3:0]     : 0x6   (4 bits in instruction bits [3:0])
+Micro Instruction alu_a for PHV Container 135 has bit width 23
+  Field Src2 [3:0]     : 0x7   (4 bits in instruction bits [3:0])
   Field Src1 [4:0]     : 0x0   (5 bits in instruction bits [8:4])
   Field Src1i [0:0]    : 0x1   (1 bits in instruction bits [9:9])
   Field opcode [9:0]   : 0x31e   (10 bits in instruction bits [19:10])
   Field unused [2:0]   : 0x0   (3 bits in instruction bits [22:20])
 
 For action ecmp_group, formed micro_instruction:
-Micro Instruction alu_a for PHV Container 135 has bit width 23
-  Field Src2 [3:0]     : 0x7   (4 bits in instruction bits [3:0])
+Micro Instruction alu_a for PHV Container 136 has bit width 23
+  Field Src2 [3:0]     : 0x8   (4 bits in instruction bits [3:0])
   Field Src1 [4:0]     : 0x2   (5 bits in instruction bits [8:4])
   Field Src1i [0:0]    : 0x1   (1 bits in instruction bits [9:9])
   Field opcode [9:0]   : 0x31e   (10 bits in instruction bits [19:10])
   Field unused [2:0]   : 0x0   (3 bits in instruction bits [22:20])
 
-Allocating Action ALU 6 (16 bits) in stage 0 for match table table0's action ecmp_group
 Allocating Action ALU 7 (16 bits) in stage 0 for match table table0's action ecmp_group
+Allocating Action ALU 8 (16 bits) in stage 0 for match table table0's action ecmp_group
 Allocating VLIW Instruction : 1 in stage 0 for match table table0's action ecmp_group
 For action send_to_cpu, formed micro_instruction:
 Micro Instruction deposit-field for PHV Container 130 has bit width 23
@@ -740,8 +620,8 @@
   Field low_bit_hi [2:0]     : 0x0   (3 bits in instruction bits [22:20])
 
 For action send_to_cpu, formed micro_instruction:
-Micro Instruction deposit-field for PHV Container 67 has bit width 20
-  Field Src2 [3:0]           : 0x3   (4 bits in instruction bits [3:0])
+Micro Instruction deposit-field for PHV Container 68 has bit width 20
+  Field Src2 [3:0]           : 0x4   (4 bits in instruction bits [3:0])
   Field Src1 [4:0]           : 0x19   (5 bits in instruction bits [8:4])
   Field Src1i [0:0]          : 0x0   (1 bits in instruction bits [9:9])
   Field opcode [0:0]         : 0x1   (1 bits in instruction bits [10:10])
@@ -762,12 +642,12 @@
   Field low_bit_hi [2:0]     : 0x3   (3 bits in instruction bits [22:20])
 
 Allocating Action ALU 2 (16 bits) in stage 0 for match table table0's action send_to_cpu
-Allocating Action ALU 3 (8 bits) in stage 0 for match table table0's action send_to_cpu
+Allocating Action ALU 4 (8 bits) in stage 0 for match table table0's action send_to_cpu
 Allocating Action ALU 1 (16 bits) in stage 0 for match table table0's action send_to_cpu
 Allocating VLIW Instruction : 1 in stage 0 for match table table0's action send_to_cpu
 For action _drop, formed micro_instruction:
-Micro Instruction deposit-field for PHV Container 68 has bit width 20
-  Field Src2 [3:0]           : 0x4   (4 bits in instruction bits [3:0])
+Micro Instruction deposit-field for PHV Container 69 has bit width 20
+  Field Src2 [3:0]           : 0x5   (4 bits in instruction bits [3:0])
   Field Src1 [4:0]           : 0x19   (5 bits in instruction bits [8:4])
   Field Src1i [0:0]          : 0x0   (1 bits in instruction bits [9:9])
   Field opcode [0:0]         : 0x1   (1 bits in instruction bits [10:10])
@@ -776,7 +656,7 @@
   Field right_rotate [2:0]   : 0x3   (3 bits in instruction bits [18:16])
   Field low_bit_hi [0:0]     : 0x1   (1 bits in instruction bits [19:19])
 
-Allocating Action ALU 4 (8 bits) in stage 0 for match table table0's action _drop
+Allocating Action ALU 5 (8 bits) in stage 0 for match table table0's action _drop
 Allocating VLIW Instruction : 2 in stage 0 for match table table0's action _drop
 Ternary table Pack Format = 
 Pack Format:
@@ -880,8 +760,8 @@
   Field low_bit_hi [2:0]     : 0x0   (3 bits in instruction bits [22:20])
 
 For action _process_packet_out, formed micro_instruction:
-Micro Instruction deposit-field for PHV Container 67 has bit width 20
-  Field Src2 [3:0]           : 0x3   (4 bits in instruction bits [3:0])
+Micro Instruction deposit-field for PHV Container 68 has bit width 20
+  Field Src2 [3:0]           : 0x4   (4 bits in instruction bits [3:0])
   Field Src1 [4:0]           : 0x18   (5 bits in instruction bits [8:4])
   Field Src1i [0:0]          : 0x0   (1 bits in instruction bits [9:9])
   Field opcode [0:0]         : 0x1   (1 bits in instruction bits [10:10])
@@ -891,7 +771,7 @@
   Field low_bit_hi [0:0]     : 0x0   (1 bits in instruction bits [19:19])
 
 Allocating Action ALU 2 (16 bits) in stage 0 for match table process_packet_out_table's action _process_packet_out
-Allocating Action ALU 3 (8 bits) in stage 0 for match table process_packet_out_table's action _process_packet_out
+Allocating Action ALU 4 (8 bits) in stage 0 for match table process_packet_out_table's action _process_packet_out
 Allocating VLIW Instruction : 2 in stage 0 for match table process_packet_out_table's action _process_packet_out
 
 ----------------------------------------------
@@ -1143,7 +1023,7 @@
 Allocating Action Logical Table ID 0 in stage 2
 
 ----------------------------------------------
-Call to Allocate P4 Table with table ingress_port_counter, number_entries = 510, table id = None, and match type = exact
+Call to Allocate P4 Table with table ingress_port_counter, number_entries = 512, table id = None, and match type = exact
   Allocating in stage 2
 ----------------------------------------------
 
@@ -1172,23 +1052,185 @@
 Logical Table ID in stage 2 was not supplied by table placement for table ingress_port_count_table.
 Allocating Logical Table ID 0 in stage 2
 Allocating Table Type ID 0 of type exact in stage 2
-Match Overhead:
-  Field --version_valid-- [3:0] (4 bits)
-  Field --instruction_address-- [1:0] (2 bits)
-  Field --statistics_pointer-- [19:0] (20 bits)
+Too few bits (9) specified to address ingress_port_counter from table ingress_port_count_table.  10 are needed.
+The most significant 1 bit will be padded with zeros.
+----------------------------------------------
+ Call to allocate_hash_distribution_units with
+    hash_algorithm = identity
+    hash_output_width = 10
+    hash_bits_need = 10
+    output_hash_bit_start = 0
+    immediate_bit_positions = None
+    used_for = Statistics Address
+----------------------------------------------
+available_tuples_sorted_by_parity_bytes_available = [(0, 3, 0), (1, 3, 0)]
+available_tuples_split_sorted_by_parity_bytes_available = []
+Allocate fresh exact match group / hash group
+Allocating: Byte 0 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ig_intr_md.ingress_port[7:0]}.
+Allocating: Byte 1 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {unused[6:0], ig_intr_md.ingress_port[8:8]}.
+-------------------
+Call to _allocate_hash_distribution_and_hash_bits
+    p4_table = ingress_port_count_table
+    used_for = Statistics Address
+    hash_distribution_hash_id = 0
+    hash_group_id = 0
+    hash_bits_in_units = OrderedDict([(0, [0, 1, 2, 3, 4, 5, 6, 7, 8, 9])])
+    address_left_shift = 1
+-------------------
+Allocating Hash Distribution Group 0/0 for table ingress_port_count_table in stage 2.
+Allocating Hash Bit 0 in hash match group 0 for table ingress_port_count_table in stage 2.
+Allocating Hash Bit 1 in hash match group 0 for table ingress_port_count_table in stage 2.
+Allocating Hash Bit 2 in hash match group 0 for table ingress_port_count_table in stage 2.
+Allocating Hash Bit 3 in hash match group 0 for table ingress_port_count_table in stage 2.
+Allocating Hash Bit 4 in hash match group 0 for table ingress_port_count_table in stage 2.
+Allocating Hash Bit 5 in hash match group 0 for table ingress_port_count_table in stage 2.
+Allocating Hash Bit 6 in hash match group 0 for table ingress_port_count_table in stage 2.
+Allocating Hash Bit 7 in hash match group 0 for table ingress_port_count_table in stage 2.
+Allocating Hash Bit 8 in hash match group 0 for table ingress_port_count_table in stage 2.
+Allocating Hash Bit 9 in hash match group 0 for table ingress_port_count_table in stage 2.
+seed = 0x0
+set the seed to be [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
+Hash Function 0
+hash_bit_0 = ig_intr_md.ingress_port[0] ^ 0
+hash_bit_1 = ig_intr_md.ingress_port[1] ^ 0
+hash_bit_2 = ig_intr_md.ingress_port[2] ^ 0
+hash_bit_3 = ig_intr_md.ingress_port[3] ^ 0
+hash_bit_4 = ig_intr_md.ingress_port[4] ^ 0
+hash_bit_5 = ig_intr_md.ingress_port[5] ^ 0
+hash_bit_6 = ig_intr_md.ingress_port[6] ^ 0
+hash_bit_7 = ig_intr_md.ingress_port[7] ^ 0
+hash_bit_8 = ig_intr_md.ingress_port[8] ^ 0
+hash_bit_9 = 0
+hash_bit_10 = 0
+hash_bit_11 = 0
+hash_bit_12 = 0
+hash_bit_13 = 0
+hash_bit_14 = 0
+hash_bit_15 = 0
+hash_bit_16 = 0
+hash_bit_17 = 0
+hash_bit_18 = 0
+hash_bit_19 = 0
+hash_bit_20 = 0
+hash_bit_21 = 0
+hash_bit_22 = 0
+hash_bit_23 = 0
+hash_bit_24 = 0
+hash_bit_25 = 0
+hash_bit_26 = 0
+hash_bit_27 = 0
+hash_bit_28 = 0
+hash_bit_29 = 0
+hash_bit_30 = 0
+hash_bit_31 = 0
+hash_bit_32 = 0
+hash_bit_33 = 0
+hash_bit_34 = 0
+hash_bit_35 = 0
+hash_bit_36 = 0
+hash_bit_37 = 0
+hash_bit_38 = 0
+hash_bit_39 = 0
+hash_bit_40 = 0
+hash_bit_41 = 0
+hash_bit_42 = 0
+hash_bit_43 = 0
+hash_bit_44 = 0
+hash_bit_45 = 0
+hash_bit_46 = 0
+hash_bit_47 = 0
+hash_bit_48 = 0
+hash_bit_49 = 0
+hash_bit_50 = 0
+hash_bit_51 = 0
 
-Logical Table ID in stage 2 was not supplied by table placement for table ingress_port_count_table.
-Allocating Logical Table ID 0 in stage 2
-Allocating Table Type ID 0 of type exact in stage 2
-Allocating: Byte 0 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ig_intr_md_for_tm.ucast_egress_port[7:0]}.
-Allocating: Byte 1 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {unused[6:0], ig_intr_md_for_tm.ucast_egress_port[8:8]}.
+Allocating: Byte 2 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ig_intr_md_for_tm.ucast_egress_port[7:0]}.
+Allocating: Byte 3 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {unused[6:0], ig_intr_md_for_tm.ucast_egress_port[8:8]}.
 Match Table Resource Request is:
 SRAM Resource Request for table ingress_port_count_table (of type match), with 0 ways wants 0 rams.
-Allocating: Byte 0 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ig_intr_md_for_tm.ucast_egress_port[7:0]}.
-Allocating: Byte 1 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {unused[6:0], ig_intr_md_for_tm.ucast_egress_port[8:8]}.
+Allocating: Byte 2 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ig_intr_md_for_tm.ucast_egress_port[7:0]}.
+Allocating: Byte 3 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {unused[6:0], ig_intr_md_for_tm.ucast_egress_port[8:8]}.
 No micro instructions needed for action count_ingress executed from table ingress_port_count_table.
 Allocating Action ALU 0 (32 bits) in stage 2 for match table ingress_port_count_table's action count_ingress
 Allocating VLIW Instruction : 0 in stage 2 for match table ingress_port_count_table's action count_ingress
+My hash-action stage table is 
+StageHashActionTable
+  stage_number: 2
+  number_entries 1024
+  pack_format:
+    Pack Format:
+  table_word_width: 0
+  memory_word_width: 0
+  entries_per_table_word: 0
+  number_memory_units_per_table_word: 0
+  entry_list: [
+]
+
+  p4_table: 'ingress_port_count_table'
+  stage_table_handle: 0
+  stage_table_type_handle: 0
+  stage_gateway_table: StageGatewayTable
+  stage_number: 2
+  number_entries 0
+  memory_resource_allocation GatewayMemoryResourceAllocation:
+  memory_type: gateway
+  memory_units: [[15]]
+  home_row: -1
+  stateful_action_bus_output: None
+
+  p4_table: '_condition_2'
+
+  match_group_resource_allocation:
+  vliw_resource_allocation:
+   action handle 536870914 maps to:
+VliwResourceAllocation:
+  match_table_name: ingress_port_count_table
+  p4_action: count_ingress
+  address_to_use: 1
+  full_address: 64
+  vliw_instruction_number: 0
+  color: 0
+  direction: ingress
+  micro_instructions:
+
+  action_to_vliw_mapping:
+    action handle 536870914 maps to vliw instruction 0, color 0, and direction ingress and is found in instruction address 1
+  hash_distribution_usages:
+    MAU Hash Distribution Resource Usage for P4 table ingress_port_count_table
+  exact_match_group_resource_allocation : HashMatchGroupResourceAllocation:
+  match_groups: [(0, 16)]
+  match_group_key_bit_width: 9
+  match_group_phv_bit_scrambling: OrderedDict([(('ig_intr_md.ingress_port', 0), 0), (('ig_intr_md.ingress_port', 1), 1), (('ig_intr_md.ingress_port', 2), 2), (('ig_intr_md.ingress_port', 3), 3), (('ig_intr_md.ingress_port', 4), 4), (('ig_intr_md.ingress_port', 5), 5), (('ig_intr_md.ingress_port', 6), 6), (('ig_intr_md.ingress_port', 7), 7), (('ig_intr_md.ingress_port', 8), 8)])
+    ('ig_intr_md.ingress_port', 0) -> 0
+    ('ig_intr_md.ingress_port', 1) -> 1
+    ('ig_intr_md.ingress_port', 2) -> 2
+    ('ig_intr_md.ingress_port', 3) -> 3
+    ('ig_intr_md.ingress_port', 4) -> 4
+    ('ig_intr_md.ingress_port', 5) -> 5
+    ('ig_intr_md.ingress_port', 6) -> 6
+    ('ig_intr_md.ingress_port', 7) -> 7
+    ('ig_intr_md.ingress_port', 8) -> 8
+  hash_function_dictionary: OrderedDict([(0, <p4c_tofino.target.tofino.llir.mau.stage.resources.hash_function.HashFunction object at 0x7faa2f4d0750>)])
+  hash_group_id: 0
+  seed: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
+  table_direction: ingress
+
+  hash_distribution_resource_allocations :
+Hash Distribution:
+  source_hash_group : 0
+  hash_distribution_hash_id : 0
+  hash_distribution_group_id : 0
+  hash_distribution_used_for : Statistics Address
+  table_direction : ingress
+  bits_to_use : [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+  left_shift : 1
+  expanded_lo : False
+  expanded_hi : False
+  expanded_bit_width : 0
+  immediate_position : unused
+
+
+
 
 ----------------------------------------------
 Call to Allocate P4 Table with table egress_port_count_table__action__, number_entries = 1024, table id = None, and match type = exact
@@ -1228,7 +1270,7 @@
 Allocating Action Logical Table ID 1 in stage 2
 
 ----------------------------------------------
-Call to Allocate P4 Table with table egress_port_counter, number_entries = 510, table id = None, and match type = exact
+Call to Allocate P4 Table with table egress_port_counter, number_entries = 512, table id = None, and match type = exact
   Allocating in stage 2
 ----------------------------------------------
 
@@ -1248,8 +1290,8 @@
       ram_word_select_bits : 0
       ram_enable_select_bits : 0
 
-Allocating: Byte 0 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ig_intr_md_for_tm.ucast_egress_port[7:0]}.
-Allocating: Byte 1 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {unused[6:0], ig_intr_md_for_tm.ucast_egress_port[8:8]}.
+Allocating: Byte 2 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ig_intr_md_for_tm.ucast_egress_port[7:0]}.
+Allocating: Byte 3 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {unused[6:0], ig_intr_md_for_tm.ucast_egress_port[8:8]}.
 
 ----------------------------------------------
 Call to Allocate P4 Table with table egress_port_count_table, number_entries = 1024, table id = None, and match type = exact
@@ -1259,22 +1301,185 @@
 Logical Table ID in stage 2 was not supplied by table placement for table egress_port_count_table.
 Allocating Logical Table ID 1 in stage 2
 Allocating Table Type ID 1 of type exact in stage 2
-Match Overhead:
-  Field --version_valid-- [3:0] (4 bits)
-  Field --statistics_pointer-- [19:0] (20 bits)
+Too few bits (9) specified to address egress_port_counter from table egress_port_count_table.  10 are needed.
+The most significant 1 bit will be padded with zeros.
+----------------------------------------------
+ Call to allocate_hash_distribution_units with
+    hash_algorithm = identity
+    hash_output_width = 10
+    hash_bits_need = 10
+    output_hash_bit_start = 0
+    immediate_bit_positions = None
+    used_for = Statistics Address
+----------------------------------------------
+available_tuples_sorted_by_parity_bytes_available = [(1, 3, 0), (0, 2, 4)]
+available_tuples_split_sorted_by_parity_bytes_available = []
+Allocate fresh exact match group / hash group
+Allocating: Byte 8 is of type exact and member of group 0 (parity group 1) with 16 bytes. for {ig_intr_md_for_tm.ucast_egress_port[7:0]}.
+Allocating: Byte 9 is of type exact and member of group 0 (parity group 1) with 16 bytes. for {unused[6:0], ig_intr_md_for_tm.ucast_egress_port[8:8]}.
+-------------------
+Call to _allocate_hash_distribution_and_hash_bits
+    p4_table = egress_port_count_table
+    used_for = Statistics Address
+    hash_distribution_hash_id = 1
+    hash_group_id = 1
+    hash_bits_in_units = OrderedDict([(0, [0, 1, 2, 3, 4, 5, 6, 7, 8, 9])])
+    address_left_shift = 1
+-------------------
+Allocating Hash Distribution Group 1/0 for table egress_port_count_table in stage 2.
+Allocating Hash Bit 0 in hash match group 1 for table egress_port_count_table in stage 2.
+Allocating Hash Bit 1 in hash match group 1 for table egress_port_count_table in stage 2.
+Allocating Hash Bit 2 in hash match group 1 for table egress_port_count_table in stage 2.
+Allocating Hash Bit 3 in hash match group 1 for table egress_port_count_table in stage 2.
+Allocating Hash Bit 4 in hash match group 1 for table egress_port_count_table in stage 2.
+Allocating Hash Bit 5 in hash match group 1 for table egress_port_count_table in stage 2.
+Allocating Hash Bit 6 in hash match group 1 for table egress_port_count_table in stage 2.
+Allocating Hash Bit 7 in hash match group 1 for table egress_port_count_table in stage 2.
+Allocating Hash Bit 8 in hash match group 1 for table egress_port_count_table in stage 2.
+Allocating Hash Bit 9 in hash match group 1 for table egress_port_count_table in stage 2.
+seed = 0x0
+set the seed to be [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
+Hash Function 0
+hash_bit_0 = ig_intr_md_for_tm.ucast_egress_port[0] ^ 0
+hash_bit_1 = ig_intr_md_for_tm.ucast_egress_port[1] ^ 0
+hash_bit_2 = ig_intr_md_for_tm.ucast_egress_port[2] ^ 0
+hash_bit_3 = ig_intr_md_for_tm.ucast_egress_port[3] ^ 0
+hash_bit_4 = ig_intr_md_for_tm.ucast_egress_port[4] ^ 0
+hash_bit_5 = ig_intr_md_for_tm.ucast_egress_port[5] ^ 0
+hash_bit_6 = ig_intr_md_for_tm.ucast_egress_port[6] ^ 0
+hash_bit_7 = ig_intr_md_for_tm.ucast_egress_port[7] ^ 0
+hash_bit_8 = ig_intr_md_for_tm.ucast_egress_port[8] ^ 0
+hash_bit_9 = 0
+hash_bit_10 = 0
+hash_bit_11 = 0
+hash_bit_12 = 0
+hash_bit_13 = 0
+hash_bit_14 = 0
+hash_bit_15 = 0
+hash_bit_16 = 0
+hash_bit_17 = 0
+hash_bit_18 = 0
+hash_bit_19 = 0
+hash_bit_20 = 0
+hash_bit_21 = 0
+hash_bit_22 = 0
+hash_bit_23 = 0
+hash_bit_24 = 0
+hash_bit_25 = 0
+hash_bit_26 = 0
+hash_bit_27 = 0
+hash_bit_28 = 0
+hash_bit_29 = 0
+hash_bit_30 = 0
+hash_bit_31 = 0
+hash_bit_32 = 0
+hash_bit_33 = 0
+hash_bit_34 = 0
+hash_bit_35 = 0
+hash_bit_36 = 0
+hash_bit_37 = 0
+hash_bit_38 = 0
+hash_bit_39 = 0
+hash_bit_40 = 0
+hash_bit_41 = 0
+hash_bit_42 = 0
+hash_bit_43 = 0
+hash_bit_44 = 0
+hash_bit_45 = 0
+hash_bit_46 = 0
+hash_bit_47 = 0
+hash_bit_48 = 0
+hash_bit_49 = 0
+hash_bit_50 = 0
+hash_bit_51 = 0
 
-Logical Table ID in stage 2 was not supplied by table placement for table egress_port_count_table.
-Allocating Logical Table ID 1 in stage 2
-Allocating Table Type ID 1 of type exact in stage 2
-Allocating: Byte 0 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ig_intr_md_for_tm.ucast_egress_port[7:0]}.
-Allocating: Byte 1 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {unused[6:0], ig_intr_md_for_tm.ucast_egress_port[8:8]}.
+Allocating: Byte 2 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ig_intr_md_for_tm.ucast_egress_port[7:0]}.
+Allocating: Byte 3 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {unused[6:0], ig_intr_md_for_tm.ucast_egress_port[8:8]}.
 Match Table Resource Request is:
 SRAM Resource Request for table egress_port_count_table (of type match), with 0 ways wants 0 rams.
-Allocating: Byte 0 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ig_intr_md_for_tm.ucast_egress_port[7:0]}.
-Allocating: Byte 1 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {unused[6:0], ig_intr_md_for_tm.ucast_egress_port[8:8]}.
+Allocating: Byte 2 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ig_intr_md_for_tm.ucast_egress_port[7:0]}.
+Allocating: Byte 3 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {unused[6:0], ig_intr_md_for_tm.ucast_egress_port[8:8]}.
 No micro instructions needed for action count_egress executed from table egress_port_count_table.
 Allocating Action ALU 0 (32 bits) in stage 2 for match table egress_port_count_table's action count_egress
 Allocating VLIW Instruction : 0 in stage 2 for match table egress_port_count_table's action count_egress
+My hash-action stage table is 
+StageHashActionTable
+  stage_number: 2
+  number_entries 1024
+  pack_format:
+    Pack Format:
+  table_word_width: 0
+  memory_word_width: 0
+  entries_per_table_word: 0
+  number_memory_units_per_table_word: 0
+  entry_list: [
+]
+
+  p4_table: 'egress_port_count_table'
+  stage_table_handle: 1
+  stage_table_type_handle: 1
+  stage_gateway_table: StageGatewayTable
+  stage_number: 2
+  number_entries 0
+  memory_resource_allocation GatewayMemoryResourceAllocation:
+  memory_type: gateway
+  memory_units: [[14]]
+  home_row: -1
+  stateful_action_bus_output: None
+
+  p4_table: 'egress_port_count_table_always_true_condition'
+
+  match_group_resource_allocation:
+  vliw_resource_allocation:
+   action handle 536870916 maps to:
+VliwResourceAllocation:
+  match_table_name: egress_port_count_table
+  p4_action: count_egress
+  address_to_use: 0
+  full_address: 64
+  vliw_instruction_number: 0
+  color: 0
+  direction: ingress
+  micro_instructions:
+
+  action_to_vliw_mapping:
+    action handle 536870916 maps to vliw instruction 0, color 0, and direction ingress and is found in instruction address 0
+  hash_distribution_usages:
+    MAU Hash Distribution Resource Usage for P4 table egress_port_count_table
+  exact_match_group_resource_allocation : HashMatchGroupResourceAllocation:
+  match_groups: [(0, 16)]
+  match_group_key_bit_width: 73
+  match_group_phv_bit_scrambling: OrderedDict([(('ig_intr_md_for_tm.ucast_egress_port', 0), 64), (('ig_intr_md_for_tm.ucast_egress_port', 1), 65), (('ig_intr_md_for_tm.ucast_egress_port', 2), 66), (('ig_intr_md_for_tm.ucast_egress_port', 3), 67), (('ig_intr_md_for_tm.ucast_egress_port', 4), 68), (('ig_intr_md_for_tm.ucast_egress_port', 5), 69), (('ig_intr_md_for_tm.ucast_egress_port', 6), 70), (('ig_intr_md_for_tm.ucast_egress_port', 7), 71), (('ig_intr_md_for_tm.ucast_egress_port', 8), 72)])
+    ('ig_intr_md_for_tm.ucast_egress_port', 0) -> 64
+    ('ig_intr_md_for_tm.ucast_egress_port', 1) -> 65
+    ('ig_intr_md_for_tm.ucast_egress_port', 2) -> 66
+    ('ig_intr_md_for_tm.ucast_egress_port', 3) -> 67
+    ('ig_intr_md_for_tm.ucast_egress_port', 4) -> 68
+    ('ig_intr_md_for_tm.ucast_egress_port', 5) -> 69
+    ('ig_intr_md_for_tm.ucast_egress_port', 6) -> 70
+    ('ig_intr_md_for_tm.ucast_egress_port', 7) -> 71
+    ('ig_intr_md_for_tm.ucast_egress_port', 8) -> 72
+  hash_function_dictionary: OrderedDict([(0, <p4c_tofino.target.tofino.llir.mau.stage.resources.hash_function.HashFunction object at 0x7faa2f064690>)])
+  hash_group_id: 1
+  seed: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
+  table_direction: ingress
+
+  hash_distribution_resource_allocations :
+Hash Distribution:
+  source_hash_group : 1
+  hash_distribution_hash_id : 1
+  hash_distribution_group_id : 0
+  hash_distribution_used_for : Statistics Address
+  table_direction : ingress
+  bits_to_use : [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+  left_shift : 1
+  expanded_lo : False
+  expanded_hi : False
+  expanded_bit_width : 0
+  immediate_position : unused
+
+
+
 Cannot find table object for 'process_packet_out_table_always_true_condition'.
 Cannot find table object for 'process_packet_out_table_always_true_condition'.
 Cannot find table object for 'egress_port_count_table_always_true_condition'.
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/logs/mau.resources.log b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/logs/mau.resources.log
index 4c78d52..bc6238e 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/logs/mau.resources.log
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/logs/mau.resources.log
@@ -1,7 +1,7 @@
 +---------------------------------------------------------------------+
 |  Log file: mau.resources.log                                        |
 |  Compiler version: 5.1.0 (fca32d1)                                  |
-|  Created on: Tue Sep 12 11:15:53 2017                               |
+|  Created on: Wed Sep 13 00:59:40 2017                               |
 +---------------------------------------------------------------------+
 
 
@@ -10,7 +10,7 @@
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 |      0       |           13           |            16            |    2     |       1        |    2    |  4   |    3    |  3   |     3      |     0     |     1     |   0   |           8           |         0          |          4          |          2          |        2        |
 |      1       |           4            |            0             |    30    |       0        |    0    |  5   |    2    |  0   |     1      |     0     |     1     |   0   |           4           |         0          |          2          |          1          |        1        |
-|      2       |           2            |            0             |    9     |       0        |    2    |  4   |    4    |  0   |     1      |     0     |     2     |   0   |           0           |         0          |          0          |          0          |        2        |
+|      2       |           6            |            0             |    29    |       2        |    2    |  4   |    4    |  0   |     1      |     0     |     2     |   0   |           0           |         0          |          0          |          0          |        2        |
 |      3       |           0            |            0             |    0     |       0        |    0    |  0   |    0    |  0   |     0      |     0     |     0     |   0   |           0           |         0          |          0          |          0          |        0        |
 |      4       |           0            |            0             |    0     |       0        |    0    |  0   |    0    |  0   |     0      |     0     |     0     |   0   |           0           |         0          |          0          |          0          |        0        |
 |      5       |           0            |            0             |    0     |       0        |    0    |  0   |    0    |  0   |     0      |     0     |     0     |   0   |           0           |         0          |          0          |          0          |        0        |
@@ -21,7 +21,7 @@
 |      10      |           0            |            0             |    0     |       0        |    0    |  0   |    0    |  0   |     0      |     0     |     0     |   0   |           0           |         0          |          0          |          0          |        0        |
 |      11      |           0            |            0             |    0     |       0        |    0    |  0   |    0    |  0   |     0      |     0     |     0     |   0   |           0           |         0          |          0          |          0          |        0        |
 |              |                        |                          |          |                |         |      |         |      |            |           |           |       |                       |                    |                     |                     |                 |
-|    Totals    |           19           |            16            |    41    |       1        |    4    |  13  |    9    |  3   |     5      |     0     |     4     |   0   |           12          |         0          |          6          |          3          |        5        |
+|    Totals    |           23           |            16            |    61    |       3        |    4    |  13  |    9    |  3   |     5      |     0     |     4     |   0   |           12          |         0          |          6          |          3          |        5        |
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 
 
@@ -30,7 +30,7 @@
 ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 |      0       |         10.16%         |          24.24%          |  0.48%   |     16.67%     |  12.50% | 5.00% |  6.25%  | 12.50% |   9.38%    |   0.00%   |   25.00%  | 0.00% |         6.25%         |       0.00%        |        12.50%       |        6.25%        |      12.50%     |
 |      1       |         3.12%          |          0.00%           |  7.21%   |     0.00%      |  0.00%  | 6.25% |  4.17%  | 0.00%  |   3.12%    |   0.00%   |   25.00%  | 0.00% |         3.12%         |       0.00%        |        6.25%        |        3.12%        |      6.25%      |
-|      2       |         1.56%          |          0.00%           |  2.16%   |     0.00%      |  12.50% | 5.00% |  8.33%  | 0.00%  |   3.12%    |   0.00%   |   50.00%  | 0.00% |         0.00%         |       0.00%        |        0.00%        |        0.00%        |      12.50%     |
+|      2       |         4.69%          |          0.00%           |  6.97%   |     33.33%     |  12.50% | 5.00% |  8.33%  | 0.00%  |   3.12%    |   0.00%   |   50.00%  | 0.00% |         0.00%         |       0.00%        |        0.00%        |        0.00%        |      12.50%     |
 |      3       |         0.00%          |          0.00%           |  0.00%   |     0.00%      |  0.00%  | 0.00% |  0.00%  | 0.00%  |   0.00%    |   0.00%   |   0.00%   | 0.00% |         0.00%         |       0.00%        |        0.00%        |        0.00%        |      0.00%      |
 |      4       |         0.00%          |          0.00%           |  0.00%   |     0.00%      |  0.00%  | 0.00% |  0.00%  | 0.00%  |   0.00%    |   0.00%   |   0.00%   | 0.00% |         0.00%         |       0.00%        |        0.00%        |        0.00%        |      0.00%      |
 |      5       |         0.00%          |          0.00%           |  0.00%   |     0.00%      |  0.00%  | 0.00% |  0.00%  | 0.00%  |   0.00%    |   0.00%   |   0.00%   | 0.00% |         0.00%         |       0.00%        |        0.00%        |        0.00%        |      0.00%      |
@@ -41,7 +41,7 @@
 |      10      |         0.00%          |          0.00%           |  0.00%   |     0.00%      |  0.00%  | 0.00% |  0.00%  | 0.00%  |   0.00%    |   0.00%   |   0.00%   | 0.00% |         0.00%         |       0.00%        |        0.00%        |        0.00%        |      0.00%      |
 |      11      |         0.00%          |          0.00%           |  0.00%   |     0.00%      |  0.00%  | 0.00% |  0.00%  | 0.00%  |   0.00%    |   0.00%   |   0.00%   | 0.00% |         0.00%         |       0.00%        |        0.00%        |        0.00%        |      0.00%      |
 |              |                        |                          |          |                |         |       |         |        |            |           |           |       |                       |                    |                     |                     |                 |
-|   Average    |         1.24%          |          2.02%           |  0.82%   |     1.39%      |  2.08%  | 1.35% |  1.56%  | 1.04%  |   1.30%    |   0.00%   |   8.33%   | 0.00% |         0.78%         |       0.00%        |        1.56%        |        0.78%        |      2.60%      |
+|   Average    |         1.50%          |          2.02%           |  1.22%   |     4.17%      |  2.08%  | 1.35% |  1.56%  | 1.04%  |   1.30%    |   0.00%   |   8.33%   | 0.00% |         0.78%         |       0.00%        |        1.56%        |        0.78%        |      2.60%      |
 ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 
 
@@ -63,9 +63,9 @@
 |      ecmp_group_table_counter      |   1    |    0     |  0   |    0     |  2   |   0   |  2   |   0    |   0   |
 |            _condition_2            |   2    |    2     |  9   |    1     |  0   |   0   |  0   |   0    |   0   |
 | ingress_port_count_table__action__ |   2    |    0     |  0   |    0     |  0   |   0   |  0   |   0    |   0   |
-|      ingress_port_count_table      |   2    |    0     |  0   |    0     |  0   |   0   |  0   |   0    |   1   |
+|      ingress_port_count_table      |   2    |    2     |  10  |    0     |  0   |   0   |  0   |   0    |   1   |
 | egress_port_count_table__action__  |   2    |    0     |  0   |    0     |  0   |   0   |  0   |   0    |   0   |
-|      egress_port_count_table       |   2    |    0     |  0   |    1     |  0   |   0   |  0   |   0    |   1   |
+|      egress_port_count_table       |   2    |    2     |  10  |    1     |  0   |   0   |  0   |   0    |   1   |
 |        ingress_port_counter        |   2    |    0     |  0   |    0     |  2   |   0   |  2   |   0    |   0   |
 |        egress_port_counter         |   2    |    0     |  0   |    0     |  2   |   0   |  2   |   0    |   0   |
 --------------------------------------------------------------------------------------------------------------------
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/logs/mau.rf.log b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/logs/mau.rf.log
index e8e52eb..84b376e 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/logs/mau.rf.log
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/logs/mau.rf.log
@@ -1,6 +1,6 @@
 +---------------------------------------------------------------------+
 |  Log file: mau.rf.log                                               |
 |  Compiler version: 5.1.0 (fca32d1)                                  |
-|  Created on: Tue Sep 12 11:15:53 2017                               |
+|  Created on: Wed Sep 13 00:59:40 2017                               |
 +---------------------------------------------------------------------+
 
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/logs/mau.sram.log b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/logs/mau.sram.log
index 304ac66..3f740f7 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/logs/mau.sram.log
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/logs/mau.sram.log
@@ -1,7 +1,7 @@
 +---------------------------------------------------------------------+
 |  Log file: mau.sram.log                                             |
 |  Compiler version: 5.1.0 (fca32d1)                                  |
-|  Created on: Tue Sep 12 11:15:53 2017                               |
+|  Created on: Wed Sep 13 00:59:40 2017                               |
 +---------------------------------------------------------------------+
 
 
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/logs/mau.tcam.log b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/logs/mau.tcam.log
index 748d34a..6f4718a 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/logs/mau.tcam.log
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/logs/mau.tcam.log
@@ -1,7 +1,7 @@
 +---------------------------------------------------------------------+
 |  Log file: mau.tcam.log                                             |
 |  Compiler version: 5.1.0 (fca32d1)                                  |
-|  Created on: Tue Sep 12 11:15:53 2017                               |
+|  Created on: Wed Sep 13 00:59:40 2017                               |
 +---------------------------------------------------------------------+
 
 
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/logs/mau.tp.log b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/logs/mau.tp.log
index 229af10..f83cb22 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/logs/mau.tp.log
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/logs/mau.tp.log
@@ -1,7 +1,7 @@
 +---------------------------------------------------------------------+
 |  Log file: mau.tp.log                                               |
 |  Compiler version: 5.1.0 (fca32d1)                                  |
-|  Created on: Tue Sep 12 11:15:53 2017                               |
+|  Created on: Wed Sep 13 00:59:40 2017                               |
 +---------------------------------------------------------------------+
 
 ----- Stage 0 ------
@@ -37,10 +37,10 @@
 ------------------------------------------
  Running Table Placement 4
 ------------------------------------------
-Cannot use hash action for table ingress_port_count_table.
-Cannot use hash-action for table ingress_port_count_table with no key because the number of entries required by side-effect table ingress_port_counter is not a power of 2 -- 510.
-Cannot use hash action for table egress_port_count_table.
-Cannot use hash-action for table egress_port_count_table with no key because the number of entries required by side-effect table egress_port_counter is not a power of 2 -- 510.
+Can use hash action for table ingress_port_count_table???  True
+Decided that match table ingress_port_count_table is more efficiently allocated using hash-action to ingress_port_counter.
+Can use hash action for table egress_port_count_table???  True
+Decided that match table egress_port_count_table is more efficiently allocated using hash-action to egress_port_counter.
 Cannot use hash action for table process_packet_out_table.
 Table process_packet_out_table has no side effect tables.
 User requested to not attempt to place action data parameters in the match overhead.
@@ -51,8 +51,8 @@
 ------------------------------------------
  Table Groups
 ------------------------------------------
-Table Grouping (ingress) with match table ingress_port_count_table (1024) [ingress_port_count_table__action__ (1024), ingress_port_counter (510)]
-Table Grouping (ingress) with match table egress_port_count_table (1024) [egress_port_count_table__action__ (1024), egress_port_counter (510)]
+Table Grouping (ingress) with match table ingress_port_count_table (1024) [ingress_port_count_table__action__ (1024), ingress_port_counter (512)]
+Table Grouping (ingress) with match table egress_port_count_table (1024) [egress_port_count_table__action__ (1024), egress_port_counter (512)]
 Table Grouping (ingress) with match table process_packet_out_table (1024) [process_packet_out_table__action__ (1024)]
 Table Grouping (ingress) with match table table0 (512) [table0__action__ (512), table0_counter (512)]
 Table Grouping (ingress) with match table ecmp_group_table (1024) [ecmp_group_table__action__ (1024), ecmp_group_table_counter (1024)]
@@ -108,13 +108,13 @@
 
 Nodes could place:
   _condition_2 (4)
->> choose Table Grouping (ingress) with match table ingress_port_count_table (1024) [ingress_port_count_table__action__ (1024), ingress_port_counter (510)]
+>> choose Table Grouping (ingress) with match table ingress_port_count_table (1024) [ingress_port_count_table__action__ (1024), ingress_port_counter (512)]
 Earliest stage can place: 2
 Placing table: ingress_port_count_table__action__ with 1024 entries
-Placing table: ingress_port_counter with 510 entries
+Placing table: ingress_port_counter with 512 entries
 Table ingress_port_count_table__action__ with 0 entries is directly referenced
 Table ingress_port_counter with 4096 entries is indirectly referenced
-Match Table ingress_port_count_table has a total of 1 entries in stage 2
+Match Table ingress_port_count_table has a total of 1024 entries in stage 2
   Direct mapped table ingress_port_count_table__action__ has 0 entries
 >> set ingress_port_count_table (5) to placed
 >> set _condition_2 (4) to placed
@@ -123,15 +123,15 @@
   egress_port_count_table (6)
 egress_port_count_table and _condition_2 not mutually exclusive
 egress_port_count_table and ingress_port_count_table not mutually exclusive
->> choose Table Grouping (ingress) with match table egress_port_count_table (1024) [egress_port_count_table__action__ (1024), egress_port_counter (510)]
+>> choose Table Grouping (ingress) with match table egress_port_count_table (1024) [egress_port_count_table__action__ (1024), egress_port_counter (512)]
 Earliest stage can place: 2
 egress_port_count_table and _condition_2 not mutually exclusive
 egress_port_count_table and ingress_port_count_table not mutually exclusive
 Placing table: egress_port_count_table__action__ with 1024 entries
-Placing table: egress_port_counter with 510 entries
+Placing table: egress_port_counter with 512 entries
 Table egress_port_count_table__action__ with 0 entries is directly referenced
 Table egress_port_counter with 4096 entries is indirectly referenced
-Match Table egress_port_count_table has a total of 1 entries in stage 2
+Match Table egress_port_count_table has a total of 1024 entries in stage 2
   Direct mapped table egress_port_count_table__action__ has 0 entries
 >> set egress_port_count_table (6) to placed
 
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/logs/pa.characterize.log b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/logs/pa.characterize.log
index 054eac9..bc61355 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/logs/pa.characterize.log
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/logs/pa.characterize.log
@@ -1,7 +1,7 @@
 +---------------------------------------------------------------------+
 |  Log file: pa.characterize.log                                      |
 |  Compiler version: 5.1.0 (fca32d1)                                  |
-|  Created on: Tue Sep 12 11:15:53 2017                               |
+|  Created on: Wed Sep 13 00:59:40 2017                               |
 +---------------------------------------------------------------------+
 
 Program: ecmp
@@ -17,13 +17,13 @@
 |    [7:0]  | ingress |           ipv4.srcAddr[31:24]            |  pkt  |  | W | R  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
 |    phv2   | ingress |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
 |   [31:0]  | ingress |            ipv4.dstAddr[31:0]            |  pkt  |  | W | R  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
-|    phv3   | ingress |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
-|   [31:0]  | ingress |          ethernet.dstAddr[39:8]          |  pkt  |  | W | R  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
+|    phv3   | ingress |                                          |   SH  |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
+|   [31:24] | ingress |             tcp.dstPort[7:0]             |  pkt  |  | W | R  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
+|   [23:0]  | ingress |             tcp.seqNo[31:8]              |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
 |    phv4   | ingress |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
+|   [31:0]  | ingress |          ethernet.dstAddr[39:8]          |  pkt  |  | W | R  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
+|    phv5   | ingress |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
 |   [31:0]  | ingress |          ethernet.srcAddr[31:0]          |  pkt  |  | W | R  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
-|    phv5   | ingress |                                          |   SH  |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
-|   [31:16] | ingress |            udp.srcPort[15:0]             |  pkt  |  | W | R  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
-|   [15:0]  | ingress |            udp.dstPort[15:0]             |  pkt  |  | W | R  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
 |    phv6   |    -    |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
 |    phv7   |    -    |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
 |    phv8   |    -    |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
@@ -88,11 +88,14 @@
 |           |         |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
 |   phv64   | ingress |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
 |    [7:0]  | ingress |           ipv4.srcAddr[23:16]            |  pkt  |  | W | R  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
-|   phv65   | ingress |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
-|    [7:0]  | ingress |         ethernet.dstAddr[47:40]          |  pkt  |  | W | R  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
+|   phv65   | ingress |                                          | OL,SH |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
+|    [7:0]  | ingress |            tcp.srcPort[15:8]             |  pkt  |  | W | R  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
+|    [7:0]  | ingress |             udp.srcPort[7:0]             |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
 |   phv66   | ingress |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
+|    [7:0]  | ingress |         ethernet.dstAddr[47:40]          |  pkt  |  | W | R  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
+|   phv67   | ingress |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
 |    [7:0]  | ingress |         ethernet.srcAddr[39:32]          |  pkt  |  | W | R  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
-|   phv67   | ingress |                                          |   SH  |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
+|   phv68   | ingress |                                          |   SH  |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
 |    [6:6]  | ingress |  --validity_check--metadata_bridge[0:0]  |  pov  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
 |    [5:5]  | ingress |        --validity_check--udp[0:0]        |  pov  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
 |    [4:4]  | ingress |        --validity_check--tcp[0:0]        |  pov  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
@@ -100,9 +103,8 @@
 |    [2:2]  | ingress |     --validity_check--ethernet[0:0]      |  pov  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
 |    [1:1]  | ingress |  --validity_check--packet_out_hdr[0:0]   |  pov  |  | W | RW | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
 |    [0:0]  | ingress |   --validity_check--packet_in_hdr[0:0]   |  pov  |  | W | W  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
-|   phv68   | ingress |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
+|   phv69   | ingress |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
 |    [7:5]  | ingress |     ig_intr_md_for_tm.drop_ctl[2:0]      | imeta |  |   | W  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
-|   phv69   |    -    |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
 |   phv70   |    -    |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
 |   phv71   |    -    |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
 |   phv72   |    -    |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
@@ -189,15 +191,17 @@
 |   phv131  | ingress |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
 |   [15:0]  | ingress |            ipv4.srcAddr[15:0]            |  pkt  |  | W | R  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
 |   phv132  | ingress |                                          |   SH  |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
+|   [15:8]  | ingress |             tcp.srcPort[7:0]             |  pkt  |  | W | R  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
+|    [7:0]  | ingress |            tcp.dstPort[15:8]             |  pkt  |  | W | R  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
+|   phv133  | ingress |                                          |   SH  |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
 |   [15:8]  | ingress |          ethernet.dstAddr[7:0]           |  pkt  |  | W | R  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
 |    [7:0]  | ingress |         ethernet.srcAddr[47:40]          |  pkt  |  | W | R  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
-|   phv133  | ingress |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
-|   [15:0]  | ingress |         ethernet.etherType[15:0]         |  pkt  |  | W | R  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
 |   phv134  | ingress |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
-|   [15:0]  | ingress |       ecmp_metadata.group_id[15:0]       |  meta |  |   | W  | R |   |   |   |   |   |   |   |   |    |    |   |
+|   [15:0]  | ingress |         ethernet.etherType[15:0]         |  pkt  |  | W | R  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
 |   phv135  | ingress |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
+|   [15:0]  | ingress |       ecmp_metadata.group_id[15:0]       |  meta |  |   | W  | R |   |   |   |   |   |   |   |   |    |    |   |
+|   phv136  | ingress |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
 |   [15:0]  | ingress |       ecmp_metadata.selector[15:0]       |  meta |  |   | W  | R |   |   |   |   |   |   |   |   |    |    |   |
-|   phv136  |    -    |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
 |   phv137  |    -    |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
 |   phv138  |    -    |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
 |   phv139  |    -    |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
@@ -298,45 +302,47 @@
 |   [23:21] | ingress |             ipv4.flags[2:0]              |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
 |   [20:8]  | ingress |          ipv4.fragOffset[12:0]           |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
 |    [7:0]  | ingress |              ipv4.ttl[7:0]               |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
-|   phv257  | ingress |                                          |   SH  |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
+|   phv257  | ingress |                                          | OL,SH |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
 |   [31:28] | ingress |           tcp.dataOffset[3:0]            |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
 |   [27:25] | ingress |               tcp.res[2:0]               |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
 |   [24:22] | ingress |               tcp.ecn[2:0]               |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
 |   [21:16] | ingress |              tcp.ctrl[5:0]               |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
+|   [31:16] | ingress |            udp.length_[15:0]             |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
 |   [15:0]  | ingress |             tcp.window[15:0]             |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
+|   [15:0]  | ingress |            udp.checksum[15:0]            |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
 |   phv258  | ingress |                                          |   SH  |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
 |   [31:16] | ingress |            tcp.checksum[15:0]            |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
 |   [15:0]  | ingress |           tcp.urgentPtr[15:0]            |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
 |   phv259  |    -    |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
-|   phv260  |    -    |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
-|   phv261  |    -    |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
-|   phv262  |    -    |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
-|   phv263  |    -    |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
-|   phv264  |  egress |                                          |   SH  |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
+|   phv260  |  egress |                                          |   SH  |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
 |   [31:24] |  egress |              ipv4.ttl[7:0]               |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
 |   [23:16] |  egress |            ipv4.protocol[7:0]            |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
 |   [15:0]  |  egress |          ipv4.hdrChecksum[15:0]          |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
-|   phv265  |  egress |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
+|   phv261  |  egress |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
 |   [31:0]  |  egress |            ipv4.srcAddr[31:0]            |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
-|   phv266  |  egress |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
+|   phv262  |  egress |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
 |   [31:0]  |  egress |            ipv4.dstAddr[31:0]            |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
-|   phv267  |  egress |                                          | OL,SH |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
+|   phv263  |  egress |                                          | OL,SH |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
 |   [31:16] |  egress |            udp.length_[15:0]             |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
 |   [31:0]  |  egress |             tcp.ackNo[31:0]              |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
 |   [15:0]  |  egress |            udp.checksum[15:0]            |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
-|   phv268  |  egress |                                          |   SH  |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
+|   phv264  |  egress |                                          |   SH  |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
 |   [31:28] |  egress |           tcp.dataOffset[3:0]            |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
 |   [27:25] |  egress |               tcp.res[2:0]               |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
 |   [24:22] |  egress |               tcp.ecn[2:0]               |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
 |   [21:16] |  egress |              tcp.ctrl[5:0]               |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
 |   [15:0]  |  egress |             tcp.window[15:0]             |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
-|   phv269  |  egress |                                          |   SH  |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
+|   phv265  |  egress |                                          |   SH  |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
 |   [31:16] |  egress |            tcp.checksum[15:0]            |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
 |   [15:0]  |  egress |           tcp.urgentPtr[15:0]            |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
-|   phv270  |  egress |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
+|   phv266  |  egress |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
 |   [31:0]  |  egress |          ethernet.dstAddr[39:8]          |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
-|   phv271  |  egress |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
+|   phv267  |  egress |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
 |   [31:0]  |  egress |          ethernet.srcAddr[31:0]          |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
+|   phv268  |    -    |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
+|   phv269  |    -    |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
+|   phv270  |    -    |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
+|   phv271  |    -    |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
 |           |         |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
 |   phv272  |    -    |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
 |   phv273  |    -    |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
@@ -359,33 +365,29 @@
 |    [7:4]  | ingress |            ipv4.version[3:0]             |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
 |    [3:0]  | ingress |              ipv4.ihl[3:0]               |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
 |   phv289  | ingress |                                          | OL,SH |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
-|    [7:0]  | ingress |            tcp.srcPort[15:8]             |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
-|    [7:0]  | ingress |            udp.length_[15:8]             |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
-|   phv290  | ingress |                                          | OL,SH |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
-|    [7:0]  | ingress |             tcp.srcPort[7:0]             |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
-|    [7:0]  | ingress |             udp.length_[7:0]             |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
-|   phv291  | ingress |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
-|    [7:0]  | ingress |            tcp.dstPort[15:8]             |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
-|   phv292  | ingress |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
-|    [7:0]  | ingress |             tcp.dstPort[7:0]             |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
-|   phv293  |    -    |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
-|   phv294  |    -    |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
-|   phv295  |    -    |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
-|   phv296  |  egress |                                          |   SH  |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
+|    [7:0]  | ingress |              tcp.seqNo[7:0]              |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
+|    [7:0]  | ingress |            udp.srcPort[15:8]             |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
+|   phv290  |    -    |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
+|   phv291  |    -    |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
+|   phv292  |  egress |                                          |   SH  |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
 |    [7:4]  |  egress |            ipv4.version[3:0]             |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
 |    [3:0]  |  egress |              ipv4.ihl[3:0]               |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
-|   phv297  |  egress |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
+|   phv293  |  egress |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
 |    [7:0]  |  egress |            ipv4.diffserv[7:0]            |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
-|   phv298  |  egress |                                          | OL,SH |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
+|   phv294  |  egress |                                          | OL,SH |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
 |    [7:0]  |  egress |            tcp.srcPort[15:8]             |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
 |    [7:0]  |  egress |            udp.srcPort[15:8]             |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
-|   phv299  |  egress |                                          | OL,SH |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
+|   phv295  |  egress |                                          | OL,SH |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
 |    [7:0]  |  egress |             tcp.srcPort[7:0]             |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
 |    [7:0]  |  egress |             udp.srcPort[7:0]             |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
-|   phv300  |  egress |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
+|   phv296  |  egress |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
 |    [7:0]  |  egress |         ethernet.dstAddr[47:40]          |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
-|   phv301  |  egress |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
+|   phv297  |  egress |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
 |    [7:0]  |  egress |         ethernet.srcAddr[39:32]          |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
+|   phv298  |    -    |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
+|   phv299  |    -    |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
+|   phv300  |    -    |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
+|   phv301  |    -    |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
 |   phv302  |    -    |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
 |   phv303  |    -    |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
 |           |         |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
@@ -413,45 +415,43 @@
 |   [15:8]  | ingress |            ipv4.totalLen[7:0]            |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
 |    [7:0]  | ingress |        ipv4.identification[15:8]         |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
 |   phv322  | ingress |                                          | OL,SH |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
-|   [15:0]  | ingress |             tcp.seqNo[31:16]             |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
-|   [15:0]  | ingress |            udp.checksum[15:0]            |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
-|   phv323  | ingress |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
-|   [15:0]  | ingress |             tcp.seqNo[15:0]              |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
-|   phv324  | ingress |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
 |   [15:0]  | ingress |             tcp.ackNo[31:16]             |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
-|   phv325  | ingress |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
+|   [15:0]  | ingress |            udp.dstPort[15:0]             |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
+|   phv323  | ingress |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
 |   [15:0]  | ingress |             tcp.ackNo[15:0]              |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
-|   phv326  |    -    |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
-|   phv327  |    -    |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
-|   phv328  |    -    |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
-|   phv329  |    -    |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
-|   phv330  |    -    |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
-|   phv331  |    -    |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
-|   phv332  |  egress |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
+|   phv324  |    -    |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
+|   phv325  |    -    |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
+|   phv326  |  egress |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
 |   [15:0]  |  egress |           ipv4.totalLen[15:0]            |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
-|   phv333  |  egress |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
+|   phv327  |  egress |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
 |   [15:0]  |  egress |        ipv4.identification[15:0]         |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
-|   phv334  |  egress |                                          |   SH  |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
+|   phv328  |  egress |                                          |   SH  |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
 |   [15:13] |  egress |             ipv4.flags[2:0]              |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
 |   [12:0]  |  egress |          ipv4.fragOffset[12:0]           |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
-|   phv335  |  egress |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
+|   phv329  |  egress |                                          | OL,SH |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
 |   [15:0]  |  egress |            tcp.dstPort[15:0]             |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
-|           |         |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
-|   phv336  |  egress |                                          | OL,SH |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
-|   [15:0]  |  egress |             tcp.seqNo[31:16]             |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
 |   [15:0]  |  egress |            udp.dstPort[15:0]             |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
-|   phv337  |  egress |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
+|   phv330  |  egress |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
+|   [15:0]  |  egress |             tcp.seqNo[31:16]             |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
+|   phv331  |  egress |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
 |   [15:0]  |  egress |             tcp.seqNo[15:0]              |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
-|   phv338  |  egress |                                          |   SH  |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
+|   phv332  |  egress |                                          |   SH  |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
 |   [15:8]  |  egress |          ethernet.dstAddr[7:0]           |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
 |    [7:0]  |  egress |         ethernet.srcAddr[47:40]          |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
-|   phv339  |  egress |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
+|   phv333  |  egress |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
 |   [15:0]  |  egress |         ethernet.etherType[15:0]         |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
-|   phv340  |  egress |                                          | OL,SH |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
+|   phv334  |  egress |                                          | OL,SH |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
 |   [15:7]  |  egress |     packet_out_hdr.egress_port[8:0]      |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
 |   [15:7]  |  egress |     packet_in_hdr.ingress_port[8:0]      |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
 |    [6:0]  |  egress |       packet_out_hdr._padding[6:0]       |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
 |    [6:0]  |  egress |       packet_in_hdr._padding[6:0]        |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
+|   phv335  |    -    |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
+|           |         |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
+|   phv336  |    -    |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
+|   phv337  |    -    |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
+|   phv338  |    -    |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
+|   phv339  |    -    |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
+|   phv340  |    -    |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
 |   phv341  |    -    |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
 |   phv342  |    -    |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
 |   phv343  |    -    |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
@@ -483,9 +483,9 @@
 -----------------------------------------------------------------------------------------------------------------------------------------
 
 
-Containers used: 59
-Containers with data overlayed: 9  (15.25%)
-Containers shared: 29  (49.15%)
+Containers used: 56
+Containers with data overlayed: 10  (17.86%)
+Containers shared: 30  (53.57%)
 
 ------------------------
   Legend:
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/logs/pa.constraints.log b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/logs/pa.constraints.log
index 5c79eac..6e4a8ae 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/logs/pa.constraints.log
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/logs/pa.constraints.log
@@ -1,7 +1,7 @@
 +---------------------------------------------------------------------+
 |  Log file: pa.constraints.log                                       |
 |  Compiler version: 5.1.0 (fca32d1)                                  |
-|  Created on: Tue Sep 12 11:15:53 2017                               |
+|  Created on: Wed Sep 13 00:59:40 2017                               |
 +---------------------------------------------------------------------+
 
 To populate this log file, include --print-pa-constraints as a compiler argument.
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/logs/pa.liveness.log b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/logs/pa.liveness.log
index 1209f55..cc28af3 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/logs/pa.liveness.log
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/logs/pa.liveness.log
@@ -1,6 +1,6 @@
 +---------------------------------------------------------------------+
 |  Log file: pa.liveness.log                                          |
 |  Compiler version: 5.1.0 (fca32d1)                                  |
-|  Created on: Tue Sep 12 11:15:53 2017                               |
+|  Created on: Wed Sep 13 00:59:40 2017                               |
 +---------------------------------------------------------------------+
 
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/logs/pa.log b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/logs/pa.log
index 2a7aa5c..83138b1 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/logs/pa.log
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/logs/pa.log
@@ -1,7 +1,7 @@
 +---------------------------------------------------------------------+
 |  Log file: pa.log                                                   |
 |  Compiler version: 5.1.0 (fca32d1)                                  |
-|  Created on: Tue Sep 12 11:15:53 2017                               |
+|  Created on: Wed Sep 13 00:59:40 2017                               |
 +---------------------------------------------------------------------+
 
 HLIR Version: 0.10.5
@@ -504,17 +504,17 @@
 |             tcp.checksum            |     16    |  ingress  |    x    |     x     |           |              |               |
 |               tcp.ctrl              |     6     |  ingress  |    x    |     x     |           |              |               |
 |            tcp.dataOffset           |     4     |  ingress  |    x    |     x     |           |              |               |
-|             tcp.dstPort             |     16    |  ingress  |    x    |     x     |           |              |               |
+|             tcp.dstPort             |     16    |  ingress  |    x    |     x     |           |      x       |               |
 |               tcp.ecn               |     3     |  ingress  |    x    |     x     |           |              |               |
 |               tcp.res               |     3     |  ingress  |    x    |     x     |           |              |               |
 |              tcp.seqNo              |     32    |  ingress  |    x    |     x     |           |              |               |
-|             tcp.srcPort             |     16    |  ingress  |    x    |     x     |           |              |               |
+|             tcp.srcPort             |     16    |  ingress  |    x    |     x     |           |      x       |               |
 |            tcp.urgentPtr            |     16    |  ingress  |    x    |     x     |           |              |               |
 |              tcp.window             |     16    |  ingress  |    x    |     x     |           |              |               |
 |             udp.checksum            |     16    |  ingress  |    x    |     x     |           |              |               |
-|             udp.dstPort             |     16    |  ingress  |    x    |     x     |           |      x       |               |
+|             udp.dstPort             |     16    |  ingress  |    x    |     x     |           |              |               |
 |             udp.length_             |     16    |  ingress  |    x    |     x     |           |              |               |
-|             udp.srcPort             |     16    |  ingress  |    x    |     x     |           |      x       |               |
+|             udp.srcPort             |     16    |  ingress  |    x    |     x     |           |              |               |
 ---------------------------------------------------------------------------------------------------------------------------------
 
 Performing PHV allocation...
@@ -553,7 +553,7 @@
   parse_pkt_in and parse_pkt_out are exclusive parse states
   parse_tcp and parse_udp are exclusive parse states
 
->>Event 'pa_init' at time 1505214955.36
+>>Event 'pa_init' at time 1505264383.13
    Took 0.01 seconds
 --------------------------------------------
 PHV MAU Groups: 92
@@ -645,13 +645,13 @@
   ipv4.dstAddr <32 bits ingress parsed R>
 
 Phv Mau Group (ingress) -- 1 instance for total bit width of 16.
-  tcp.srcPort <16 bits ingress parsed tagalong>
+  tcp.srcPort <16 bits ingress parsed R>
 
 Phv Mau Group (ingress) -- 1 instance for total bit width of 1.
   --validity_check--tcp <1 bits ingress parsed pov>
 
 Phv Mau Group (ingress) -- 1 instance for total bit width of 16.
-  tcp.dstPort <16 bits ingress parsed tagalong>
+  tcp.dstPort <16 bits ingress parsed R>
 
 Phv Mau Group (ingress) -- 1 instance for total bit width of 32.
   tcp.seqNo <32 bits ingress parsed tagalong>
@@ -681,13 +681,13 @@
   tcp.urgentPtr <16 bits ingress parsed tagalong>
 
 Phv Mau Group (ingress) -- 1 instance for total bit width of 16.
-  udp.srcPort <16 bits ingress parsed R>
+  udp.srcPort <16 bits ingress parsed tagalong>
 
 Phv Mau Group (ingress) -- 1 instance for total bit width of 1.
   --validity_check--udp <1 bits ingress parsed pov>
 
 Phv Mau Group (ingress) -- 1 instance for total bit width of 16.
-  udp.dstPort <16 bits ingress parsed R>
+  udp.dstPort <16 bits ingress parsed tagalong>
 
 Phv Mau Group (ingress) -- 1 instance for total bit width of 16.
   udp.length_ <16 bits ingress parsed tagalong>
@@ -837,7 +837,7 @@
   eg_intr_md.egress_cos <3 bits egress parsed imeta>
 
 
->>Event 'pa_resv' at time 1505214955.37
+>>Event 'pa_resv' at time 1505264383.13
    Took 0.00 seconds
 
 -----------------------------------------------
@@ -879,7 +879,7 @@
   Group 2 32 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 12 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv32
   Group 3 32 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 12 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv48
 Reserving 32-bit container for ingress: phv0
->>Event 'pa_bridge' at time 1505214955.40
+>>Event 'pa_bridge' at time 1505264383.17
    Took 0.04 seconds
 
 -----------------------------------------------
@@ -932,7 +932,7 @@
 |     Overall total      |    1 (0.30%)    | 32 (0.52%) |      6144      |
 ---------------------------------------------------------------------------
 
->>Event 'pa_phase0' at time 1505214955.41
+>>Event 'pa_phase0' at time 1505264383.17
    Took 0.00 seconds
 
 -----------------------------------------------
@@ -985,7 +985,7 @@
 |     Overall total      |    1 (0.30%)    | 32 (0.52%) |      6144      |
 ---------------------------------------------------------------------------
 
->>Event 'pa_critical' at time 1505214955.41
+>>Event 'pa_critical' at time 1505264383.17
    Took 0.00 seconds
 
 -----------------------------------------------
@@ -1334,8 +1334,8 @@
 -------------------------------------------------------------------------------------
 |      Name      | BW | Tagalong? | Req | Pref | Not Allow | MaxSplit | Group Size |
 -------------------------------------------------------------------------------------
-|  tcp.srcPort   | 16 |    True   |  -  |  -   |     -     |    2     |     1      |
-|  tcp.dstPort   | 16 |    True   |  -  |  -   |     -     |    2     |     1      |
+|  tcp.srcPort   | 16 |   False   |  -  |  -   |     -     |    2     |     1      |
+|  tcp.dstPort   | 16 |   False   |  -  |  -   |     -     |    2     |     1      |
 |   tcp.seqNo    | 32 |    True   |  -  |  -   |     -     |    4     |     1      |
 |   tcp.ackNo    | 32 |    True   |  -  |  -   |     -     |    4     |     1      |
 | tcp.dataOffset | 4  |    True   |  -  |  -   |     -     |    1     |     1      |
@@ -1361,23 +1361,21 @@
   32-bit: 31
 Initial packing options: 5196
 
-Packing option 0:  [8, 8, 8, 8, 16, 16, 16, 16, 32, 32]
+Packing option 0:  [8, 16, 32, 8, 16, 16, 32, 32]
 MAU containers after:
-  8-bit: 47
-  16-bit: 76
-  32-bit: 45
+  8-bit: 46
+  16-bit: 75
+  32-bit: 44
 +-------------------------+
 |  tcp.srcPort [15:8]     |
 +-------------------------+
 |  tcp.srcPort [7:0]      |
-+-------------------------+
 |  tcp.dstPort [15:8]     |
 +-------------------------+
 |  tcp.dstPort [7:0]      |
+|  tcp.seqNo [31:8]       |
 +-------------------------+
-|  tcp.seqNo [31:16]      |
-+-------------------------+
-|  tcp.seqNo [15:0]       |
+|  tcp.seqNo [7:0]        |
 +-------------------------+
 |  tcp.ackNo [31:16]      |
 +-------------------------+
@@ -1395,28 +1393,43 @@
 
 Looking at tcp.srcPort (ingress) [15:8], with test_alloc = True
 ----> tcp.srcPort (ingress) is allocated? False
-***Allocating phv289[7:0] for tcp.srcPort[15:8]
+
+MAU groups: 3
+  Group 4 8 bits -- avail 15 -- ingress avail 15 and remain 14 and promised 1 and req 1 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv65
+  Group 6 8 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv96
+  Group 7 8 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv112
+***Allocating phv65[7:0] for tcp.srcPort[15:8]
 Looking at tcp.srcPort (ingress) [7:0], with test_alloc = True
 ----> tcp.srcPort (ingress) is allocated? False
-***Allocating phv290[7:0] for tcp.srcPort[7:0]
 Looking at tcp.dstPort (ingress) [15:8], with test_alloc = True
-----> tcp.dstPort (ingress) is allocated? False
-***Allocating phv291[7:0] for tcp.dstPort[15:8]
+
+MAU groups: 5
+  Group 8 16 bits -- avail 13 -- ingress avail 13 and remain 11 and promised 2 and req 2 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv132
+  Group 10 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv160
+  Group 11 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv176
+  Group 12 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv192
+  Group 13 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv208
+***Allocating phv132[15:8] for tcp.srcPort[7:0]
+***Allocating phv132[7:0] for tcp.dstPort[15:8]
 Looking at tcp.dstPort (ingress) [7:0], with test_alloc = True
 ----> tcp.dstPort (ingress) is allocated? False
-***Allocating phv292[7:0] for tcp.dstPort[7:0]
-Looking at tcp.seqNo (ingress) [31:16], with test_alloc = True
+Looking at tcp.seqNo (ingress) [31:8], with test_alloc = True
+
+MAU groups: 3
+  Group 0 32 bits -- avail 13 -- ingress avail 13 and remain 12 and promised 1 and req 1 -- egress avail 12 and remain 12 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv3
+  Group 2 32 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 12 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv32
+  Group 3 32 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 12 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv48
+***Allocating phv3[31:24] for tcp.dstPort[7:0]
+***Allocating phv3[23:0] for tcp.seqNo[31:8]
+Looking at tcp.seqNo (ingress) [7:0], with test_alloc = True
 ----> tcp.seqNo (ingress) is allocated? False
-***Allocating phv322[15:0] for tcp.seqNo[31:16]
-Looking at tcp.seqNo (ingress) [15:0], with test_alloc = True
-----> tcp.seqNo (ingress) is allocated? False
-***Allocating phv323[15:0] for tcp.seqNo[15:0]
+***Allocating phv289[7:0] for tcp.seqNo[7:0]
 Looking at tcp.ackNo (ingress) [31:16], with test_alloc = True
 ----> tcp.ackNo (ingress) is allocated? False
-***Allocating phv324[15:0] for tcp.ackNo[31:16]
+***Allocating phv322[15:0] for tcp.ackNo[31:16]
 Looking at tcp.ackNo (ingress) [15:0], with test_alloc = True
 ----> tcp.ackNo (ingress) is allocated? False
-***Allocating phv325[15:0] for tcp.ackNo[15:0]
+***Allocating phv323[15:0] for tcp.ackNo[15:0]
 Looking at tcp.dataOffset (ingress) [3:0], with test_alloc = True
 ----> tcp.dataOffset (ingress) is allocated? False
 Looking at tcp.res (ingress) [2:0], with test_alloc = True
@@ -1487,9 +1500,9 @@
   16-bit: 80
   32-bit: 48
 Tagalong containers available:
-  8-bit: 24
-  16-bit: 36
-  32-bit: 24
+  8-bit: 28
+  16-bit: 42
+  32-bit: 28
 Initial packing options: 5196
 
 Packing option 0:  [8, 8, 16, 16, 16, 32, 32, 32]
@@ -1522,35 +1535,35 @@
 Looking at ipv4.version (egress) [3:0], with test_alloc = True
 ----> ipv4.version (egress) is allocated? False
 Looking at ipv4.ihl (egress) [3:0], with test_alloc = True
-***Allocating phv296[7:4] for ipv4.version[3:0]
-***Allocating phv296[3:0] for ipv4.ihl[3:0]
+***Allocating phv292[7:4] for ipv4.version[3:0]
+***Allocating phv292[3:0] for ipv4.ihl[3:0]
 Looking at ipv4.diffserv (egress) [7:0], with test_alloc = True
 ----> ipv4.diffserv (egress) is allocated? False
-***Allocating phv297[7:0] for ipv4.diffserv[7:0]
+***Allocating phv293[7:0] for ipv4.diffserv[7:0]
 Looking at ipv4.totalLen (egress) [15:0], with test_alloc = True
 ----> ipv4.totalLen (egress) is allocated? False
-***Allocating phv332[15:0] for ipv4.totalLen[15:0]
+***Allocating phv326[15:0] for ipv4.totalLen[15:0]
 Looking at ipv4.identification (egress) [15:0], with test_alloc = True
 ----> ipv4.identification (egress) is allocated? False
-***Allocating phv333[15:0] for ipv4.identification[15:0]
+***Allocating phv327[15:0] for ipv4.identification[15:0]
 Looking at ipv4.flags (egress) [2:0], with test_alloc = True
 ----> ipv4.flags (egress) is allocated? False
 Looking at ipv4.fragOffset (egress) [12:0], with test_alloc = True
-***Allocating phv334[15:13] for ipv4.flags[2:0]
-***Allocating phv334[12:0] for ipv4.fragOffset[12:0]
+***Allocating phv328[15:13] for ipv4.flags[2:0]
+***Allocating phv328[12:0] for ipv4.fragOffset[12:0]
 Looking at ipv4.ttl (egress) [7:0], with test_alloc = True
 ----> ipv4.ttl (egress) is allocated? False
 Looking at ipv4.protocol (egress) [7:0], with test_alloc = True
 Looking at ipv4.hdrChecksum (egress) [15:0], with test_alloc = True
-***Allocating phv264[31:24] for ipv4.ttl[7:0]
-***Allocating phv264[23:16] for ipv4.protocol[7:0]
-***Allocating phv264[15:0] for ipv4.hdrChecksum[15:0]
+***Allocating phv260[31:24] for ipv4.ttl[7:0]
+***Allocating phv260[23:16] for ipv4.protocol[7:0]
+***Allocating phv260[15:0] for ipv4.hdrChecksum[15:0]
 Looking at ipv4.srcAddr (egress) [31:0], with test_alloc = True
 ----> ipv4.srcAddr (egress) is allocated? False
-***Allocating phv265[31:0] for ipv4.srcAddr[31:0]
+***Allocating phv261[31:0] for ipv4.srcAddr[31:0]
 Looking at ipv4.dstAddr (egress) [31:0], with test_alloc = True
 ----> ipv4.dstAddr (egress) is allocated? False
-***Allocating phv266[31:0] for ipv4.dstAddr[31:0]
+***Allocating phv262[31:0] for ipv4.dstAddr[31:0]
 Packing options tried: 1
 Packing options skipped: 0
 
@@ -1603,9 +1616,9 @@
   16-bit: 80
   32-bit: 48
 Tagalong containers available:
-  8-bit: 22
-  16-bit: 33
-  32-bit: 21
+  8-bit: 26
+  16-bit: 39
+  32-bit: 25
 Initial packing options: 5196
 
 Packing option 0:  [8, 8, 16, 16, 16, 32, 32, 32]
@@ -1638,38 +1651,38 @@
 
 Looking at tcp.srcPort (egress) [15:8], with test_alloc = True
 ----> tcp.srcPort (egress) is allocated? False
-***Allocating phv298[7:0] for tcp.srcPort[15:8]
+***Allocating phv294[7:0] for tcp.srcPort[15:8]
 Looking at tcp.srcPort (egress) [7:0], with test_alloc = True
 ----> tcp.srcPort (egress) is allocated? False
-***Allocating phv299[7:0] for tcp.srcPort[7:0]
+***Allocating phv295[7:0] for tcp.srcPort[7:0]
 Looking at tcp.dstPort (egress) [15:0], with test_alloc = True
 ----> tcp.dstPort (egress) is allocated? False
-***Allocating phv335[15:0] for tcp.dstPort[15:0]
+***Allocating phv329[15:0] for tcp.dstPort[15:0]
 Looking at tcp.seqNo (egress) [31:16], with test_alloc = True
 ----> tcp.seqNo (egress) is allocated? False
-***Allocating phv336[15:0] for tcp.seqNo[31:16]
+***Allocating phv330[15:0] for tcp.seqNo[31:16]
 Looking at tcp.seqNo (egress) [15:0], with test_alloc = True
 ----> tcp.seqNo (egress) is allocated? False
-***Allocating phv337[15:0] for tcp.seqNo[15:0]
+***Allocating phv331[15:0] for tcp.seqNo[15:0]
 Looking at tcp.ackNo (egress) [31:0], with test_alloc = True
 ----> tcp.ackNo (egress) is allocated? False
-***Allocating phv267[31:0] for tcp.ackNo[31:0]
+***Allocating phv263[31:0] for tcp.ackNo[31:0]
 Looking at tcp.dataOffset (egress) [3:0], with test_alloc = True
 ----> tcp.dataOffset (egress) is allocated? False
 Looking at tcp.res (egress) [2:0], with test_alloc = True
 Looking at tcp.ecn (egress) [2:0], with test_alloc = True
 Looking at tcp.ctrl (egress) [5:0], with test_alloc = True
 Looking at tcp.window (egress) [15:0], with test_alloc = True
-***Allocating phv268[31:28] for tcp.dataOffset[3:0]
-***Allocating phv268[27:25] for tcp.res[2:0]
-***Allocating phv268[24:22] for tcp.ecn[2:0]
-***Allocating phv268[21:16] for tcp.ctrl[5:0]
-***Allocating phv268[15:0] for tcp.window[15:0]
+***Allocating phv264[31:28] for tcp.dataOffset[3:0]
+***Allocating phv264[27:25] for tcp.res[2:0]
+***Allocating phv264[24:22] for tcp.ecn[2:0]
+***Allocating phv264[21:16] for tcp.ctrl[5:0]
+***Allocating phv264[15:0] for tcp.window[15:0]
 Looking at tcp.checksum (egress) [15:0], with test_alloc = True
 ----> tcp.checksum (egress) is allocated? False
 Looking at tcp.urgentPtr (egress) [15:0], with test_alloc = True
-***Allocating phv269[31:16] for tcp.checksum[15:0]
-***Allocating phv269[15:0] for tcp.urgentPtr[15:0]
+***Allocating phv265[31:16] for tcp.checksum[15:0]
+***Allocating phv265[15:0] for tcp.urgentPtr[15:0]
 Packing options tried: 1
 Packing options skipped: 0
 
@@ -1702,20 +1715,20 @@
 min_extracts[32] = 1
 Packing options: 604
 MAU containers available:
-  8-bit: 47
-  16-bit: 76
-  32-bit: 45
+  8-bit: 46
+  16-bit: 75
+  32-bit: 44
 Tagalong containers available:
-  8-bit: 19
-  16-bit: 30
+  8-bit: 22
+  16-bit: 32
   32-bit: 21
 Initial packing options: 604
 
 Packing option 0:  [8, 32, 16, 8, 32, 16]
 MAU containers after:
-  8-bit: 45
-  16-bit: 74
-  32-bit: 43
+  8-bit: 44
+  16-bit: 73
+  32-bit: 42
 +-----------------------------+
 |  ethernet.dstAddr [47:40]   |
 +-----------------------------+
@@ -1735,48 +1748,21 @@
 ----> ethernet.dstAddr (ingress) is allocated? False
 
 MAU groups: 3
-  Group 4 8 bits -- avail 15 -- ingress avail 15 and remain 14 and promised 1 and req 1 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv65
-  Group 6 8 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv96
-  Group 7 8 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv112
-***Allocating phv65[7:0] for ethernet.dstAddr[47:40]
-Looking at ethernet.dstAddr (ingress) [39:8], with test_alloc = True
-----> ethernet.dstAddr (ingress) is allocated? False
-
-MAU groups: 3
-  Group 0 32 bits -- avail 13 -- ingress avail 13 and remain 12 and promised 1 and req 1 -- egress avail 12 and remain 12 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv3
-  Group 2 32 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 12 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv32
-  Group 3 32 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 12 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv48
-***Allocating phv3[31:0] for ethernet.dstAddr[39:8]
-Looking at ethernet.dstAddr (ingress) [7:0], with test_alloc = True
-----> ethernet.dstAddr (ingress) is allocated? False
-Looking at ethernet.srcAddr (ingress) [47:40], with test_alloc = True
-
-MAU groups: 5
-  Group 8 16 bits -- avail 13 -- ingress avail 13 and remain 11 and promised 2 and req 2 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv132
-  Group 10 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv160
-  Group 11 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv176
-  Group 12 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv192
-  Group 13 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv208
-***Allocating phv132[15:8] for ethernet.dstAddr[7:0]
-***Allocating phv132[7:0] for ethernet.srcAddr[47:40]
-Looking at ethernet.srcAddr (ingress) [39:32], with test_alloc = True
-----> ethernet.srcAddr (ingress) is allocated? False
-
-MAU groups: 3
   Group 4 8 bits -- avail 14 -- ingress avail 14 and remain 13 and promised 1 and req 1 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv66
   Group 6 8 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv96
   Group 7 8 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv112
-***Allocating phv66[7:0] for ethernet.srcAddr[39:32]
-Looking at ethernet.srcAddr (ingress) [31:0], with test_alloc = True
-----> ethernet.srcAddr (ingress) is allocated? False
+***Allocating phv66[7:0] for ethernet.dstAddr[47:40]
+Looking at ethernet.dstAddr (ingress) [39:8], with test_alloc = True
+----> ethernet.dstAddr (ingress) is allocated? False
 
 MAU groups: 3
   Group 0 32 bits -- avail 12 -- ingress avail 12 and remain 11 and promised 1 and req 1 -- egress avail 12 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv4
   Group 2 32 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 12 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv32
   Group 3 32 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 12 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv48
-***Allocating phv4[31:0] for ethernet.srcAddr[31:0]
-Looking at ethernet.etherType (ingress) [15:0], with test_alloc = True
-----> ethernet.etherType (ingress) is allocated? False
+***Allocating phv4[31:0] for ethernet.dstAddr[39:8]
+Looking at ethernet.dstAddr (ingress) [7:0], with test_alloc = True
+----> ethernet.dstAddr (ingress) is allocated? False
+Looking at ethernet.srcAddr (ingress) [47:40], with test_alloc = True
 
 MAU groups: 5
   Group 8 16 bits -- avail 12 -- ingress avail 12 and remain 10 and promised 2 and req 2 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv133
@@ -1784,7 +1770,34 @@
   Group 11 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv176
   Group 12 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv192
   Group 13 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv208
-***Allocating phv133[15:0] for ethernet.etherType[15:0]
+***Allocating phv133[15:8] for ethernet.dstAddr[7:0]
+***Allocating phv133[7:0] for ethernet.srcAddr[47:40]
+Looking at ethernet.srcAddr (ingress) [39:32], with test_alloc = True
+----> ethernet.srcAddr (ingress) is allocated? False
+
+MAU groups: 3
+  Group 4 8 bits -- avail 13 -- ingress avail 13 and remain 12 and promised 1 and req 1 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv67
+  Group 6 8 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv96
+  Group 7 8 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv112
+***Allocating phv67[7:0] for ethernet.srcAddr[39:32]
+Looking at ethernet.srcAddr (ingress) [31:0], with test_alloc = True
+----> ethernet.srcAddr (ingress) is allocated? False
+
+MAU groups: 3
+  Group 0 32 bits -- avail 11 -- ingress avail 11 and remain 10 and promised 1 and req 1 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv5
+  Group 2 32 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 12 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv32
+  Group 3 32 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 12 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv48
+***Allocating phv5[31:0] for ethernet.srcAddr[31:0]
+Looking at ethernet.etherType (ingress) [15:0], with test_alloc = True
+----> ethernet.etherType (ingress) is allocated? False
+
+MAU groups: 5
+  Group 8 16 bits -- avail 11 -- ingress avail 11 and remain 9 and promised 2 and req 2 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv134
+  Group 10 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv160
+  Group 11 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv176
+  Group 12 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv192
+  Group 13 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv208
+***Allocating phv134[15:0] for ethernet.etherType[15:0]
 Packing options tried: 1
 Packing options skipped: 0
 
@@ -1821,9 +1834,9 @@
   16-bit: 80
   32-bit: 48
 Tagalong containers available:
-  8-bit: 20
-  16-bit: 30
-  32-bit: 18
+  8-bit: 24
+  16-bit: 36
+  32-bit: 22
 Initial packing options: 604
 
 Packing option 0:  [8, 32, 16, 8, 32, 16]
@@ -1848,24 +1861,24 @@
 
 Looking at ethernet.dstAddr (egress) [47:40], with test_alloc = True
 ----> ethernet.dstAddr (egress) is allocated? False
-***Allocating phv300[7:0] for ethernet.dstAddr[47:40]
+***Allocating phv296[7:0] for ethernet.dstAddr[47:40]
 Looking at ethernet.dstAddr (egress) [39:8], with test_alloc = True
 ----> ethernet.dstAddr (egress) is allocated? False
-***Allocating phv270[31:0] for ethernet.dstAddr[39:8]
+***Allocating phv266[31:0] for ethernet.dstAddr[39:8]
 Looking at ethernet.dstAddr (egress) [7:0], with test_alloc = True
 ----> ethernet.dstAddr (egress) is allocated? False
 Looking at ethernet.srcAddr (egress) [47:40], with test_alloc = True
-***Allocating phv338[15:8] for ethernet.dstAddr[7:0]
-***Allocating phv338[7:0] for ethernet.srcAddr[47:40]
+***Allocating phv332[15:8] for ethernet.dstAddr[7:0]
+***Allocating phv332[7:0] for ethernet.srcAddr[47:40]
 Looking at ethernet.srcAddr (egress) [39:32], with test_alloc = True
 ----> ethernet.srcAddr (egress) is allocated? False
-***Allocating phv301[7:0] for ethernet.srcAddr[39:32]
+***Allocating phv297[7:0] for ethernet.srcAddr[39:32]
 Looking at ethernet.srcAddr (egress) [31:0], with test_alloc = True
 ----> ethernet.srcAddr (egress) is allocated? False
-***Allocating phv271[31:0] for ethernet.srcAddr[31:0]
+***Allocating phv267[31:0] for ethernet.srcAddr[31:0]
 Looking at ethernet.etherType (egress) [15:0], with test_alloc = True
 ----> ethernet.etherType (egress) is allocated? False
-***Allocating phv339[15:0] for ethernet.etherType[15:0]
+***Allocating phv333[15:0] for ethernet.etherType[15:0]
 Packing options tried: 1
 Packing options skipped: 0
 
@@ -1904,9 +1917,9 @@
   16-bit: 80
   32-bit: 48
 Tagalong containers available:
-  8-bit: 18
-  16-bit: 28
-  32-bit: 16
+  8-bit: 22
+  16-bit: 34
+  32-bit: 20
 Initial packing options: 3
 
 Packing option 1:  [16, 8]
@@ -1993,9 +2006,9 @@
   16-bit: 79
   32-bit: 48
 Tagalong containers available:
-  8-bit: 18
-  16-bit: 28
-  32-bit: 16
+  8-bit: 22
+  16-bit: 34
+  32-bit: 20
 Initial packing options: 2
 
 Packing option 0:  [16]
@@ -2011,8 +2024,8 @@
 Looking at packet_out_hdr.egress_port (egress) [8:0], with test_alloc = True
 ----> packet_out_hdr.egress_port (egress) is allocated? False
 Looking at packet_out_hdr._padding (egress) [6:0], with test_alloc = True
-***Allocating phv340[15:7] for packet_out_hdr.egress_port[8:0]
-***Allocating phv340[6:0] for packet_out_hdr._padding[6:0]
+***Allocating phv334[15:7] for packet_out_hdr.egress_port[8:0]
+***Allocating phv334[6:0] for packet_out_hdr._padding[6:0]
 Packing options tried: 1
 Packing options skipped: 0
 
@@ -2030,46 +2043,46 @@
 |       PHV Group        | Containers Used |  Bits Used   | Bits Available |
 | (container bit widths) |     (% used)    |   (% used)   |                |
 -----------------------------------------------------------------------------
-|         0 (32)         |    5 (31.25%)   | 160 (31.25%) |      512       |
+|         0 (32)         |    6 (37.50%)   | 192 (37.50%) |      512       |
 |         1 (32)         |    0 (0.00%)    |  0 (0.00%)   |      512       |
 |         2 (32)         |    0 (0.00%)    |  0 (0.00%)   |      512       |
 |         3 (32)         |    0 (0.00%)    |  0 (0.00%)   |      512       |
-|    Total for 32 bit    |    5 (7.81%)    | 160 (7.81%)  |      2048      |
+|    Total for 32 bit    |    6 (9.38%)    | 192 (9.38%)  |      2048      |
 |                        |                 |              |                |
-|         4 (8)          |    3 (18.75%)   | 24 (18.75%)  |      128       |
+|         4 (8)          |    4 (25.00%)   | 32 (25.00%)  |      128       |
 |         5 (8)          |    1 (6.25%)    |  8 (6.25%)   |      128       |
 |         6 (8)          |    0 (0.00%)    |  0 (0.00%)   |      128       |
 |         7 (8)          |    0 (0.00%)    |  0 (0.00%)   |      128       |
-|    Total for 8 bit     |    4 (6.25%)    |  32 (6.25%)  |      512       |
+|    Total for 8 bit     |    5 (7.81%)    |  40 (7.81%)  |      512       |
 |                        |                 |              |                |
-|         8 (16)         |    5 (31.25%)   | 80 (31.25%)  |      256       |
+|         8 (16)         |    6 (37.50%)   | 96 (37.50%)  |      256       |
 |         9 (16)         |    1 (6.25%)    |  16 (6.25%)  |      256       |
 |        10 (16)         |    0 (0.00%)    |  0 (0.00%)   |      256       |
 |        11 (16)         |    0 (0.00%)    |  0 (0.00%)   |      256       |
 |        12 (16)         |    0 (0.00%)    |  0 (0.00%)   |      256       |
 |        13 (16)         |    0 (0.00%)    |  0 (0.00%)   |      256       |
-|    Total for 16 bit    |    6 (6.25%)    |  96 (6.25%)  |      1536      |
+|    Total for 16 bit    |    7 (7.29%)    | 112 (7.29%)  |      1536      |
 |                        |                 |              |                |
 |       14 (32) T        |   11 (68.75%)   | 352 (68.75%) |      512       |
 |       15 (32) T        |    0 (0.00%)    |  0 (0.00%)   |      512       |
 |    Total for 32 bit    |   11 (34.38%)   | 352 (34.38%) |      1024      |
 |                        |                 |              |                |
-|        16 (8) T        |   11 (68.75%)   | 88 (68.75%)  |      128       |
+|        16 (8) T        |    8 (50.00%)   | 64 (50.00%)  |      128       |
 |        17 (8) T        |    0 (0.00%)    |  0 (0.00%)   |      128       |
-|    Total for 8 bit     |   11 (34.38%)   | 88 (34.38%)  |      256       |
+|    Total for 8 bit     |    8 (25.00%)   | 64 (25.00%)  |      256       |
 |                        |                 |              |                |
-|       18 (16) T        |   10 (62.50%)   | 160 (62.50%) |      256       |
-|       19 (16) T        |    5 (31.25%)   | 80 (31.25%)  |      256       |
+|       18 (16) T        |   13 (81.25%)   | 208 (81.25%) |      256       |
+|       19 (16) T        |    0 (0.00%)    |  0 (0.00%)   |      256       |
 |       20 (16) T        |    0 (0.00%)    |  0 (0.00%)   |      256       |
-|    Total for 16 bit    |   15 (31.25%)   | 240 (31.25%) |      768       |
+|    Total for 16 bit    |   13 (27.08%)   | 208 (27.08%) |      768       |
 |                        |                 |              |                |
-|       MAU total        |    15 (6.70%)   | 288 (7.03%)  |      4096      |
-|     Tagalong total     |   37 (33.04%)   | 680 (33.20%) |      2048      |
-|     Overall total      |   52 (15.48%)   | 968 (15.76%) |      6144      |
+|       MAU total        |    18 (8.04%)   | 344 (8.40%)  |      4096      |
+|     Tagalong total     |   32 (28.57%)   | 624 (30.47%) |      2048      |
+|     Overall total      |   50 (14.88%)   | 968 (15.76%) |      6144      |
 -----------------------------------------------------------------------------
 
->>Event 'pa_overlay' at time 1505214964.48
-   Took 9.07 seconds
+>>Event 'pa_overlay' at time 1505264392.23
+   Took 9.06 seconds
 
 -----------------------------------------------
   Allocating remaining parsed fields
@@ -2107,9 +2120,9 @@
 -------------------------------------------------------------------------------------------------------
 
 MAU containers available:
-  8-bit: 45
-  16-bit: 74
-  32-bit: 43
+  8-bit: 44
+  16-bit: 73
+  32-bit: 42
 Packing options: 2
 Initial packing options: 2
 
@@ -2140,381 +2153,29 @@
 -----------------------------------------------------------------------------------
 |     Name     | BW | Tagalong? | Req | Pref | Not Allow | MaxSplit | Group Size |
 -----------------------------------------------------------------------------------
-| udp.srcPort  | 16 |   False   |  -  |  -   |     -     |    2     |     1      |
-| udp.dstPort  | 16 |   False   |  -  |  -   |     -     |    2     |     1      |
+| udp.srcPort  | 16 |    True   |  -  |  -   |     -     |    2     |     1      |
+| udp.dstPort  | 16 |    True   |  -  |  -   |     -     |    2     |     1      |
 | udp.length_  | 16 |    True   |  -  |  -   |     -     |    2     |     1      |
 | udp.checksum | 16 |    True   |  -  |  -   |     -     |    2     |     1      |
 -----------------------------------------------------------------------------------
 
 MAU containers available:
-  8-bit: 45
-  16-bit: 74
-  32-bit: 43
+  8-bit: 44
+  16-bit: 73
+  32-bit: 42
 Packing options: 47
 Initial packing options: 47
 
 Packing option 0:  [8, 8, 16, 32]
-
-MAU groups: 3
-  Group 4 8 bits -- avail 13 -- ingress avail 13 and remain 12 and promised 1 and req 1 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv67
-  Group 6 8 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv96
-  Group 7 8 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv112
-
-MAU groups: 3
-  Group 4 8 bits -- avail 12 -- ingress avail 12 and remain 11 and promised 1 and req 1 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv68
-  Group 6 8 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv96
-  Group 7 8 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv112
-
-MAU groups: 5
-  Group 8 16 bits -- avail 11 -- ingress avail 11 and remain 9 and promised 2 and req 2 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv134
-  Group 10 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv160
-  Group 11 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv176
-  Group 12 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv192
-  Group 13 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv208
->>Can pack using [8, 8, 16, 32] if open up 3 new containers.
-
-Packing option 1:  [8, 8, 32, 16]
-
-MAU groups: 3
-  Group 4 8 bits -- avail 13 -- ingress avail 13 and remain 12 and promised 1 and req 1 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv67
-  Group 6 8 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv96
-  Group 7 8 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv112
-
-MAU groups: 3
-  Group 4 8 bits -- avail 12 -- ingress avail 12 and remain 11 and promised 1 and req 1 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv68
-  Group 6 8 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv96
-  Group 7 8 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv112
-
-MAU groups: 3
-  Group 0 32 bits -- avail 11 -- ingress avail 11 and remain 10 and promised 1 and req 1 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv5
-  Group 2 32 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 12 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv32
-  Group 3 32 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 12 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv48
->>Can pack using [8, 8, 32, 16] if open up 3 new containers.
-
-Packing option 2:  [8, 16, 8, 32]
-
-MAU groups: 3
-  Group 4 8 bits -- avail 13 -- ingress avail 13 and remain 12 and promised 1 and req 1 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv67
-  Group 6 8 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv96
-  Group 7 8 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv112
-
-MAU groups: 5
-  Group 8 16 bits -- avail 11 -- ingress avail 11 and remain 9 and promised 2 and req 2 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv134
-  Group 10 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv160
-  Group 11 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv176
-  Group 12 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv192
-  Group 13 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv208
-
-MAU groups: 3
-  Group 4 8 bits -- avail 12 -- ingress avail 12 and remain 11 and promised 1 and req 1 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv68
-  Group 6 8 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv96
-  Group 7 8 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv112
->>Can pack using [8, 16, 8, 32] if open up 3 new containers.
-
-Packing option 3:  [8, 16, 32, 8]
-
-MAU groups: 3
-  Group 4 8 bits -- avail 13 -- ingress avail 13 and remain 12 and promised 1 and req 1 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv67
-  Group 6 8 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv96
-  Group 7 8 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv112
-
-MAU groups: 5
-  Group 8 16 bits -- avail 11 -- ingress avail 11 and remain 9 and promised 2 and req 2 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv134
-  Group 10 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv160
-  Group 11 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv176
-  Group 12 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv192
-  Group 13 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv208
-
-MAU groups: 3
-  Group 0 32 bits -- avail 11 -- ingress avail 11 and remain 10 and promised 1 and req 1 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv5
-  Group 2 32 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 12 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv32
-  Group 3 32 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 12 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv48
->>Can pack using [8, 16, 32, 8] if open up 3 new containers.
-
-Packing option 4:  [8, 32, 8, 16]
-
-MAU groups: 3
-  Group 4 8 bits -- avail 13 -- ingress avail 13 and remain 12 and promised 1 and req 1 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv67
-  Group 6 8 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv96
-  Group 7 8 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv112
-
-MAU groups: 3
-  Group 0 32 bits -- avail 11 -- ingress avail 11 and remain 10 and promised 1 and req 1 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv5
-  Group 2 32 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 12 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv32
-  Group 3 32 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 12 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv48
->>Can pack using [8, 32, 8, 16] if open up 2 new containers.
-
-Packing option 5:  [8, 32, 16, 8]
-
-MAU groups: 3
-  Group 4 8 bits -- avail 13 -- ingress avail 13 and remain 12 and promised 1 and req 1 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv67
-  Group 6 8 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv96
-  Group 7 8 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv112
-
-MAU groups: 3
-  Group 0 32 bits -- avail 11 -- ingress avail 11 and remain 10 and promised 1 and req 1 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv5
-  Group 2 32 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 12 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv32
-  Group 3 32 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 12 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv48
->>Can pack using [8, 32, 16, 8] if open up 2 new containers.
-
-Packing option 6:  [16, 8, 8, 32]
-
-MAU groups: 5
-  Group 8 16 bits -- avail 11 -- ingress avail 11 and remain 9 and promised 2 and req 2 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv134
-  Group 10 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv160
-  Group 11 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv176
-  Group 12 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv192
-  Group 13 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv208
-
-MAU groups: 3
-  Group 4 8 bits -- avail 13 -- ingress avail 13 and remain 12 and promised 1 and req 1 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv67
-  Group 6 8 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv96
-  Group 7 8 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv112
-
-MAU groups: 3
-  Group 4 8 bits -- avail 12 -- ingress avail 12 and remain 11 and promised 1 and req 1 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv68
-  Group 6 8 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv96
-  Group 7 8 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv112
->>Can pack using [16, 8, 8, 32] if open up 3 new containers.
-
-Packing option 7:  [16, 8, 32, 8]
-
-MAU groups: 5
-  Group 8 16 bits -- avail 11 -- ingress avail 11 and remain 9 and promised 2 and req 2 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv134
-  Group 10 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv160
-  Group 11 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv176
-  Group 12 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv192
-  Group 13 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv208
-
-MAU groups: 3
-  Group 4 8 bits -- avail 13 -- ingress avail 13 and remain 12 and promised 1 and req 1 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv67
-  Group 6 8 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv96
-  Group 7 8 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv112
-
-MAU groups: 3
-  Group 0 32 bits -- avail 11 -- ingress avail 11 and remain 10 and promised 1 and req 1 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv5
-  Group 2 32 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 12 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv32
-  Group 3 32 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 12 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv48
->>Can pack using [16, 8, 32, 8] if open up 3 new containers.
-
-Packing option 8:  [16, 32, 8, 8]
-
-MAU groups: 5
-  Group 8 16 bits -- avail 11 -- ingress avail 11 and remain 9 and promised 2 and req 2 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv134
-  Group 10 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv160
-  Group 11 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv176
-  Group 12 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv192
-  Group 13 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv208
-
-MAU groups: 3
-  Group 0 32 bits -- avail 11 -- ingress avail 11 and remain 10 and promised 1 and req 1 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv5
-  Group 2 32 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 12 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv32
-  Group 3 32 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 12 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv48
->>Can pack using [16, 32, 8, 8] if open up 2 new containers.
-
-Packing option 9:  [32, 8, 8, 16]
-
-MAU groups: 3
-  Group 0 32 bits -- avail 11 -- ingress avail 11 and remain 10 and promised 1 and req 1 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv5
-  Group 2 32 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 12 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv32
-  Group 3 32 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 12 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv48
->>Can pack using [32, 8, 8, 16] if open up 1 new containers.
-
-Packing option 10:  [32, 8, 16, 8]
-
-MAU groups: 3
-  Group 0 32 bits -- avail 11 -- ingress avail 11 and remain 10 and promised 1 and req 1 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv5
-  Group 2 32 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 12 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv32
-  Group 3 32 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 12 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv48
->>Can pack using [32, 8, 16, 8] if open up 1 new containers.
-
-Packing option 11:  [32, 16, 8, 8]
-
-MAU groups: 3
-  Group 0 32 bits -- avail 11 -- ingress avail 11 and remain 10 and promised 1 and req 1 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv5
-  Group 2 32 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 12 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv32
-  Group 3 32 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 12 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv48
->>Can pack using [32, 16, 8, 8] if open up 1 new containers.
-
-Packing option 12:  [16, 16, 32]
-
-MAU groups: 5
-  Group 8 16 bits -- avail 11 -- ingress avail 11 and remain 9 and promised 2 and req 2 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv134
-  Group 10 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv160
-  Group 11 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv176
-  Group 12 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv192
-  Group 13 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv208
-
-MAU groups: 5
-  Group 8 16 bits -- avail 10 -- ingress avail 10 and remain 8 and promised 2 and req 2 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv135
-  Group 10 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv160
-  Group 11 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv176
-  Group 12 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv192
-  Group 13 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv208
->>Can pack using [16, 16, 32] if open up 2 new containers.
-
-Packing option 13:  [16, 32, 16]
-
-MAU groups: 5
-  Group 8 16 bits -- avail 11 -- ingress avail 11 and remain 9 and promised 2 and req 2 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv134
-  Group 10 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv160
-  Group 11 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv176
-  Group 12 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv192
-  Group 13 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv208
-
-MAU groups: 3
-  Group 0 32 bits -- avail 11 -- ingress avail 11 and remain 10 and promised 1 and req 1 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv5
-  Group 2 32 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 12 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv32
-  Group 3 32 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 12 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv48
->>Can pack using [16, 32, 16] if open up 2 new containers.
-
-Packing option 14:  [32, 16, 16]
-
-MAU groups: 3
-  Group 0 32 bits -- avail 11 -- ingress avail 11 and remain 10 and promised 1 and req 1 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv5
-  Group 2 32 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 12 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv32
-  Group 3 32 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 12 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv48
->>Can pack using [32, 16, 16] if open up 1 new containers.
-
-Packing option 15:  [8, 8, 16, 16, 16]
-
-MAU groups: 3
-  Group 4 8 bits -- avail 13 -- ingress avail 13 and remain 12 and promised 1 and req 1 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv67
-  Group 6 8 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv96
-  Group 7 8 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv112
-
-MAU groups: 3
-  Group 4 8 bits -- avail 12 -- ingress avail 12 and remain 11 and promised 1 and req 1 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv68
-  Group 6 8 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv96
-  Group 7 8 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv112
-
-MAU groups: 5
-  Group 8 16 bits -- avail 11 -- ingress avail 11 and remain 9 and promised 2 and req 2 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv134
-  Group 10 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv160
-  Group 11 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv176
-  Group 12 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv192
-  Group 13 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv208
->>Can pack using [8, 8, 16, 16, 16] if open up 3 new containers.
-
-Packing option 16:  [8, 16, 8, 16, 16]
-
-MAU groups: 3
-  Group 4 8 bits -- avail 13 -- ingress avail 13 and remain 12 and promised 1 and req 1 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv67
-  Group 6 8 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv96
-  Group 7 8 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv112
-
-MAU groups: 5
-  Group 8 16 bits -- avail 11 -- ingress avail 11 and remain 9 and promised 2 and req 2 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv134
-  Group 10 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv160
-  Group 11 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv176
-  Group 12 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv192
-  Group 13 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv208
-
-MAU groups: 3
-  Group 4 8 bits -- avail 12 -- ingress avail 12 and remain 11 and promised 1 and req 1 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv68
-  Group 6 8 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv96
-  Group 7 8 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv112
->>Can pack using [8, 16, 8, 16, 16] if open up 3 new containers.
-
-Packing option 17:  [8, 16, 16, 8, 16]
-
-MAU groups: 3
-  Group 4 8 bits -- avail 13 -- ingress avail 13 and remain 12 and promised 1 and req 1 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv67
-  Group 6 8 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv96
-  Group 7 8 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv112
-
-MAU groups: 5
-  Group 8 16 bits -- avail 11 -- ingress avail 11 and remain 9 and promised 2 and req 2 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv134
-  Group 10 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv160
-  Group 11 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv176
-  Group 12 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv192
-  Group 13 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv208
-
-MAU groups: 5
-  Group 8 16 bits -- avail 10 -- ingress avail 10 and remain 8 and promised 2 and req 2 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv135
-  Group 10 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv160
-  Group 11 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv176
-  Group 12 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv192
-  Group 13 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv208
->>Can pack using [8, 16, 16, 8, 16] if open up 3 new containers.
-
-Packing option 18:  [8, 16, 16, 16, 8]
-
-MAU groups: 3
-  Group 4 8 bits -- avail 13 -- ingress avail 13 and remain 12 and promised 1 and req 1 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv67
-  Group 6 8 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv96
-  Group 7 8 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv112
-
-MAU groups: 5
-  Group 8 16 bits -- avail 11 -- ingress avail 11 and remain 9 and promised 2 and req 2 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv134
-  Group 10 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv160
-  Group 11 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv176
-  Group 12 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv192
-  Group 13 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv208
-
-MAU groups: 5
-  Group 8 16 bits -- avail 10 -- ingress avail 10 and remain 8 and promised 2 and req 2 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv135
-  Group 10 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv160
-  Group 11 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv176
-  Group 12 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv192
-  Group 13 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv208
->>Can pack using [8, 16, 16, 16, 8] if open up 3 new containers.
-
-Packing option 19:  [16, 8, 8, 16, 16]
-
-MAU groups: 5
-  Group 8 16 bits -- avail 11 -- ingress avail 11 and remain 9 and promised 2 and req 2 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv134
-  Group 10 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv160
-  Group 11 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv176
-  Group 12 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv192
-  Group 13 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv208
-
-MAU groups: 3
-  Group 4 8 bits -- avail 13 -- ingress avail 13 and remain 12 and promised 1 and req 1 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv67
-  Group 6 8 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv96
-  Group 7 8 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv112
-
-MAU groups: 3
-  Group 4 8 bits -- avail 12 -- ingress avail 12 and remain 11 and promised 1 and req 1 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv68
-  Group 6 8 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv96
-  Group 7 8 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv112
->>Can pack using [16, 8, 8, 16, 16] if open up 3 new containers.
-
-Packing option 20:  [16, 8, 16, 8, 16]
-
-MAU groups: 5
-  Group 8 16 bits -- avail 11 -- ingress avail 11 and remain 9 and promised 2 and req 2 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv134
-  Group 10 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv160
-  Group 11 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv176
-  Group 12 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv192
-  Group 13 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv208
-
-MAU groups: 3
-  Group 4 8 bits -- avail 13 -- ingress avail 13 and remain 12 and promised 1 and req 1 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv67
-  Group 6 8 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv96
-  Group 7 8 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv112
-
-MAU groups: 5
-  Group 8 16 bits -- avail 10 -- ingress avail 10 and remain 8 and promised 2 and req 2 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv135
-  Group 10 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv160
-  Group 11 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv176
-  Group 12 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv192
-  Group 13 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv208
->>Can pack using [16, 8, 16, 8, 16] if open up 3 new containers.
-Terminate search for time purposes...
-Packing options tried: 21
+>>Can pack using [8, 8, 16, 32] if open up 0 new containers.
+Packing options tried: 1
 Packing options skipped: 0
-Trying to place using best packing [32, 8, 8, 16]
-
-MAU groups: 3
-  Group 0 32 bits -- avail 11 -- ingress avail 11 and remain 10 and promised 1 and req 1 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv5
-  Group 2 32 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 12 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv32
-  Group 3 32 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 12 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv48
-***Allocating phv5[31:16] for udp.srcPort[15:0]
-***Allocating phv5[15:0] for udp.dstPort[15:0]
-***Allocating phv289[7:0] for udp.length_[15:8]
-***Allocating phv290[7:0] for udp.length_[7:0]
-***Allocating phv322[15:0] for udp.checksum[15:0]
+Trying to place using best packing [8, 8, 16, 32]
+***Allocating phv289[7:0] for udp.srcPort[15:8]
+***Allocating phv65[7:0] for udp.srcPort[7:0]
+***Allocating phv322[15:0] for udp.dstPort[15:0]
+***Allocating phv257[31:16] for udp.length_[15:0]
+***Allocating phv257[15:0] for udp.checksum[15:0]
 Working on parse node parse_udp (8) (egress)
 
 -------------------------------------------
@@ -2553,11 +2214,11 @@
 Packing options tried: 1
 Packing options skipped: 0
 Trying to place using best packing [8, 8, 16, 32]
-***Allocating phv298[7:0] for udp.srcPort[15:8]
-***Allocating phv299[7:0] for udp.srcPort[7:0]
-***Allocating phv336[15:0] for udp.dstPort[15:0]
-***Allocating phv267[31:16] for udp.length_[15:0]
-***Allocating phv267[15:0] for udp.checksum[15:0]
+***Allocating phv294[7:0] for udp.srcPort[15:8]
+***Allocating phv295[7:0] for udp.srcPort[7:0]
+***Allocating phv329[15:0] for udp.dstPort[15:0]
+***Allocating phv263[31:16] for udp.length_[15:0]
+***Allocating phv263[15:0] for udp.checksum[15:0]
 Working on parse node parse_pkt_in (2) (egress)
 
 -------------------------------------------
@@ -2592,101 +2253,101 @@
 Packing options tried: 1
 Packing options skipped: 0
 Trying to place using best packing [16]
-***Allocating phv340[15:7] for packet_in_hdr.ingress_port[8:0]
-***Allocating phv340[6:0] for packet_in_hdr._padding[6:0]
+***Allocating phv334[15:7] for packet_in_hdr.ingress_port[8:0]
+***Allocating phv334[6:0] for packet_in_hdr._padding[6:0]
 
 After allocating remaining parse nodes:
 Allocation state: Final Allocation
-------------------------------------------------------------------------------
-|       PHV Group        | Containers Used |   Bits Used   | Bits Available |
-| (container bit widths) |     (% used)    |    (% used)   |                |
-------------------------------------------------------------------------------
-|         0 (32)         |    6 (37.50%)   |  192 (37.50%) |      512       |
-|         1 (32)         |    0 (0.00%)    |   0 (0.00%)   |      512       |
-|         2 (32)         |    0 (0.00%)    |   0 (0.00%)   |      512       |
-|         3 (32)         |    0 (0.00%)    |   0 (0.00%)   |      512       |
-|    Total for 32 bit    |    6 (9.38%)    |  192 (9.38%)  |      2048      |
-|                        |                 |               |                |
-|         4 (8)          |    3 (18.75%)   |  24 (18.75%)  |      128       |
-|         5 (8)          |    1 (6.25%)    |   8 (6.25%)   |      128       |
-|         6 (8)          |    0 (0.00%)    |   0 (0.00%)   |      128       |
-|         7 (8)          |    0 (0.00%)    |   0 (0.00%)   |      128       |
-|    Total for 8 bit     |    4 (6.25%)    |   32 (6.25%)  |      512       |
-|                        |                 |               |                |
-|         8 (16)         |    5 (31.25%)   |  80 (31.25%)  |      256       |
-|         9 (16)         |    1 (6.25%)    |   16 (6.25%)  |      256       |
-|        10 (16)         |    0 (0.00%)    |   0 (0.00%)   |      256       |
-|        11 (16)         |    0 (0.00%)    |   0 (0.00%)   |      256       |
-|        12 (16)         |    0 (0.00%)    |   0 (0.00%)   |      256       |
-|        13 (16)         |    0 (0.00%)    |   0 (0.00%)   |      256       |
-|    Total for 16 bit    |    6 (6.25%)    |   96 (6.25%)  |      1536      |
-|                        |                 |               |                |
-|       14 (32) T        |   11 (68.75%)   |  352 (68.75%) |      512       |
-|       15 (32) T        |    0 (0.00%)    |   0 (0.00%)   |      512       |
-|    Total for 32 bit    |   11 (34.38%)   |  352 (34.38%) |      1024      |
-|                        |                 |               |                |
-|        16 (8) T        |   11 (68.75%)   |  88 (68.75%)  |      128       |
-|        17 (8) T        |    0 (0.00%)    |   0 (0.00%)   |      128       |
-|    Total for 8 bit     |   11 (34.38%)   |  88 (34.38%)  |      256       |
-|                        |                 |               |                |
-|       18 (16) T        |   10 (62.50%)   |  160 (62.50%) |      256       |
-|       19 (16) T        |    5 (31.25%)   |  80 (31.25%)  |      256       |
-|       20 (16) T        |    0 (0.00%)    |   0 (0.00%)   |      256       |
-|    Total for 16 bit    |   15 (31.25%)   |  240 (31.25%) |      768       |
-|                        |                 |               |                |
-|       MAU total        |    16 (7.14%)   |  320 (7.81%)  |      4096      |
-|     Tagalong total     |   37 (33.04%)   |  680 (33.20%) |      2048      |
-|     Overall total      |   53 (15.77%)   | 1000 (16.28%) |      6144      |
-------------------------------------------------------------------------------
+-----------------------------------------------------------------------------
+|       PHV Group        | Containers Used |  Bits Used   | Bits Available |
+| (container bit widths) |     (% used)    |   (% used)   |                |
+-----------------------------------------------------------------------------
+|         0 (32)         |    6 (37.50%)   | 192 (37.50%) |      512       |
+|         1 (32)         |    0 (0.00%)    |  0 (0.00%)   |      512       |
+|         2 (32)         |    0 (0.00%)    |  0 (0.00%)   |      512       |
+|         3 (32)         |    0 (0.00%)    |  0 (0.00%)   |      512       |
+|    Total for 32 bit    |    6 (9.38%)    | 192 (9.38%)  |      2048      |
+|                        |                 |              |                |
+|         4 (8)          |    4 (25.00%)   | 32 (25.00%)  |      128       |
+|         5 (8)          |    1 (6.25%)    |  8 (6.25%)   |      128       |
+|         6 (8)          |    0 (0.00%)    |  0 (0.00%)   |      128       |
+|         7 (8)          |    0 (0.00%)    |  0 (0.00%)   |      128       |
+|    Total for 8 bit     |    5 (7.81%)    |  40 (7.81%)  |      512       |
+|                        |                 |              |                |
+|         8 (16)         |    6 (37.50%)   | 96 (37.50%)  |      256       |
+|         9 (16)         |    1 (6.25%)    |  16 (6.25%)  |      256       |
+|        10 (16)         |    0 (0.00%)    |  0 (0.00%)   |      256       |
+|        11 (16)         |    0 (0.00%)    |  0 (0.00%)   |      256       |
+|        12 (16)         |    0 (0.00%)    |  0 (0.00%)   |      256       |
+|        13 (16)         |    0 (0.00%)    |  0 (0.00%)   |      256       |
+|    Total for 16 bit    |    7 (7.29%)    | 112 (7.29%)  |      1536      |
+|                        |                 |              |                |
+|       14 (32) T        |   11 (68.75%)   | 352 (68.75%) |      512       |
+|       15 (32) T        |    0 (0.00%)    |  0 (0.00%)   |      512       |
+|    Total for 32 bit    |   11 (34.38%)   | 352 (34.38%) |      1024      |
+|                        |                 |              |                |
+|        16 (8) T        |    8 (50.00%)   | 64 (50.00%)  |      128       |
+|        17 (8) T        |    0 (0.00%)    |  0 (0.00%)   |      128       |
+|    Total for 8 bit     |    8 (25.00%)   | 64 (25.00%)  |      256       |
+|                        |                 |              |                |
+|       18 (16) T        |   13 (81.25%)   | 208 (81.25%) |      256       |
+|       19 (16) T        |    0 (0.00%)    |  0 (0.00%)   |      256       |
+|       20 (16) T        |    0 (0.00%)    |  0 (0.00%)   |      256       |
+|    Total for 16 bit    |   13 (27.08%)   | 208 (27.08%) |      768       |
+|                        |                 |              |                |
+|       MAU total        |    18 (8.04%)   | 344 (8.40%)  |      4096      |
+|     Tagalong total     |   32 (28.57%)   | 624 (30.47%) |      2048      |
+|     Overall total      |   50 (14.88%)   | 968 (15.76%) |      6144      |
+-----------------------------------------------------------------------------
 
 
 
 Difference in allocation between critical parse path and overlaying headers:
 Allocation state: Diff
----------------------------------------------------------------------------
-|       PHV Group        | Containers Used | Bits Used  | Bits Available |
-| (container bit widths) |     (% used)    |  (% used)  |                |
----------------------------------------------------------------------------
-|         0 (32)         |    1 (6.25%)    | 32 (6.25%) |      512       |
-|         1 (32)         |    0 (0.00%)    | 0 (0.00%)  |      512       |
-|         2 (32)         |    0 (0.00%)    | 0 (0.00%)  |      512       |
-|         3 (32)         |    0 (0.00%)    | 0 (0.00%)  |      512       |
-|    Total for 32 bit    |    1 (1.56%)    | 32 (1.56%) |      2048      |
-|                        |                 |            |                |
-|         4 (8)          |    0 (0.00%)    | 0 (0.00%)  |      128       |
-|         5 (8)          |    0 (0.00%)    | 0 (0.00%)  |      128       |
-|         6 (8)          |    0 (0.00%)    | 0 (0.00%)  |      128       |
-|         7 (8)          |    0 (0.00%)    | 0 (0.00%)  |      128       |
-|    Total for 8 bit     |    0 (0.00%)    | 0 (0.00%)  |      512       |
-|                        |                 |            |                |
-|         8 (16)         |    0 (0.00%)    | 0 (0.00%)  |      256       |
-|         9 (16)         |    0 (0.00%)    | 0 (0.00%)  |      256       |
-|        10 (16)         |    0 (0.00%)    | 0 (0.00%)  |      256       |
-|        11 (16)         |    0 (0.00%)    | 0 (0.00%)  |      256       |
-|        12 (16)         |    0 (0.00%)    | 0 (0.00%)  |      256       |
-|        13 (16)         |    0 (0.00%)    | 0 (0.00%)  |      256       |
-|    Total for 16 bit    |    0 (0.00%)    | 0 (0.00%)  |      1536      |
-|                        |                 |            |                |
-|       14 (32) T        |    0 (0.00%)    | 0 (0.00%)  |      512       |
-|       15 (32) T        |    0 (0.00%)    | 0 (0.00%)  |      512       |
-|    Total for 32 bit    |    0 (0.00%)    | 0 (0.00%)  |      1024      |
-|                        |                 |            |                |
-|        16 (8) T        |    0 (0.00%)    | 0 (0.00%)  |      128       |
-|        17 (8) T        |    0 (0.00%)    | 0 (0.00%)  |      128       |
-|    Total for 8 bit     |    0 (0.00%)    | 0 (0.00%)  |      256       |
-|                        |                 |            |                |
-|       18 (16) T        |    0 (0.00%)    | 0 (0.00%)  |      256       |
-|       19 (16) T        |    0 (0.00%)    | 0 (0.00%)  |      256       |
-|       20 (16) T        |    0 (0.00%)    | 0 (0.00%)  |      256       |
-|    Total for 16 bit    |    0 (0.00%)    | 0 (0.00%)  |      768       |
-|                        |                 |            |                |
-|       MAU total        |    1 (0.45%)    | 32 (0.78%) |      4096      |
-|     Tagalong total     |    0 (0.00%)    | 0 (0.00%)  |      2048      |
-|     Overall total      |    1 (0.30%)    | 32 (0.52%) |      6144      |
----------------------------------------------------------------------------
+--------------------------------------------------------------------------
+|       PHV Group        | Containers Used | Bits Used | Bits Available |
+| (container bit widths) |     (% used)    |  (% used) |                |
+--------------------------------------------------------------------------
+|         0 (32)         |    0 (0.00%)    | 0 (0.00%) |      512       |
+|         1 (32)         |    0 (0.00%)    | 0 (0.00%) |      512       |
+|         2 (32)         |    0 (0.00%)    | 0 (0.00%) |      512       |
+|         3 (32)         |    0 (0.00%)    | 0 (0.00%) |      512       |
+|    Total for 32 bit    |    0 (0.00%)    | 0 (0.00%) |      2048      |
+|                        |                 |           |                |
+|         4 (8)          |    0 (0.00%)    | 0 (0.00%) |      128       |
+|         5 (8)          |    0 (0.00%)    | 0 (0.00%) |      128       |
+|         6 (8)          |    0 (0.00%)    | 0 (0.00%) |      128       |
+|         7 (8)          |    0 (0.00%)    | 0 (0.00%) |      128       |
+|    Total for 8 bit     |    0 (0.00%)    | 0 (0.00%) |      512       |
+|                        |                 |           |                |
+|         8 (16)         |    0 (0.00%)    | 0 (0.00%) |      256       |
+|         9 (16)         |    0 (0.00%)    | 0 (0.00%) |      256       |
+|        10 (16)         |    0 (0.00%)    | 0 (0.00%) |      256       |
+|        11 (16)         |    0 (0.00%)    | 0 (0.00%) |      256       |
+|        12 (16)         |    0 (0.00%)    | 0 (0.00%) |      256       |
+|        13 (16)         |    0 (0.00%)    | 0 (0.00%) |      256       |
+|    Total for 16 bit    |    0 (0.00%)    | 0 (0.00%) |      1536      |
+|                        |                 |           |                |
+|       14 (32) T        |    0 (0.00%)    | 0 (0.00%) |      512       |
+|       15 (32) T        |    0 (0.00%)    | 0 (0.00%) |      512       |
+|    Total for 32 bit    |    0 (0.00%)    | 0 (0.00%) |      1024      |
+|                        |                 |           |                |
+|        16 (8) T        |    0 (0.00%)    | 0 (0.00%) |      128       |
+|        17 (8) T        |    0 (0.00%)    | 0 (0.00%) |      128       |
+|    Total for 8 bit     |    0 (0.00%)    | 0 (0.00%) |      256       |
+|                        |                 |           |                |
+|       18 (16) T        |    0 (0.00%)    | 0 (0.00%) |      256       |
+|       19 (16) T        |    0 (0.00%)    | 0 (0.00%) |      256       |
+|       20 (16) T        |    0 (0.00%)    | 0 (0.00%) |      256       |
+|    Total for 16 bit    |    0 (0.00%)    | 0 (0.00%) |      768       |
+|                        |                 |           |                |
+|       MAU total        |    0 (0.00%)    | 0 (0.00%) |      4096      |
+|     Tagalong total     |    0 (0.00%)    | 0 (0.00%) |      2048      |
+|     Overall total      |    0 (0.00%)    | 0 (0.00%) |      6144      |
+--------------------------------------------------------------------------
 
->>Event 'pa_meta1' at time 1505214968.21
-   Took 3.72 seconds
+>>Event 'pa_meta1' at time 1505264392.74
+   Took 0.51 seconds
 
 -----------------------------------------------
   Allocating metadata (pass 1)
@@ -2754,47 +2415,47 @@
 ***Allocating phv130[8:0] for ig_intr_md_for_tm.ucast_egress_port[8:0]
 Allocation state after promised meta allocated:
 Allocation state: Final Allocation
-------------------------------------------------------------------------------
-|       PHV Group        | Containers Used |   Bits Used   | Bits Available |
-| (container bit widths) |     (% used)    |    (% used)   |                |
-------------------------------------------------------------------------------
-|         0 (32)         |    6 (37.50%)   |  192 (37.50%) |      512       |
-|         1 (32)         |    0 (0.00%)    |   0 (0.00%)   |      512       |
-|         2 (32)         |    0 (0.00%)    |   0 (0.00%)   |      512       |
-|         3 (32)         |    0 (0.00%)    |   0 (0.00%)   |      512       |
-|    Total for 32 bit    |    6 (9.38%)    |  192 (9.38%)  |      2048      |
-|                        |                 |               |                |
-|         4 (8)          |    3 (18.75%)   |  24 (18.75%)  |      128       |
-|         5 (8)          |    1 (6.25%)    |   8 (6.25%)   |      128       |
-|         6 (8)          |    0 (0.00%)    |   0 (0.00%)   |      128       |
-|         7 (8)          |    0 (0.00%)    |   0 (0.00%)   |      128       |
-|    Total for 8 bit     |    4 (6.25%)    |   32 (6.25%)  |      512       |
-|                        |                 |               |                |
-|         8 (16)         |    6 (37.50%)   |  89 (34.77%)  |      256       |
-|         9 (16)         |    1 (6.25%)    |   16 (6.25%)  |      256       |
-|        10 (16)         |    0 (0.00%)    |   0 (0.00%)   |      256       |
-|        11 (16)         |    0 (0.00%)    |   0 (0.00%)   |      256       |
-|        12 (16)         |    0 (0.00%)    |   0 (0.00%)   |      256       |
-|        13 (16)         |    0 (0.00%)    |   0 (0.00%)   |      256       |
-|    Total for 16 bit    |    7 (7.29%)    |  105 (6.84%)  |      1536      |
-|                        |                 |               |                |
-|       14 (32) T        |   11 (68.75%)   |  352 (68.75%) |      512       |
-|       15 (32) T        |    0 (0.00%)    |   0 (0.00%)   |      512       |
-|    Total for 32 bit    |   11 (34.38%)   |  352 (34.38%) |      1024      |
-|                        |                 |               |                |
-|        16 (8) T        |   11 (68.75%)   |  88 (68.75%)  |      128       |
-|        17 (8) T        |    0 (0.00%)    |   0 (0.00%)   |      128       |
-|    Total for 8 bit     |   11 (34.38%)   |  88 (34.38%)  |      256       |
-|                        |                 |               |                |
-|       18 (16) T        |   10 (62.50%)   |  160 (62.50%) |      256       |
-|       19 (16) T        |    5 (31.25%)   |  80 (31.25%)  |      256       |
-|       20 (16) T        |    0 (0.00%)    |   0 (0.00%)   |      256       |
-|    Total for 16 bit    |   15 (31.25%)   |  240 (31.25%) |      768       |
-|                        |                 |               |                |
-|       MAU total        |    17 (7.59%)   |  329 (8.03%)  |      4096      |
-|     Tagalong total     |   37 (33.04%)   |  680 (33.20%) |      2048      |
-|     Overall total      |   54 (16.07%)   | 1009 (16.42%) |      6144      |
-------------------------------------------------------------------------------
+-----------------------------------------------------------------------------
+|       PHV Group        | Containers Used |  Bits Used   | Bits Available |
+| (container bit widths) |     (% used)    |   (% used)   |                |
+-----------------------------------------------------------------------------
+|         0 (32)         |    6 (37.50%)   | 192 (37.50%) |      512       |
+|         1 (32)         |    0 (0.00%)    |  0 (0.00%)   |      512       |
+|         2 (32)         |    0 (0.00%)    |  0 (0.00%)   |      512       |
+|         3 (32)         |    0 (0.00%)    |  0 (0.00%)   |      512       |
+|    Total for 32 bit    |    6 (9.38%)    | 192 (9.38%)  |      2048      |
+|                        |                 |              |                |
+|         4 (8)          |    4 (25.00%)   | 32 (25.00%)  |      128       |
+|         5 (8)          |    1 (6.25%)    |  8 (6.25%)   |      128       |
+|         6 (8)          |    0 (0.00%)    |  0 (0.00%)   |      128       |
+|         7 (8)          |    0 (0.00%)    |  0 (0.00%)   |      128       |
+|    Total for 8 bit     |    5 (7.81%)    |  40 (7.81%)  |      512       |
+|                        |                 |              |                |
+|         8 (16)         |    7 (43.75%)   | 105 (41.02%) |      256       |
+|         9 (16)         |    1 (6.25%)    |  16 (6.25%)  |      256       |
+|        10 (16)         |    0 (0.00%)    |  0 (0.00%)   |      256       |
+|        11 (16)         |    0 (0.00%)    |  0 (0.00%)   |      256       |
+|        12 (16)         |    0 (0.00%)    |  0 (0.00%)   |      256       |
+|        13 (16)         |    0 (0.00%)    |  0 (0.00%)   |      256       |
+|    Total for 16 bit    |    8 (8.33%)    | 121 (7.88%)  |      1536      |
+|                        |                 |              |                |
+|       14 (32) T        |   11 (68.75%)   | 352 (68.75%) |      512       |
+|       15 (32) T        |    0 (0.00%)    |  0 (0.00%)   |      512       |
+|    Total for 32 bit    |   11 (34.38%)   | 352 (34.38%) |      1024      |
+|                        |                 |              |                |
+|        16 (8) T        |    8 (50.00%)   | 64 (50.00%)  |      128       |
+|        17 (8) T        |    0 (0.00%)    |  0 (0.00%)   |      128       |
+|    Total for 8 bit     |    8 (25.00%)   | 64 (25.00%)  |      256       |
+|                        |                 |              |                |
+|       18 (16) T        |   13 (81.25%)   | 208 (81.25%) |      256       |
+|       19 (16) T        |    0 (0.00%)    |  0 (0.00%)   |      256       |
+|       20 (16) T        |    0 (0.00%)    |  0 (0.00%)   |      256       |
+|    Total for 16 bit    |   13 (27.08%)   | 208 (27.08%) |      768       |
+|                        |                 |              |                |
+|       MAU total        |    19 (8.48%)   | 353 (8.62%)  |      4096      |
+|     Tagalong total     |   32 (28.57%)   | 624 (30.47%) |      2048      |
+|     Overall total      |   51 (15.18%)   | 977 (15.90%) |      6144      |
+-----------------------------------------------------------------------------
 
 Allocation state difference after promised meta allocated:
 Allocation state: Diff
@@ -2841,55 +2502,55 @@
 --------------------------------------------------------------------------
 
 Sorted metadata field instances to allocate: 0 / 0 bits (0 ingress bits and 0 egress bits)
->>Event 'pa_pov' at time 1505214968.31
-   Took 0.10 seconds
+>>Event 'pa_pov' at time 1505264392.84
+   Took 0.11 seconds
 
 -----------------------------------------------
   Allocating POV
 -----------------------------------------------
 Allocation Step
 Allocation state: Final Allocation
-------------------------------------------------------------------------------
-|       PHV Group        | Containers Used |   Bits Used   | Bits Available |
-| (container bit widths) |     (% used)    |    (% used)   |                |
-------------------------------------------------------------------------------
-|         0 (32)         |    6 (37.50%)   |  192 (37.50%) |      512       |
-|         1 (32)         |    0 (0.00%)    |   0 (0.00%)   |      512       |
-|         2 (32)         |    0 (0.00%)    |   0 (0.00%)   |      512       |
-|         3 (32)         |    0 (0.00%)    |   0 (0.00%)   |      512       |
-|    Total for 32 bit    |    6 (9.38%)    |  192 (9.38%)  |      2048      |
-|                        |                 |               |                |
-|         4 (8)          |    3 (18.75%)   |  24 (18.75%)  |      128       |
-|         5 (8)          |    1 (6.25%)    |   8 (6.25%)   |      128       |
-|         6 (8)          |    0 (0.00%)    |   0 (0.00%)   |      128       |
-|         7 (8)          |    0 (0.00%)    |   0 (0.00%)   |      128       |
-|    Total for 8 bit     |    4 (6.25%)    |   32 (6.25%)  |      512       |
-|                        |                 |               |                |
-|         8 (16)         |    6 (37.50%)   |  89 (34.77%)  |      256       |
-|         9 (16)         |    1 (6.25%)    |   16 (6.25%)  |      256       |
-|        10 (16)         |    0 (0.00%)    |   0 (0.00%)   |      256       |
-|        11 (16)         |    0 (0.00%)    |   0 (0.00%)   |      256       |
-|        12 (16)         |    0 (0.00%)    |   0 (0.00%)   |      256       |
-|        13 (16)         |    0 (0.00%)    |   0 (0.00%)   |      256       |
-|    Total for 16 bit    |    7 (7.29%)    |  105 (6.84%)  |      1536      |
-|                        |                 |               |                |
-|       14 (32) T        |   11 (68.75%)   |  352 (68.75%) |      512       |
-|       15 (32) T        |    0 (0.00%)    |   0 (0.00%)   |      512       |
-|    Total for 32 bit    |   11 (34.38%)   |  352 (34.38%) |      1024      |
-|                        |                 |               |                |
-|        16 (8) T        |   11 (68.75%)   |  88 (68.75%)  |      128       |
-|        17 (8) T        |    0 (0.00%)    |   0 (0.00%)   |      128       |
-|    Total for 8 bit     |   11 (34.38%)   |  88 (34.38%)  |      256       |
-|                        |                 |               |                |
-|       18 (16) T        |   10 (62.50%)   |  160 (62.50%) |      256       |
-|       19 (16) T        |    5 (31.25%)   |  80 (31.25%)  |      256       |
-|       20 (16) T        |    0 (0.00%)    |   0 (0.00%)   |      256       |
-|    Total for 16 bit    |   15 (31.25%)   |  240 (31.25%) |      768       |
-|                        |                 |               |                |
-|       MAU total        |    17 (7.59%)   |  329 (8.03%)  |      4096      |
-|     Tagalong total     |   37 (33.04%)   |  680 (33.20%) |      2048      |
-|     Overall total      |   54 (16.07%)   | 1009 (16.42%) |      6144      |
-------------------------------------------------------------------------------
+-----------------------------------------------------------------------------
+|       PHV Group        | Containers Used |  Bits Used   | Bits Available |
+| (container bit widths) |     (% used)    |   (% used)   |                |
+-----------------------------------------------------------------------------
+|         0 (32)         |    6 (37.50%)   | 192 (37.50%) |      512       |
+|         1 (32)         |    0 (0.00%)    |  0 (0.00%)   |      512       |
+|         2 (32)         |    0 (0.00%)    |  0 (0.00%)   |      512       |
+|         3 (32)         |    0 (0.00%)    |  0 (0.00%)   |      512       |
+|    Total for 32 bit    |    6 (9.38%)    | 192 (9.38%)  |      2048      |
+|                        |                 |              |                |
+|         4 (8)          |    4 (25.00%)   | 32 (25.00%)  |      128       |
+|         5 (8)          |    1 (6.25%)    |  8 (6.25%)   |      128       |
+|         6 (8)          |    0 (0.00%)    |  0 (0.00%)   |      128       |
+|         7 (8)          |    0 (0.00%)    |  0 (0.00%)   |      128       |
+|    Total for 8 bit     |    5 (7.81%)    |  40 (7.81%)  |      512       |
+|                        |                 |              |                |
+|         8 (16)         |    7 (43.75%)   | 105 (41.02%) |      256       |
+|         9 (16)         |    1 (6.25%)    |  16 (6.25%)  |      256       |
+|        10 (16)         |    0 (0.00%)    |  0 (0.00%)   |      256       |
+|        11 (16)         |    0 (0.00%)    |  0 (0.00%)   |      256       |
+|        12 (16)         |    0 (0.00%)    |  0 (0.00%)   |      256       |
+|        13 (16)         |    0 (0.00%)    |  0 (0.00%)   |      256       |
+|    Total for 16 bit    |    8 (8.33%)    | 121 (7.88%)  |      1536      |
+|                        |                 |              |                |
+|       14 (32) T        |   11 (68.75%)   | 352 (68.75%) |      512       |
+|       15 (32) T        |    0 (0.00%)    |  0 (0.00%)   |      512       |
+|    Total for 32 bit    |   11 (34.38%)   | 352 (34.38%) |      1024      |
+|                        |                 |              |                |
+|        16 (8) T        |    8 (50.00%)   | 64 (50.00%)  |      128       |
+|        17 (8) T        |    0 (0.00%)    |  0 (0.00%)   |      128       |
+|    Total for 8 bit     |    8 (25.00%)   | 64 (25.00%)  |      256       |
+|                        |                 |              |                |
+|       18 (16) T        |   13 (81.25%)   | 208 (81.25%) |      256       |
+|       19 (16) T        |    0 (0.00%)    |  0 (0.00%)   |      256       |
+|       20 (16) T        |    0 (0.00%)    |  0 (0.00%)   |      256       |
+|    Total for 16 bit    |   13 (27.08%)   | 208 (27.08%) |      768       |
+|                        |                 |              |                |
+|       MAU total        |    19 (8.48%)   | 353 (8.62%)  |      4096      |
+|     Tagalong total     |   32 (28.57%)   | 624 (30.47%) |      2048      |
+|     Overall total      |   51 (15.18%)   | 977 (15.90%) |      6144      |
+-----------------------------------------------------------------------------
 
 Sorted POV field instances to allocate (with best pack): 13
     0: --validity_check--packet_in_hdr (ingress)  -- max pov share 6 / best pack 5
@@ -2913,19 +2574,19 @@
   Best pack group: (6)
 
 Looking for container to share POV bit in from already allocated containers for POV.
-Container availability (not used yet for POV): total 193 / partial 1
+Container availability (not used yet for POV): total 191 / partial 1
 
 Looking for container to share POV bit in from already allocated containers that have not been used for POV.
->>Choose container phv67, starting at container bit 0, which results in 7 bits still available (unused = 8 and could fit = 7).
+>>Choose container phv68, starting at container bit 0, which results in 7 bits still available (unused = 8 and could fit = 7).
   >> Decided to allocate new container
-Required container phv67
-***Allocating phv67[0:0] for --validity_check--packet_in_hdr[0:0]
-***Allocating phv67[1:1] for --validity_check--packet_out_hdr[0:0]
-***Allocating phv67[2:2] for --validity_check--ethernet[0:0]
-***Allocating phv67[3:3] for --validity_check--ipv4[0:0]
-***Allocating phv67[4:4] for --validity_check--tcp[0:0]
-***Allocating phv67[5:5] for --validity_check--udp[0:0]
-***Allocating phv67[6:6] for --validity_check--metadata_bridge[0:0]
+Required container phv68
+***Allocating phv68[0:0] for --validity_check--packet_in_hdr[0:0]
+***Allocating phv68[1:1] for --validity_check--packet_out_hdr[0:0]
+***Allocating phv68[2:2] for --validity_check--ethernet[0:0]
+***Allocating phv68[3:3] for --validity_check--ipv4[0:0]
+***Allocating phv68[4:4] for --validity_check--tcp[0:0]
+***Allocating phv68[5:5] for --validity_check--udp[0:0]
+***Allocating phv68[6:6] for --validity_check--metadata_bridge[0:0]
 
 Working on
 --validity_check--packet_out_hdr <1 bits ingress parsed pov R W>
@@ -2993,12 +2654,12 @@
 
 Sum of container bit widths POVs found in: 16
  ingress
-    phv67 (8 bits)
+    phv68 (8 bits)
   >> 8 total bits
  egress
     phv81 (8 bits)
   >> 8 total bits
->>Event 'pa_meta2' at time 1505214968.43
+>>Event 'pa_meta2' at time 1505264392.97
    Took 0.12 seconds
 
 -----------------------------------------------
@@ -3009,47 +2670,47 @@
 Promised metadata field instances to allocate: 0 / 0 bits (0 ingress bits and 0 egress bits)
 Allocation state after promised meta allocated:
 Allocation state: Final Allocation
-------------------------------------------------------------------------------
-|       PHV Group        | Containers Used |   Bits Used   | Bits Available |
-| (container bit widths) |     (% used)    |    (% used)   |                |
-------------------------------------------------------------------------------
-|         0 (32)         |    6 (37.50%)   |  192 (37.50%) |      512       |
-|         1 (32)         |    0 (0.00%)    |   0 (0.00%)   |      512       |
-|         2 (32)         |    0 (0.00%)    |   0 (0.00%)   |      512       |
-|         3 (32)         |    0 (0.00%)    |   0 (0.00%)   |      512       |
-|    Total for 32 bit    |    6 (9.38%)    |  192 (9.38%)  |      2048      |
-|                        |                 |               |                |
-|         4 (8)          |    4 (25.00%)   |  31 (24.22%)  |      128       |
-|         5 (8)          |    2 (12.50%)   |  14 (10.94%)  |      128       |
-|         6 (8)          |    0 (0.00%)    |   0 (0.00%)   |      128       |
-|         7 (8)          |    0 (0.00%)    |   0 (0.00%)   |      128       |
-|    Total for 8 bit     |    6 (9.38%)    |   45 (8.79%)  |      512       |
-|                        |                 |               |                |
-|         8 (16)         |    6 (37.50%)   |  89 (34.77%)  |      256       |
-|         9 (16)         |    1 (6.25%)    |   16 (6.25%)  |      256       |
-|        10 (16)         |    0 (0.00%)    |   0 (0.00%)   |      256       |
-|        11 (16)         |    0 (0.00%)    |   0 (0.00%)   |      256       |
-|        12 (16)         |    0 (0.00%)    |   0 (0.00%)   |      256       |
-|        13 (16)         |    0 (0.00%)    |   0 (0.00%)   |      256       |
-|    Total for 16 bit    |    7 (7.29%)    |  105 (6.84%)  |      1536      |
-|                        |                 |               |                |
-|       14 (32) T        |   11 (68.75%)   |  352 (68.75%) |      512       |
-|       15 (32) T        |    0 (0.00%)    |   0 (0.00%)   |      512       |
-|    Total for 32 bit    |   11 (34.38%)   |  352 (34.38%) |      1024      |
-|                        |                 |               |                |
-|        16 (8) T        |   11 (68.75%)   |  88 (68.75%)  |      128       |
-|        17 (8) T        |    0 (0.00%)    |   0 (0.00%)   |      128       |
-|    Total for 8 bit     |   11 (34.38%)   |  88 (34.38%)  |      256       |
-|                        |                 |               |                |
-|       18 (16) T        |   10 (62.50%)   |  160 (62.50%) |      256       |
-|       19 (16) T        |    5 (31.25%)   |  80 (31.25%)  |      256       |
-|       20 (16) T        |    0 (0.00%)    |   0 (0.00%)   |      256       |
-|    Total for 16 bit    |   15 (31.25%)   |  240 (31.25%) |      768       |
-|                        |                 |               |                |
-|       MAU total        |    19 (8.48%)   |  342 (8.35%)  |      4096      |
-|     Tagalong total     |   37 (33.04%)   |  680 (33.20%) |      2048      |
-|     Overall total      |   56 (16.67%)   | 1022 (16.63%) |      6144      |
-------------------------------------------------------------------------------
+-----------------------------------------------------------------------------
+|       PHV Group        | Containers Used |  Bits Used   | Bits Available |
+| (container bit widths) |     (% used)    |   (% used)   |                |
+-----------------------------------------------------------------------------
+|         0 (32)         |    6 (37.50%)   | 192 (37.50%) |      512       |
+|         1 (32)         |    0 (0.00%)    |  0 (0.00%)   |      512       |
+|         2 (32)         |    0 (0.00%)    |  0 (0.00%)   |      512       |
+|         3 (32)         |    0 (0.00%)    |  0 (0.00%)   |      512       |
+|    Total for 32 bit    |    6 (9.38%)    | 192 (9.38%)  |      2048      |
+|                        |                 |              |                |
+|         4 (8)          |    5 (31.25%)   | 39 (30.47%)  |      128       |
+|         5 (8)          |    2 (12.50%)   | 14 (10.94%)  |      128       |
+|         6 (8)          |    0 (0.00%)    |  0 (0.00%)   |      128       |
+|         7 (8)          |    0 (0.00%)    |  0 (0.00%)   |      128       |
+|    Total for 8 bit     |    7 (10.94%)   | 53 (10.35%)  |      512       |
+|                        |                 |              |                |
+|         8 (16)         |    7 (43.75%)   | 105 (41.02%) |      256       |
+|         9 (16)         |    1 (6.25%)    |  16 (6.25%)  |      256       |
+|        10 (16)         |    0 (0.00%)    |  0 (0.00%)   |      256       |
+|        11 (16)         |    0 (0.00%)    |  0 (0.00%)   |      256       |
+|        12 (16)         |    0 (0.00%)    |  0 (0.00%)   |      256       |
+|        13 (16)         |    0 (0.00%)    |  0 (0.00%)   |      256       |
+|    Total for 16 bit    |    8 (8.33%)    | 121 (7.88%)  |      1536      |
+|                        |                 |              |                |
+|       14 (32) T        |   11 (68.75%)   | 352 (68.75%) |      512       |
+|       15 (32) T        |    0 (0.00%)    |  0 (0.00%)   |      512       |
+|    Total for 32 bit    |   11 (34.38%)   | 352 (34.38%) |      1024      |
+|                        |                 |              |                |
+|        16 (8) T        |    8 (50.00%)   | 64 (50.00%)  |      128       |
+|        17 (8) T        |    0 (0.00%)    |  0 (0.00%)   |      128       |
+|    Total for 8 bit     |    8 (25.00%)   | 64 (25.00%)  |      256       |
+|                        |                 |              |                |
+|       18 (16) T        |   13 (81.25%)   | 208 (81.25%) |      256       |
+|       19 (16) T        |    0 (0.00%)    |  0 (0.00%)   |      256       |
+|       20 (16) T        |    0 (0.00%)    |  0 (0.00%)   |      256       |
+|    Total for 16 bit    |   13 (27.08%)   | 208 (27.08%) |      768       |
+|                        |                 |              |                |
+|       MAU total        |    21 (9.38%)   | 366 (8.94%)  |      4096      |
+|     Tagalong total     |   32 (28.57%)   | 624 (30.47%) |      2048      |
+|     Overall total      |   53 (15.77%)   | 990 (16.11%) |      6144      |
+-----------------------------------------------------------------------------
 
 Allocation state difference after promised meta allocated:
 Allocation state: Diff
@@ -3125,11 +2786,11 @@
   Group 1 32 bits -- avail 16 and promised None -- ingress promised None and remain None and req None -- egress promised None and remain None and req None -- as if deparsed False -- container_to_use None -- fails True
   Group 2 32 bits -- avail 16 and promised 1 -- ingress promised 1 and remain 15 and req 0 -- egress promised 0 and remain 15 and req 0 -- as if deparsed False -- container_to_use phv32 -- fails False
   Group 3 32 bits -- avail 16 and promised 1 -- ingress promised 1 and remain 15 and req 0 -- egress promised 0 and remain 15 and req 0 -- as if deparsed False -- container_to_use phv48 -- fails False
-  Group 4 8 bits -- avail 12 and promised None -- ingress promised None and remain None and req None -- egress promised None and remain None and req None -- as if deparsed False -- container_to_use None -- fails True
+  Group 4 8 bits -- avail 11 and promised None -- ingress promised None and remain None and req None -- egress promised None and remain None and req None -- as if deparsed False -- container_to_use None -- fails True
   Group 5 8 bits -- avail 14 and promised None -- ingress promised None and remain None and req None -- egress promised None and remain None and req None -- as if deparsed False -- container_to_use None -- fails True
   Group 6 8 bits -- avail 16 and promised None -- ingress promised None and remain None and req None -- egress promised None and remain None and req None -- as if deparsed False -- container_to_use None -- fails True
   Group 7 8 bits -- avail 16 and promised None -- ingress promised None and remain None and req None -- egress promised None and remain None and req None -- as if deparsed False -- container_to_use None -- fails True
-  Group 8 16 bits -- avail 10 and promised 1 -- ingress promised 1 and remain 9 and req 0 -- egress promised 0 and remain 8 and req 0 -- as if deparsed False -- container_to_use phv134 -- fails False
+  Group 8 16 bits -- avail 9 and promised 1 -- ingress promised 1 and remain 8 and req 0 -- egress promised 0 and remain 8 and req 0 -- as if deparsed False -- container_to_use phv135 -- fails False
   Group 9 16 bits -- avail 15 and promised None -- ingress promised None and remain None and req None -- egress promised None and remain None and req None -- as if deparsed False -- container_to_use None -- fails True
   Group 10 16 bits -- avail 16 and promised 1 -- ingress promised 1 and remain 15 and req 0 -- egress promised 0 and remain 15 and req 0 -- as if deparsed False -- container_to_use phv160 -- fails False
   Group 11 16 bits -- avail 16 and promised 1 -- ingress promised 1 and remain 15 and req 0 -- egress promised 0 and remain 15 and req 0 -- as if deparsed False -- container_to_use phv176 -- fails False
@@ -3139,7 +2800,7 @@
 >>req_alignment = None
 >>allowed_container_start_bits = None
 >>req_container = None
-***Allocating phv134[15:0] for ecmp_metadata.group_id[15:0]
+***Allocating phv135[15:0] for ecmp_metadata.group_id[15:0]
 
 ---------------------------------------
 Working on:
@@ -3166,11 +2827,11 @@
   Group 1 32 bits -- avail 16 and promised None -- ingress promised None and remain None and req None -- egress promised None and remain None and req None -- as if deparsed False -- container_to_use None -- fails True
   Group 2 32 bits -- avail 16 and promised 1 -- ingress promised 1 and remain 15 and req 0 -- egress promised 0 and remain 15 and req 0 -- as if deparsed False -- container_to_use phv32 -- fails False
   Group 3 32 bits -- avail 16 and promised 1 -- ingress promised 1 and remain 15 and req 0 -- egress promised 0 and remain 15 and req 0 -- as if deparsed False -- container_to_use phv48 -- fails False
-  Group 4 8 bits -- avail 12 and promised None -- ingress promised None and remain None and req None -- egress promised None and remain None and req None -- as if deparsed False -- container_to_use None -- fails True
+  Group 4 8 bits -- avail 11 and promised None -- ingress promised None and remain None and req None -- egress promised None and remain None and req None -- as if deparsed False -- container_to_use None -- fails True
   Group 5 8 bits -- avail 14 and promised None -- ingress promised None and remain None and req None -- egress promised None and remain None and req None -- as if deparsed False -- container_to_use None -- fails True
   Group 6 8 bits -- avail 16 and promised None -- ingress promised None and remain None and req None -- egress promised None and remain None and req None -- as if deparsed False -- container_to_use None -- fails True
   Group 7 8 bits -- avail 16 and promised None -- ingress promised None and remain None and req None -- egress promised None and remain None and req None -- as if deparsed False -- container_to_use None -- fails True
-  Group 8 16 bits -- avail 9 and promised 1 -- ingress promised 1 and remain 8 and req 0 -- egress promised 0 and remain 8 and req 0 -- as if deparsed False -- container_to_use phv135 -- fails False
+  Group 8 16 bits -- avail 8 and promised 1 -- ingress promised 1 and remain 7 and req 0 -- egress promised 0 and remain 7 and req 0 -- as if deparsed False -- container_to_use phv136 -- fails False
   Group 9 16 bits -- avail 15 and promised None -- ingress promised None and remain None and req None -- egress promised None and remain None and req None -- as if deparsed False -- container_to_use None -- fails True
   Group 10 16 bits -- avail 16 and promised 1 -- ingress promised 1 and remain 15 and req 0 -- egress promised 0 and remain 15 and req 0 -- as if deparsed False -- container_to_use phv160 -- fails False
   Group 11 16 bits -- avail 16 and promised 1 -- ingress promised 1 and remain 15 and req 0 -- egress promised 0 and remain 15 and req 0 -- as if deparsed False -- container_to_use phv176 -- fails False
@@ -3180,7 +2841,7 @@
 >>req_alignment = None
 >>allowed_container_start_bits = None
 >>req_container = None
-***Allocating phv135[15:0] for ecmp_metadata.selector[15:0]
+***Allocating phv136[15:0] for ecmp_metadata.selector[15:0]
 
 ---------------------------------------
 Working on:
@@ -3207,11 +2868,11 @@
   Group 1 32 bits -- avail 16 and promised None -- ingress promised None and remain None and req None -- egress promised None and remain None and req None -- as if deparsed False -- container_to_use None -- fails True
   Group 2 32 bits -- avail 16 and promised 1 -- ingress promised 1 and remain 15 and req 1 -- egress promised 0 and remain 12 and req 0 -- as if deparsed True -- container_to_use phv32 -- fails False
   Group 3 32 bits -- avail 16 and promised 1 -- ingress promised 1 and remain 15 and req 1 -- egress promised 0 and remain 12 and req 0 -- as if deparsed True -- container_to_use phv48 -- fails False
-  Group 4 8 bits -- avail 12 and promised 1 -- ingress promised 1 and remain 11 and req 1 -- egress promised 0 and remain 8 and req 0 -- as if deparsed True -- container_to_use phv68 -- fails False
+  Group 4 8 bits -- avail 11 and promised 1 -- ingress promised 1 and remain 10 and req 1 -- egress promised 0 and remain 8 and req 0 -- as if deparsed True -- container_to_use phv69 -- fails False
   Group 5 8 bits -- avail 14 and promised None -- ingress promised None and remain None and req None -- egress promised None and remain None and req None -- as if deparsed False -- container_to_use None -- fails True
   Group 6 8 bits -- avail 16 and promised 1 -- ingress promised 1 and remain 15 and req 1 -- egress promised 0 and remain 8 and req 0 -- as if deparsed True -- container_to_use phv96 -- fails False
   Group 7 8 bits -- avail 16 and promised 1 -- ingress promised 1 and remain 15 and req 1 -- egress promised 0 and remain 8 and req 0 -- as if deparsed True -- container_to_use phv112 -- fails False
-  Group 8 16 bits -- avail 8 and promised 1 -- ingress promised 1 and remain 7 and req 1 -- egress promised 0 and remain 0 and req 0 -- as if deparsed True -- container_to_use phv136 -- fails False
+  Group 8 16 bits -- avail 7 and promised 1 -- ingress promised 1 and remain 6 and req 1 -- egress promised 0 and remain 0 and req 0 -- as if deparsed True -- container_to_use phv137 -- fails False
   Group 9 16 bits -- avail 15 and promised None -- ingress promised None and remain None and req None -- egress promised None and remain None and req None -- as if deparsed False -- container_to_use None -- fails True
   Group 10 16 bits -- avail 16 and promised 1 -- ingress promised 1 and remain 15 and req 1 -- egress promised 0 and remain 8 and req 0 -- as if deparsed True -- container_to_use phv160 -- fails False
   Group 11 16 bits -- avail 16 and promised 1 -- ingress promised 1 and remain 15 and req 1 -- egress promised 0 and remain 8 and req 0 -- as if deparsed True -- container_to_use phv176 -- fails False
@@ -3224,8 +2885,8 @@
   case 2: looking at allowed start bits [0, 1, 2, 3, 4, 5, 6, 7]
     final start_bit = 5
   (1) msb_offset = 8
-***Allocating phv68[7:5] for ig_intr_md_for_tm.drop_ctl[2:0]
->>Event 'pa_meta_init' at time 1505214968.59
+***Allocating phv69[7:5] for ig_intr_md_for_tm.drop_ctl[2:0]
+>>Event 'pa_meta_init' at time 1505264393.13
    Took 0.16 seconds
 
 -----------------------------------------------
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/logs/pa.results.log b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/logs/pa.results.log
index f790718..5d2349e 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/logs/pa.results.log
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/logs/pa.results.log
@@ -1,7 +1,7 @@
 +---------------------------------------------------------------------+
 |  Log file: pa.results.log                                           |
 |  Compiler version: 5.1.0 (fca32d1)                                  |
-|  Created on: Tue Sep 12 11:15:53 2017                               |
+|  Created on: Wed Sep 13 00:59:40 2017                               |
 +---------------------------------------------------------------------+
 
 Program: ecmp
@@ -17,36 +17,36 @@
 |         3 (32)         |    0 (0.00%)    |   0 (0.00%)   |      512       |
 |    Total for 32 bit    |    6 (9.38%)    |  192 (9.38%)  |      2048      |
 |                        |                 |               |                |
-|         4 (8)          |    5 (31.25%)   |  34 (26.56%)  |      128       |
+|         4 (8)          |    6 (37.50%)   |  42 (32.81%)  |      128       |
 |         5 (8)          |    2 (12.50%)   |  14 (10.94%)  |      128       |
 |         6 (8)          |    0 (0.00%)    |   0 (0.00%)   |      128       |
 |         7 (8)          |    0 (0.00%)    |   0 (0.00%)   |      128       |
-|    Total for 8 bit     |    7 (10.94%)   |   48 (9.38%)  |      512       |
+|    Total for 8 bit     |    8 (12.50%)   |  56 (10.94%)  |      512       |
 |                        |                 |               |                |
-|         8 (16)         |    8 (50.00%)   |  121 (47.27%) |      256       |
+|         8 (16)         |    9 (56.25%)   |  137 (53.52%) |      256       |
 |         9 (16)         |    1 (6.25%)    |   16 (6.25%)  |      256       |
 |        10 (16)         |    0 (0.00%)    |   0 (0.00%)   |      256       |
 |        11 (16)         |    0 (0.00%)    |   0 (0.00%)   |      256       |
 |        12 (16)         |    0 (0.00%)    |   0 (0.00%)   |      256       |
 |        13 (16)         |    0 (0.00%)    |   0 (0.00%)   |      256       |
-|    Total for 16 bit    |    9 (9.38%)    |  137 (8.92%)  |      1536      |
+|    Total for 16 bit    |   10 (10.42%)   |  153 (9.96%)  |      1536      |
 |                        |                 |               |                |
 |       14 (32) T        |   11 (68.75%)   |  352 (68.75%) |      512       |
 |       15 (32) T        |    0 (0.00%)    |   0 (0.00%)   |      512       |
 |    Total for 32 bit    |   11 (34.38%)   |  352 (34.38%) |      1024      |
 |                        |                 |               |                |
-|        16 (8) T        |   11 (68.75%)   |  88 (68.75%)  |      128       |
+|        16 (8) T        |    8 (50.00%)   |  64 (50.00%)  |      128       |
 |        17 (8) T        |    0 (0.00%)    |   0 (0.00%)   |      128       |
-|    Total for 8 bit     |   11 (34.38%)   |  88 (34.38%)  |      256       |
+|    Total for 8 bit     |    8 (25.00%)   |  64 (25.00%)  |      256       |
 |                        |                 |               |                |
-|       18 (16) T        |   10 (62.50%)   |  160 (62.50%) |      256       |
-|       19 (16) T        |    5 (31.25%)   |  80 (31.25%)  |      256       |
+|       18 (16) T        |   13 (81.25%)   |  208 (81.25%) |      256       |
+|       19 (16) T        |    0 (0.00%)    |   0 (0.00%)   |      256       |
 |       20 (16) T        |    0 (0.00%)    |   0 (0.00%)   |      256       |
-|    Total for 16 bit    |   15 (31.25%)   |  240 (31.25%) |      768       |
+|    Total for 16 bit    |   13 (27.08%)   |  208 (27.08%) |      768       |
 |                        |                 |               |                |
-|       MAU total        |    22 (9.82%)   |  377 (9.20%)  |      4096      |
-|     Tagalong total     |   37 (33.04%)   |  680 (33.20%) |      2048      |
-|     Overall total      |   59 (17.56%)   | 1057 (17.20%) |      6144      |
+|       MAU total        |   24 (10.71%)   |  401 (9.79%)  |      4096      |
+|     Tagalong total     |   32 (28.57%)   |  624 (30.47%) |      2048      |
+|     Overall total      |   56 (16.67%)   | 1025 (16.68%) |      6144      |
 ------------------------------------------------------------------------------
 
 --------------------------------------------
@@ -59,25 +59,27 @@
   32-bit PHV 1 (ingress): phv1[23:8] = ipv4.hdrChecksum[15:0] (tagalong capable) (deparsed)
   32-bit PHV 1 (ingress): phv1[7:0] = ipv4.srcAddr[31:24] (deparsed)
   32-bit PHV 2 (ingress): phv2[31:0] = ipv4.dstAddr[31:0] (deparsed)
-  32-bit PHV 3 (ingress): phv3[31:0] = ethernet.dstAddr[39:8] (deparsed)
-  32-bit PHV 4 (ingress): phv4[31:0] = ethernet.srcAddr[31:0] (deparsed)
-  32-bit PHV 5 (ingress): phv5[31:16] = udp.srcPort[15:0] (deparsed)
-  32-bit PHV 5 (ingress): phv5[15:0] = udp.dstPort[15:0] (deparsed)
+  32-bit PHV 3 (ingress): phv3[31:24] = tcp.dstPort[7:0] (deparsed)
+  32-bit PHV 3 (ingress): phv3[23:0] = tcp.seqNo[31:8] (tagalong capable) (deparsed)
+  32-bit PHV 4 (ingress): phv4[31:0] = ethernet.dstAddr[39:8] (deparsed)
+  32-bit PHV 5 (ingress): phv5[31:0] = ethernet.srcAddr[31:0] (deparsed)
   >> 6 in ingress and 0 in egress
 
 Allocations in Group 4 8 bits
   8-bit PHV 64 (ingress): phv64[7:0] = ipv4.srcAddr[23:16] (deparsed)
-  8-bit PHV 65 (ingress): phv65[7:0] = ethernet.dstAddr[47:40] (deparsed)
-  8-bit PHV 66 (ingress): phv66[7:0] = ethernet.srcAddr[39:32] (deparsed)
-  8-bit PHV 67 (ingress): phv67[6:6] = --validity_check--metadata_bridge[0:0] (deparsed)
-  8-bit PHV 67 (ingress): phv67[5:5] = --validity_check--udp[0:0] (deparsed)
-  8-bit PHV 67 (ingress): phv67[4:4] = --validity_check--tcp[0:0] (deparsed)
-  8-bit PHV 67 (ingress): phv67[3:3] = --validity_check--ipv4[0:0] (deparsed)
-  8-bit PHV 67 (ingress): phv67[2:2] = --validity_check--ethernet[0:0] (deparsed)
-  8-bit PHV 67 (ingress): phv67[1:1] = --validity_check--packet_out_hdr[0:0] (deparsed)
-  8-bit PHV 67 (ingress): phv67[0:0] = --validity_check--packet_in_hdr[0:0] (deparsed)
-  8-bit PHV 68 (ingress): phv68[7:5] = ig_intr_md_for_tm.drop_ctl[2:0] (deparsed)
-  >> 5 in ingress and 0 in egress
+  8-bit PHV 65 (ingress): phv65[7:0] = tcp.srcPort[15:8] (deparsed)
+  8-bit PHV 65 (ingress): phv65[7:0] = udp.srcPort[7:0] (tagalong capable) (deparsed)
+  8-bit PHV 66 (ingress): phv66[7:0] = ethernet.dstAddr[47:40] (deparsed)
+  8-bit PHV 67 (ingress): phv67[7:0] = ethernet.srcAddr[39:32] (deparsed)
+  8-bit PHV 68 (ingress): phv68[6:6] = --validity_check--metadata_bridge[0:0] (deparsed)
+  8-bit PHV 68 (ingress): phv68[5:5] = --validity_check--udp[0:0] (deparsed)
+  8-bit PHV 68 (ingress): phv68[4:4] = --validity_check--tcp[0:0] (deparsed)
+  8-bit PHV 68 (ingress): phv68[3:3] = --validity_check--ipv4[0:0] (deparsed)
+  8-bit PHV 68 (ingress): phv68[2:2] = --validity_check--ethernet[0:0] (deparsed)
+  8-bit PHV 68 (ingress): phv68[1:1] = --validity_check--packet_out_hdr[0:0] (deparsed)
+  8-bit PHV 68 (ingress): phv68[0:0] = --validity_check--packet_in_hdr[0:0] (deparsed)
+  8-bit PHV 69 (ingress): phv69[7:5] = ig_intr_md_for_tm.drop_ctl[2:0] (deparsed)
+  >> 6 in ingress and 0 in egress
 
 Allocations in Group 5 8 bits
   8-bit PHV 80 (egress): phv80[7:3] = eg_intr_md._pad7[4:0]
@@ -102,12 +104,14 @@
   16-bit PHV 129 (ingress): phv129[6:0] = packet_in_hdr._padding[6:0] (tagalong capable) (deparsed)
   16-bit PHV 130 (ingress): phv130[8:0] = ig_intr_md_for_tm.ucast_egress_port[8:0] (deparsed)
   16-bit PHV 131 (ingress): phv131[15:0] = ipv4.srcAddr[15:0] (deparsed)
-  16-bit PHV 132 (ingress): phv132[15:8] = ethernet.dstAddr[7:0] (deparsed)
-  16-bit PHV 132 (ingress): phv132[7:0] = ethernet.srcAddr[47:40] (deparsed)
-  16-bit PHV 133 (ingress): phv133[15:0] = ethernet.etherType[15:0] (deparsed)
-  16-bit PHV 134 (ingress): phv134[15:0] = ecmp_metadata.group_id[15:0]
-  16-bit PHV 135 (ingress): phv135[15:0] = ecmp_metadata.selector[15:0]
-  >> 8 in ingress and 0 in egress
+  16-bit PHV 132 (ingress): phv132[15:8] = tcp.srcPort[7:0] (deparsed)
+  16-bit PHV 132 (ingress): phv132[7:0] = tcp.dstPort[15:8] (deparsed)
+  16-bit PHV 133 (ingress): phv133[15:8] = ethernet.dstAddr[7:0] (deparsed)
+  16-bit PHV 133 (ingress): phv133[7:0] = ethernet.srcAddr[47:40] (deparsed)
+  16-bit PHV 134 (ingress): phv134[15:0] = ethernet.etherType[15:0] (deparsed)
+  16-bit PHV 135 (ingress): phv135[15:0] = ecmp_metadata.group_id[15:0]
+  16-bit PHV 136 (ingress): phv136[15:0] = ecmp_metadata.selector[15:0]
+  >> 9 in ingress and 0 in egress
 
 Allocations in Group 9 16 bits
   16-bit PHV 144 (egress): phv144[15:9] = eg_intr_md._pad0[6:0]
@@ -120,90 +124,83 @@
   32-bit PHV 256 (ingress): phv256[20:8] = ipv4.fragOffset[12:0] (tagalong capable) (deparsed)
   32-bit PHV 256 (ingress): phv256[7:0] = ipv4.ttl[7:0] (tagalong capable) (deparsed)
   32-bit PHV 257 (ingress): phv257[31:28] = tcp.dataOffset[3:0] (tagalong capable) (deparsed)
+  32-bit PHV 257 (ingress): phv257[31:16] = udp.length_[15:0] (tagalong capable) (deparsed)
   32-bit PHV 257 (ingress): phv257[27:25] = tcp.res[2:0] (tagalong capable) (deparsed)
   32-bit PHV 257 (ingress): phv257[24:22] = tcp.ecn[2:0] (tagalong capable) (deparsed)
   32-bit PHV 257 (ingress): phv257[21:16] = tcp.ctrl[5:0] (tagalong capable) (deparsed)
   32-bit PHV 257 (ingress): phv257[15:0] = tcp.window[15:0] (tagalong capable) (deparsed)
+  32-bit PHV 257 (ingress): phv257[15:0] = udp.checksum[15:0] (tagalong capable) (deparsed)
   32-bit PHV 258 (ingress): phv258[31:16] = tcp.checksum[15:0] (tagalong capable) (deparsed)
   32-bit PHV 258 (ingress): phv258[15:0] = tcp.urgentPtr[15:0] (tagalong capable) (deparsed)
-  32-bit PHV 264 (egress): phv264[31:24] = ipv4.ttl[7:0] (tagalong capable) (deparsed)
-  32-bit PHV 264 (egress): phv264[23:16] = ipv4.protocol[7:0] (tagalong capable) (deparsed)
-  32-bit PHV 264 (egress): phv264[15:0] = ipv4.hdrChecksum[15:0] (tagalong capable) (deparsed)
-  32-bit PHV 265 (egress): phv265[31:0] = ipv4.srcAddr[31:0] (tagalong capable) (deparsed)
-  32-bit PHV 266 (egress): phv266[31:0] = ipv4.dstAddr[31:0] (tagalong capable) (deparsed)
-  32-bit PHV 267 (egress): phv267[31:0] = tcp.ackNo[31:0] (tagalong capable) (deparsed)
-  32-bit PHV 267 (egress): phv267[31:16] = udp.length_[15:0] (tagalong capable) (deparsed)
-  32-bit PHV 267 (egress): phv267[15:0] = udp.checksum[15:0] (tagalong capable) (deparsed)
-  32-bit PHV 268 (egress): phv268[31:28] = tcp.dataOffset[3:0] (tagalong capable) (deparsed)
-  32-bit PHV 268 (egress): phv268[27:25] = tcp.res[2:0] (tagalong capable) (deparsed)
-  32-bit PHV 268 (egress): phv268[24:22] = tcp.ecn[2:0] (tagalong capable) (deparsed)
-  32-bit PHV 268 (egress): phv268[21:16] = tcp.ctrl[5:0] (tagalong capable) (deparsed)
-  32-bit PHV 268 (egress): phv268[15:0] = tcp.window[15:0] (tagalong capable) (deparsed)
-  32-bit PHV 269 (egress): phv269[31:16] = tcp.checksum[15:0] (tagalong capable) (deparsed)
-  32-bit PHV 269 (egress): phv269[15:0] = tcp.urgentPtr[15:0] (tagalong capable) (deparsed)
-  32-bit PHV 270 (egress): phv270[31:0] = ethernet.dstAddr[39:8] (tagalong capable) (deparsed)
-  32-bit PHV 271 (egress): phv271[31:0] = ethernet.srcAddr[31:0] (tagalong capable) (deparsed)
+  32-bit PHV 260 (egress): phv260[31:24] = ipv4.ttl[7:0] (tagalong capable) (deparsed)
+  32-bit PHV 260 (egress): phv260[23:16] = ipv4.protocol[7:0] (tagalong capable) (deparsed)
+  32-bit PHV 260 (egress): phv260[15:0] = ipv4.hdrChecksum[15:0] (tagalong capable) (deparsed)
+  32-bit PHV 261 (egress): phv261[31:0] = ipv4.srcAddr[31:0] (tagalong capable) (deparsed)
+  32-bit PHV 262 (egress): phv262[31:0] = ipv4.dstAddr[31:0] (tagalong capable) (deparsed)
+  32-bit PHV 263 (egress): phv263[31:0] = tcp.ackNo[31:0] (tagalong capable) (deparsed)
+  32-bit PHV 263 (egress): phv263[31:16] = udp.length_[15:0] (tagalong capable) (deparsed)
+  32-bit PHV 263 (egress): phv263[15:0] = udp.checksum[15:0] (tagalong capable) (deparsed)
+  32-bit PHV 264 (egress): phv264[31:28] = tcp.dataOffset[3:0] (tagalong capable) (deparsed)
+  32-bit PHV 264 (egress): phv264[27:25] = tcp.res[2:0] (tagalong capable) (deparsed)
+  32-bit PHV 264 (egress): phv264[24:22] = tcp.ecn[2:0] (tagalong capable) (deparsed)
+  32-bit PHV 264 (egress): phv264[21:16] = tcp.ctrl[5:0] (tagalong capable) (deparsed)
+  32-bit PHV 264 (egress): phv264[15:0] = tcp.window[15:0] (tagalong capable) (deparsed)
+  32-bit PHV 265 (egress): phv265[31:16] = tcp.checksum[15:0] (tagalong capable) (deparsed)
+  32-bit PHV 265 (egress): phv265[15:0] = tcp.urgentPtr[15:0] (tagalong capable) (deparsed)
+  32-bit PHV 266 (egress): phv266[31:0] = ethernet.dstAddr[39:8] (tagalong capable) (deparsed)
+  32-bit PHV 267 (egress): phv267[31:0] = ethernet.srcAddr[31:0] (tagalong capable) (deparsed)
   >> 3 in ingress and 8 in egress
 
 Allocations in Group 16 8 bits (tagalong)
   8-bit PHV 288 (ingress): phv288[7:4] = ipv4.version[3:0] (tagalong capable) (deparsed)
   8-bit PHV 288 (ingress): phv288[3:0] = ipv4.ihl[3:0] (tagalong capable) (deparsed)
-  8-bit PHV 289 (ingress): phv289[7:0] = tcp.srcPort[15:8] (tagalong capable) (deparsed)
-  8-bit PHV 289 (ingress): phv289[7:0] = udp.length_[15:8] (tagalong capable) (deparsed)
-  8-bit PHV 290 (ingress): phv290[7:0] = tcp.srcPort[7:0] (tagalong capable) (deparsed)
-  8-bit PHV 290 (ingress): phv290[7:0] = udp.length_[7:0] (tagalong capable) (deparsed)
-  8-bit PHV 291 (ingress): phv291[7:0] = tcp.dstPort[15:8] (tagalong capable) (deparsed)
-  8-bit PHV 292 (ingress): phv292[7:0] = tcp.dstPort[7:0] (tagalong capable) (deparsed)
-  8-bit PHV 296 (egress): phv296[7:4] = ipv4.version[3:0] (tagalong capable) (deparsed)
-  8-bit PHV 296 (egress): phv296[3:0] = ipv4.ihl[3:0] (tagalong capable) (deparsed)
-  8-bit PHV 297 (egress): phv297[7:0] = ipv4.diffserv[7:0] (tagalong capable) (deparsed)
-  8-bit PHV 298 (egress): phv298[7:0] = tcp.srcPort[15:8] (tagalong capable) (deparsed)
-  8-bit PHV 298 (egress): phv298[7:0] = udp.srcPort[15:8] (tagalong capable) (deparsed)
-  8-bit PHV 299 (egress): phv299[7:0] = tcp.srcPort[7:0] (tagalong capable) (deparsed)
-  8-bit PHV 299 (egress): phv299[7:0] = udp.srcPort[7:0] (tagalong capable) (deparsed)
-  8-bit PHV 300 (egress): phv300[7:0] = ethernet.dstAddr[47:40] (tagalong capable) (deparsed)
-  8-bit PHV 301 (egress): phv301[7:0] = ethernet.srcAddr[39:32] (tagalong capable) (deparsed)
-  >> 5 in ingress and 6 in egress
+  8-bit PHV 289 (ingress): phv289[7:0] = tcp.seqNo[7:0] (tagalong capable) (deparsed)
+  8-bit PHV 289 (ingress): phv289[7:0] = udp.srcPort[15:8] (tagalong capable) (deparsed)
+  8-bit PHV 292 (egress): phv292[7:4] = ipv4.version[3:0] (tagalong capable) (deparsed)
+  8-bit PHV 292 (egress): phv292[3:0] = ipv4.ihl[3:0] (tagalong capable) (deparsed)
+  8-bit PHV 293 (egress): phv293[7:0] = ipv4.diffserv[7:0] (tagalong capable) (deparsed)
+  8-bit PHV 294 (egress): phv294[7:0] = tcp.srcPort[15:8] (tagalong capable) (deparsed)
+  8-bit PHV 294 (egress): phv294[7:0] = udp.srcPort[15:8] (tagalong capable) (deparsed)
+  8-bit PHV 295 (egress): phv295[7:0] = tcp.srcPort[7:0] (tagalong capable) (deparsed)
+  8-bit PHV 295 (egress): phv295[7:0] = udp.srcPort[7:0] (tagalong capable) (deparsed)
+  8-bit PHV 296 (egress): phv296[7:0] = ethernet.dstAddr[47:40] (tagalong capable) (deparsed)
+  8-bit PHV 297 (egress): phv297[7:0] = ethernet.srcAddr[39:32] (tagalong capable) (deparsed)
+  >> 2 in ingress and 6 in egress
 
 Allocations in Group 18 16 bits (tagalong)
   16-bit PHV 320 (ingress): phv320[15:8] = ipv4.diffserv[7:0] (tagalong capable) (deparsed)
   16-bit PHV 320 (ingress): phv320[7:0] = ipv4.totalLen[15:8] (tagalong capable) (deparsed)
   16-bit PHV 321 (ingress): phv321[15:8] = ipv4.totalLen[7:0] (tagalong capable) (deparsed)
   16-bit PHV 321 (ingress): phv321[7:0] = ipv4.identification[15:8] (tagalong capable) (deparsed)
-  16-bit PHV 322 (ingress): phv322[15:0] = tcp.seqNo[31:16] (tagalong capable) (deparsed)
-  16-bit PHV 322 (ingress): phv322[15:0] = udp.checksum[15:0] (tagalong capable) (deparsed)
-  16-bit PHV 323 (ingress): phv323[15:0] = tcp.seqNo[15:0] (tagalong capable) (deparsed)
-  16-bit PHV 324 (ingress): phv324[15:0] = tcp.ackNo[31:16] (tagalong capable) (deparsed)
-  16-bit PHV 325 (ingress): phv325[15:0] = tcp.ackNo[15:0] (tagalong capable) (deparsed)
-  16-bit PHV 332 (egress): phv332[15:0] = ipv4.totalLen[15:0] (tagalong capable) (deparsed)
-  16-bit PHV 333 (egress): phv333[15:0] = ipv4.identification[15:0] (tagalong capable) (deparsed)
-  16-bit PHV 334 (egress): phv334[15:13] = ipv4.flags[2:0] (tagalong capable) (deparsed)
-  16-bit PHV 334 (egress): phv334[12:0] = ipv4.fragOffset[12:0] (tagalong capable) (deparsed)
-  16-bit PHV 335 (egress): phv335[15:0] = tcp.dstPort[15:0] (tagalong capable) (deparsed)
-  >> 6 in ingress and 4 in egress
-
-Allocations in Group 19 16 bits (tagalong)
-  16-bit PHV 336 (egress): phv336[15:0] = tcp.seqNo[31:16] (tagalong capable) (deparsed)
-  16-bit PHV 336 (egress): phv336[15:0] = udp.dstPort[15:0] (tagalong capable) (deparsed)
-  16-bit PHV 337 (egress): phv337[15:0] = tcp.seqNo[15:0] (tagalong capable) (deparsed)
-  16-bit PHV 338 (egress): phv338[15:8] = ethernet.dstAddr[7:0] (tagalong capable) (deparsed)
-  16-bit PHV 338 (egress): phv338[7:0] = ethernet.srcAddr[47:40] (tagalong capable) (deparsed)
-  16-bit PHV 339 (egress): phv339[15:0] = ethernet.etherType[15:0] (tagalong capable) (deparsed)
-  16-bit PHV 340 (egress): phv340[15:7] = packet_out_hdr.egress_port[8:0] (tagalong capable) (deparsed)
-  16-bit PHV 340 (egress): phv340[15:7] = packet_in_hdr.ingress_port[8:0] (tagalong capable) (deparsed)
-  16-bit PHV 340 (egress): phv340[6:0] = packet_out_hdr._padding[6:0] (tagalong capable) (deparsed)
-  16-bit PHV 340 (egress): phv340[6:0] = packet_in_hdr._padding[6:0] (tagalong capable) (deparsed)
-  >> 0 in ingress and 5 in egress
+  16-bit PHV 322 (ingress): phv322[15:0] = tcp.ackNo[31:16] (tagalong capable) (deparsed)
+  16-bit PHV 322 (ingress): phv322[15:0] = udp.dstPort[15:0] (tagalong capable) (deparsed)
+  16-bit PHV 323 (ingress): phv323[15:0] = tcp.ackNo[15:0] (tagalong capable) (deparsed)
+  16-bit PHV 326 (egress): phv326[15:0] = ipv4.totalLen[15:0] (tagalong capable) (deparsed)
+  16-bit PHV 327 (egress): phv327[15:0] = ipv4.identification[15:0] (tagalong capable) (deparsed)
+  16-bit PHV 328 (egress): phv328[15:13] = ipv4.flags[2:0] (tagalong capable) (deparsed)
+  16-bit PHV 328 (egress): phv328[12:0] = ipv4.fragOffset[12:0] (tagalong capable) (deparsed)
+  16-bit PHV 329 (egress): phv329[15:0] = tcp.dstPort[15:0] (tagalong capable) (deparsed)
+  16-bit PHV 329 (egress): phv329[15:0] = udp.dstPort[15:0] (tagalong capable) (deparsed)
+  16-bit PHV 330 (egress): phv330[15:0] = tcp.seqNo[31:16] (tagalong capable) (deparsed)
+  16-bit PHV 331 (egress): phv331[15:0] = tcp.seqNo[15:0] (tagalong capable) (deparsed)
+  16-bit PHV 332 (egress): phv332[15:8] = ethernet.dstAddr[7:0] (tagalong capable) (deparsed)
+  16-bit PHV 332 (egress): phv332[7:0] = ethernet.srcAddr[47:40] (tagalong capable) (deparsed)
+  16-bit PHV 333 (egress): phv333[15:0] = ethernet.etherType[15:0] (tagalong capable) (deparsed)
+  16-bit PHV 334 (egress): phv334[15:7] = packet_out_hdr.egress_port[8:0] (tagalong capable) (deparsed)
+  16-bit PHV 334 (egress): phv334[15:7] = packet_in_hdr.ingress_port[8:0] (tagalong capable) (deparsed)
+  16-bit PHV 334 (egress): phv334[6:0] = packet_out_hdr._padding[6:0] (tagalong capable) (deparsed)
+  16-bit PHV 334 (egress): phv334[6:0] = packet_in_hdr._padding[6:0] (tagalong capable) (deparsed)
+  >> 4 in ingress and 9 in egress
 
 
 Final POV layout (ingress):
- 32: --validity_check--packet_in_hdr (ingress) in container 67
- 33: --validity_check--packet_out_hdr (ingress) in container 67
- 34: --validity_check--ethernet (ingress) in container 67
- 35: --validity_check--ipv4 (ingress) in container 67
- 36: --validity_check--tcp (ingress) in container 67
- 37: --validity_check--udp (ingress) in container 67
- 38: --validity_check--metadata_bridge (ingress) in container 67
+ 32: --validity_check--packet_in_hdr (ingress) in container 68
+ 33: --validity_check--packet_out_hdr (ingress) in container 68
+ 34: --validity_check--ethernet (ingress) in container 68
+ 35: --validity_check--ipv4 (ingress) in container 68
+ 36: --validity_check--tcp (ingress) in container 68
+ 37: --validity_check--udp (ingress) in container 68
+ 38: --validity_check--metadata_bridge (ingress) in container 68
 
 Final POV layout (egress):
   0: --validity_check--packet_in_hdr (egress) in container 81
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/logs/parde.calcfields.log b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/logs/parde.calcfields.log
index 3096df6..2aec839 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/logs/parde.calcfields.log
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/logs/parde.calcfields.log
@@ -1,37 +1,35 @@
 +---------------------------------------------------------------------+
 |  Log file: parde.calcfields.log                                     |
 |  Compiler version: 5.1.0 (fca32d1)                                  |
-|  Created on: Tue Sep 12 11:15:53 2017                               |
+|  Created on: Wed Sep 13 00:59:40 2017                               |
 +---------------------------------------------------------------------+
 
 Reserving 0 16-bit ingress tphvs for residual checksums
 Reserving 0 16-bit egress tphvs for residual checksums
 Need 0 POV bits for checksum update control
-Number of reachable states from state parse_tcp//spilled : 1
-Number of reachable states from state parse_tcp : 2
+Number of reachable states from state parse_tcp : 1
 Number of reachable states from state parse_udp : 1
-Number of reachable states from state parse_ipv4 : 4
-Number of reachable states from state parse_ethernet : 5
-Number of reachable states from state parse_pkt_in : 6
-Number of reachable states from state parse_pkt_out : 6
-Number of reachable states from state default_parser : 7
-Number of reachable states from state start : 9
-Number of reachable states from state <POV initialization>_<Ingress intrinsic metadata>_<Phase 0> : 10
-Number of reachable states from state <Shim start state> : 11
+Number of reachable states from state parse_ipv4 : 3
+Number of reachable states from state parse_ethernet : 4
+Number of reachable states from state parse_pkt_in : 5
+Number of reachable states from state parse_pkt_out : 5
+Number of reachable states from state default_parser : 6
+Number of reachable states from state start : 8
+Number of reachable states from state <POV initialization>_<Ingress intrinsic metadata>_<Phase 0> : 9
+Number of reachable states from state <Shim start state> : 10
 parser_state_calculations:[
-	parse_tcp_140012620391248
-	parse_tcp_140012609531792
-	parse_udp_140012609530832
-	parse_ipv4_140012609453328
-	parse_ethernet_140012609450128
-	parse_pkt_in_140012609453264
-	parse_pkt_out_140012609529744
-	default_parser_140012609529936
-	start_140012609453008
-	<Phase 0>_140012616925840
-	<Ingress intrinsic metadata>_140012616925520
-	<POV initialization>_140012616926224
-	<Shim start state>_140012616926544
+	parse_tcp_140368914071184
+	parse_udp_140368914018832
+	parse_ipv4_140368914067984
+	parse_ethernet_140368916524560
+	parse_pkt_in_140368914070288
+	parse_pkt_out_140368914019920
+	default_parser_140368914019728
+	start_140368914069328
+	<Phase 0>_140368913928272
+	<Ingress intrinsic metadata>_140368913952464
+	<POV initialization>_140368913928656
+	<Shim start state>_140368913928976
 ]
 parser_calculations: [
 	
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/logs/parde.config.log b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/logs/parde.config.log
index f6b4359..e6fce26 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/logs/parde.config.log
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/logs/parde.config.log
@@ -1,7 +1,7 @@
 +---------------------------------------------------------------------+
 |  Log file: parde.config.log                                         |
 |  Compiler version: 5.1.0 (fca32d1)                                  |
-|  Created on: Tue Sep 12 11:15:53 2017                               |
+|  Created on: Wed Sep 13 00:59:40 2017                               |
 +---------------------------------------------------------------------+
 
 Configuring deparser.inp.iim.ii_phv_csum.csum_cfg[0].csum_cfg_entry[0].zero_m_s_b = 1
@@ -15994,9 +15994,9 @@
    0 | I g0w0:   [POV[31:0]]
    1 | I g0w1:   [ipv4.protocol, ipv4.hdrChecksum, ipv4.srcAddr[31:24]]
    2 | I g0w2:   [ipv4.dstAddr]
-   3 | I g0w3:   [ethernet.dstAddr[39:8]]
-   4 | I g0w4:   [ethernet.srcAddr[31:0]]
-   5 | I g0w5:   [udp.srcPort, udp.dstPort]
+   3 | I g0w3:   [tcp.dstPort[7:0], tcp.seqNo[31:8]]
+   4 | I g0w4:   [ethernet.dstAddr[39:8]]
+   5 | I g0w5:   [ethernet.srcAddr[31:0]]
    6 |   g0w6:   
    7 |   g0w7:   
    8 |   g0w8:   
@@ -16060,11 +16060,11 @@
      | 
 8 bits
   64 | I g2w0:   [ipv4.srcAddr[23:16]]
-  65 | I g2w1:   [ethernet.dstAddr[47:40]]
-  66 | I g2w2:   [ethernet.srcAddr[39:32]]
-  67 | I g2w3:   [POV[39:32]]
-  68 | I g2w4:   [ig_intr_md_for_tm.drop_ctl]
-  69 |   g2w5:   
+  65 | I g2w1:   [tcp.srcPort[15:8], udp.srcPort[7:0]]
+  66 | I g2w2:   [ethernet.dstAddr[47:40]]
+  67 | I g2w3:   [ethernet.srcAddr[39:32]]
+  68 | I g2w4:   [POV[39:32]]
+  69 | I g2w5:   [ig_intr_md_for_tm.drop_ctl]
   70 |   g2w6:   
   71 |   g2w7:   
   72 |   g2w8:   
@@ -16131,11 +16131,11 @@
  129 | I g4w1:   [packet_out_hdr.egress_port, packet_out_hdr._padding, packet_in_hdr.ingress_port, packet_in_hdr._padding]
  130 | I g4w2:   [ig_intr_md_for_tm.ucast_egress_port]
  131 | I g4w3:   [ipv4.srcAddr[15:0]]
- 132 | I g4w4:   [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]
- 133 | I g4w5:   [ethernet.etherType]
- 134 | I g4w6:   [ecmp_metadata.group_id]
- 135 | I g4w7:   [ecmp_metadata.selector]
- 136 |   g4w8:   
+ 132 | I g4w4:   [tcp.srcPort[7:0], tcp.dstPort[15:8]]
+ 133 | I g4w5:   [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]
+ 134 | I g4w6:   [ethernet.etherType]
+ 135 | I g4w7:   [ecmp_metadata.group_id]
+ 136 | I g4w8:   [ecmp_metadata.selector]
  137 |   g4w9:   
  138 |   g4w10:  
  139 |   g4w11:  
@@ -16232,21 +16232,21 @@
      | 
 32 bits
  256 | I g8w0:   [ipv4.identification[7:0], ipv4.flags, ipv4.fragOffset, ipv4.ttl]
- 257 | I g8w1:   [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]
+ 257 | I g8w1:   [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window, udp.length_, udp.checksum]
  258 | I g8w2:   [tcp.checksum, tcp.urgentPtr]
  259 |   g8w3:   
- 260 |   g8w4:   
- 261 |   g8w5:   
- 262 |   g8w6:   
- 263 |   g8w7:   
- 264 | E g8w8:   [ipv4.ttl, ipv4.protocol, ipv4.hdrChecksum]
- 265 | E g8w9:   [ipv4.srcAddr]
- 266 | E g8w10:  [ipv4.dstAddr]
- 267 | E g8w11:  [tcp.ackNo, udp.length_, udp.checksum]
- 268 | E g8w12:  [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]
- 269 | E g8w13:  [tcp.checksum, tcp.urgentPtr]
- 270 | E g8w14:  [ethernet.dstAddr[39:8]]
- 271 | E g8w15:  [ethernet.srcAddr[31:0]]
+ 260 | E g8w4:   [ipv4.ttl, ipv4.protocol, ipv4.hdrChecksum]
+ 261 | E g8w5:   [ipv4.srcAddr]
+ 262 | E g8w6:   [ipv4.dstAddr]
+ 263 | E g8w7:   [tcp.ackNo, udp.length_, udp.checksum]
+ 264 | E g8w8:   [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]
+ 265 | E g8w9:   [tcp.checksum, tcp.urgentPtr]
+ 266 | E g8w10:  [ethernet.dstAddr[39:8]]
+ 267 | E g8w11:  [ethernet.srcAddr[31:0]]
+ 268 |   g8w12:  
+ 269 |   g8w13:  
+ 270 |   g8w14:  
+ 271 |   g8w15:  
  272 |   g8w16:  
  273 |   g8w17:  
  274 |   g8w18:  
@@ -16266,19 +16266,19 @@
      | 
 8 bits
  288 | I g9w0:   [ipv4.version, ipv4.ihl]
- 289 | I g9w1:   [tcp.srcPort[15:8], udp.length_[15:8]]
- 290 | I g9w2:   [tcp.srcPort[7:0], udp.length_[7:0]]
- 291 | I g9w3:   [tcp.dstPort[15:8]]
- 292 | I g9w4:   [tcp.dstPort[7:0]]
- 293 |   g9w5:   
- 294 |   g9w6:   
- 295 |   g9w7:   
- 296 | E g9w8:   [ipv4.version, ipv4.ihl]
- 297 | E g9w9:   [ipv4.diffserv]
- 298 | E g9w10:  [tcp.srcPort[15:8], udp.srcPort[15:8]]
- 299 | E g9w11:  [tcp.srcPort[7:0], udp.srcPort[7:0]]
- 300 | E g9w12:  [ethernet.dstAddr[47:40]]
- 301 | E g9w13:  [ethernet.srcAddr[39:32]]
+ 289 | I g9w1:   [tcp.seqNo[7:0], udp.srcPort[15:8]]
+ 290 |   g9w2:   
+ 291 |   g9w3:   
+ 292 | E g9w4:   [ipv4.version, ipv4.ihl]
+ 293 | E g9w5:   [ipv4.diffserv]
+ 294 | E g9w6:   [tcp.srcPort[15:8], udp.srcPort[15:8]]
+ 295 | E g9w7:   [tcp.srcPort[7:0], udp.srcPort[7:0]]
+ 296 | E g9w8:   [ethernet.dstAddr[47:40]]
+ 297 | E g9w9:   [ethernet.srcAddr[39:32]]
+ 298 |   g9w10:  
+ 299 |   g9w11:  
+ 300 |   g9w12:  
+ 301 |   g9w13:  
  302 |   g9w14:  
  303 |   g9w15:  
  304 |   g9w16:  
@@ -16301,25 +16301,25 @@
 16 bits
  320 | I g10w0:  [ipv4.diffserv, ipv4.totalLen[15:8]]
  321 | I g10w1:  [ipv4.totalLen[7:0], ipv4.identification[15:8]]
- 322 | I g10w2:  [tcp.seqNo[31:16], udp.checksum]
- 323 | I g10w3:  [tcp.seqNo[15:0]]
- 324 | I g10w4:  [tcp.ackNo[31:16]]
- 325 | I g10w5:  [tcp.ackNo[15:0]]
- 326 |   g10w6:  
- 327 |   g10w7:  
- 328 |   g10w8:  
- 329 |   g10w9:  
- 330 |   g10w10: 
- 331 |   g10w11: 
- 332 | E g10w12: [ipv4.totalLen]
- 333 | E g10w13: [ipv4.identification]
- 334 | E g10w14: [ipv4.flags, ipv4.fragOffset]
- 335 | E g10w15: [tcp.dstPort]
- 336 | E g10w16: [tcp.seqNo[31:16], udp.dstPort]
- 337 | E g10w17: [tcp.seqNo[15:0]]
- 338 | E g10w18: [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]
- 339 | E g10w19: [ethernet.etherType]
- 340 | E g10w20: [packet_out_hdr.egress_port, packet_out_hdr._padding, packet_in_hdr.ingress_port, packet_in_hdr._padding]
+ 322 | I g10w2:  [tcp.ackNo[31:16], udp.dstPort]
+ 323 | I g10w3:  [tcp.ackNo[15:0]]
+ 324 |   g10w4:  
+ 325 |   g10w5:  
+ 326 | E g10w6:  [ipv4.totalLen]
+ 327 | E g10w7:  [ipv4.identification]
+ 328 | E g10w8:  [ipv4.flags, ipv4.fragOffset]
+ 329 | E g10w9:  [tcp.dstPort, udp.dstPort]
+ 330 | E g10w10: [tcp.seqNo[31:16]]
+ 331 | E g10w11: [tcp.seqNo[15:0]]
+ 332 | E g10w12: [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]
+ 333 | E g10w13: [ethernet.etherType]
+ 334 | E g10w14: [packet_out_hdr.egress_port, packet_out_hdr._padding, packet_in_hdr.ingress_port, packet_in_hdr._padding]
+ 335 |   g10w15: 
+ 336 |   g10w16: 
+ 337 |   g10w17: 
+ 338 |   g10w18: 
+ 339 |   g10w19: 
+ 340 |   g10w20: 
  341 |   g10w21: 
  342 |   g10w22: 
  343 |   g10w23: 
@@ -16363,7 +16363,6 @@
    7: parse_pkt_out
    8: <POV initialization>_<Ingress intrinsic metadata>_<Phase 0>
    9: start
-  10: parse_tcp//spilled
 Egress:
    0: <Shim start state>
    1: parse_ethernet
@@ -16399,5 +16398,5 @@
 [None]
 ---------------
 Deparse order:
-Ingress: ['metadata_bridge', '_bridged_intr_md_', 'packet_out_hdr', 'packet_in_hdr', 'ethernet', 'ipv4', 'udp', 'tcp']
-Egress:  ['packet_out_hdr', 'packet_in_hdr', 'ethernet', 'ipv4', 'udp', 'tcp']
+Ingress: ['metadata_bridge', '_bridged_intr_md_', 'packet_in_hdr', 'packet_out_hdr', 'ethernet', 'ipv4', 'udp', 'tcp']
+Egress:  ['packet_in_hdr', 'packet_out_hdr', 'ethernet', 'ipv4', 'udp', 'tcp']
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/logs/parde.error.log b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/logs/parde.error.log
index 7353702..f633e91 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/logs/parde.error.log
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/logs/parde.error.log
@@ -1,6 +1,6 @@
 +---------------------------------------------------------------------+
 |  Log file: parde.error.log                                          |
 |  Compiler version: 5.1.0 (fca32d1)                                  |
-|  Created on: Tue Sep 12 11:15:53 2017                               |
+|  Created on: Wed Sep 13 00:59:40 2017                               |
 +---------------------------------------------------------------------+
 
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/logs/parde.log b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/logs/parde.log
index d2894f8..9eca7bc 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/logs/parde.log
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/logs/parde.log
@@ -1,7 +1,7 @@
 +---------------------------------------------------------------------+
 |  Log file: parde.log                                                |
 |  Compiler version: 5.1.0 (fca32d1)                                  |
-|  Created on: Tue Sep 12 11:15:53 2017                               |
+|  Created on: Wed Sep 13 00:59:40 2017                               |
 +---------------------------------------------------------------------+
 
 ># Begin digest init (pre-PHV)
@@ -18,14 +18,14 @@
 ># Begin unroll of HLIR parse graph
 >## Create shadow parse graph and find loops
 >## Entrypoint 'p4_parse_state.start'
-Creating shadow state: 'p4_parse_state.start' -> 'shadow_state (start, 140012609633872)'
-Creating shadow state: 'p4_parse_state.parse_pkt_in' -> 'shadow_state (parse_pkt_in, 140012609450640)'
-Creating shadow state: 'p4_parse_state.parse_ethernet' -> 'shadow_state (parse_ethernet, 140012609451216)'
-Creating shadow state: 'p4_parse_state.parse_ipv4' -> 'shadow_state (parse_ipv4, 140012609450448)'
-Creating shadow state: 'p4_parse_state.parse_tcp' -> 'shadow_state (parse_tcp, 140012609451280)'
-Creating shadow state: 'p4_parse_state.parse_udp' -> 'shadow_state (parse_udp, 140012609450064)'
-Creating shadow state: 'p4_parse_state.default_parser' -> 'shadow_state (default_parser, 140012609451344)'
-Creating shadow state: 'p4_parse_state.parse_pkt_out' -> 'shadow_state (parse_pkt_out, 140012609451408)'
+Creating shadow state: 'p4_parse_state.start' -> 'shadow_state (start, 140368916524624)'
+Creating shadow state: 'p4_parse_state.parse_pkt_in' -> 'shadow_state (parse_pkt_in, 140368916524176)'
+Creating shadow state: 'p4_parse_state.parse_ethernet' -> 'shadow_state (parse_ethernet, 140368914068240)'
+Creating shadow state: 'p4_parse_state.parse_ipv4' -> 'shadow_state (parse_ipv4, 140368914067920)'
+Creating shadow state: 'p4_parse_state.parse_tcp' -> 'shadow_state (parse_tcp, 140368914068304)'
+Creating shadow state: 'p4_parse_state.parse_udp' -> 'shadow_state (parse_udp, 140368914067536)'
+Creating shadow state: 'p4_parse_state.default_parser' -> 'shadow_state (default_parser, 140368914068368)'
+Creating shadow state: 'p4_parse_state.parse_pkt_out' -> 'shadow_state (parse_pkt_out, 140368914068432)'
 ># End unroll of HLIR parse graph
 ># Begin deparser init
 >## Create records for gress 0
@@ -44,8 +44,8 @@
 Created record for 'p4_header_instance.udp'
 Skipping metadata header 'p4_header_instance.ecmp_metadata'
 >## Build record ordering for gress 0
->## Build field ordering for record 'packet_out_hdr'
 >## Build field ordering for record 'packet_in_hdr'
+>## Build field ordering for record 'packet_out_hdr'
 >## Build field ordering for record 'ethernet'
 >## Build field ordering for record 'ipv4'
 >## Build field ordering for record 'udp'
@@ -66,8 +66,8 @@
 Created record for 'p4_header_instance.udp'
 Skipping metadata header 'p4_header_instance.ecmp_metadata'
 >## Build record ordering for gress 1
->## Build field ordering for record 'packet_out_hdr'
 >## Build field ordering for record 'packet_in_hdr'
+>## Build field ordering for record 'packet_out_hdr'
 >## Build field ordering for record 'ethernet'
 >## Build field ordering for record 'ipv4'
 >## Build field ordering for record 'udp'
@@ -89,27 +89,27 @@
 Stretch extraction of ingress_port to state <Ingress intrinsic metadata> offset 7
 Stretch extraction of ig_intr_md.ingress_port to state <_parse_bridged_ingress_intrinsic_metadata> offset 7
 ># Begin scraping deparser POV allocation from raw PHV allocation
-PHV layout: [0, 0, 0, 0, 67, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None]
+PHV layout: [0, 0, 0, 0, 68, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None]
 >## Scraping individual POV records
-POV 32 -> packet_in_hdr
 POV 33 -> packet_out_hdr
 POV 34 -> ethernet
 POV 35 -> ipv4
 POV 36 -> tcp
 POV 37 -> udp
 POV 38 -> pov_bmeta
+POV 32 -> packet_in_hdr
 >## Setting up array bits
 ># End scraping deparser POV allocation from raw PHV allocation
 ># Begin parser POV rewrite
 >## Filling in POV init state
 >## Rewriting parser POV extractions
-POV for metadata_bridge -> PHV 67 |= 0x40
-POV for packet_in_hdr -> PHV 67 |= 0x1
-POV for ethernet -> PHV 67 |= 0x4
-POV for ipv4 -> PHV 67 |= 0x8
-POV for tcp -> PHV 67 |= 0x10
-POV for udp -> PHV 67 |= 0x20
-POV for packet_out_hdr -> PHV 67 |= 0x2
+POV for metadata_bridge -> PHV 68 |= 0x40
+POV for packet_in_hdr -> PHV 68 |= 0x1
+POV for ethernet -> PHV 68 |= 0x4
+POV for ipv4 -> PHV 68 |= 0x8
+POV for tcp -> PHV 68 |= 0x10
+POV for udp -> PHV 68 |= 0x20
+POV for packet_out_hdr -> PHV 68 |= 0x2
 POV for ig_intr_md -> dropped (no deparser record)
 POV for _bridged_intr_md_ -> PHV 0 |= 0x10000
 >## Sampling not detected, deparsing at least 1 POV byte
@@ -118,12 +118,12 @@
 ># Begin scraping deparser POV allocation from raw PHV allocation
 PHV layout: [81, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None]
 >## Scraping individual POV records
-POV 0 -> packet_in_hdr
 POV 1 -> packet_out_hdr
 POV 2 -> ethernet
 POV 3 -> ipv4
 POV 4 -> tcp
 POV 5 -> udp
+POV 0 -> packet_in_hdr
 >## Setting up array bits
 ># End scraping deparser POV allocation from raw PHV allocation
 ># Begin parser POV rewrite
@@ -135,11 +135,6 @@
 POV for tcp -> PHV 81 |= 0x10
 POV for udp -> PHV 81 |= 0x20
 POV for packet_out_hdr -> PHV 81 |= 0x2
-Linear Chain parse_tcp -> parse_tcp//spilled
-Try merge parse_tcp <- parse_tcp//spilled
-merge output at offset 24
-Ran out of 8b extractors
-states will not be partially merged since S2 is end of chain
 Linear Chain parse_pkt_in -> parse_ethernet
 Try merge parse_pkt_in <- parse_ethernet
 Multiple paths to state S2 : parse_ethernet <- 3
@@ -199,7 +194,7 @@
 Multiple paths to state S2 : start <- 2
 Remove state <Ingress intrinsic metadata>
 Remove state <Phase 0>
-assign ids to 11 states, dir = 0
+assign ids to 10 states, dir = 0
 ------
 State : <Shim start state>
 shift: 0B
@@ -212,7 +207,7 @@
 State : parse_pkt_in
 shift: 2B
 match_reservations: []
-outputs[addr, width]: ([67, 8], [129, 16])
+outputs[addr, width]: ([68, 8], [129, 16])
 match_extractions: []
 next state parse_ethernet val 0 mask [False]
 parent state start
@@ -221,7 +216,7 @@
 State : parse_ethernet
 shift: 14B
 match_reservations: []
-outputs[addr, width]: ([67, 8], [65, 8], [3, 32], [132, 16], [66, 8], [4, 32], [133, 16])
+outputs[addr, width]: ([68, 8], [66, 8], [4, 32], [133, 16], [67, 8], [5, 32], [134, 16])
 branch on = etherType, offset = 96b, dst = parse_ethernet
 match_extractions: [match_window(hw_id=0, width=16)]
 match key = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]
@@ -234,30 +229,29 @@
 State : parse_ipv4
 shift: 20B
 match_reservations: []
-outputs[addr, width]: ([67, 8], [288, 8], [320, 16], [321, 16], [256, 32], [1, 32], [64, 8], [131, 16], [2, 32])
+outputs[addr, width]: ([68, 8], [288, 8], [320, 16], [321, 16], [256, 32], [1, 32], [64, 8], [131, 16], [2, 32])
 branch on = fragOffset, offset = 51b, dst = parse_ipv4
 branch on = protocol, offset = 72b, dst = parse_ipv4
-match_extractions: [match_window(hw_id=2, width=8), match_window(hw_id=0, width=16)]
-match key = [0, 1, 2, 3, 4, 5, 6, 7]
+match_extractions: [match_window(hw_id=0, width=16), match_window(hw_id=2, width=8)]
 match key = [8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, None, None, None]
+match key = [0, 1, 2, 3, 4, 5, 6, 7]
 next state parse_tcp val 6 mask [True, True, True, True, True, True, True, True, True, True, True, True, True, True, True, True, True, True, True, True, True]
 next state parse_udp val 17 mask [True, True, True, True, True, True, True, True, True, True, True, True, True, True, True, True, True, True, True, True, True]
 parent state parse_ethernet
 
 ------
 State : parse_tcp
-shift: 0B
+shift: 20B
 match_reservations: []
-outputs[addr, width]: ([67, 8], [289, 8], [290, 8], [291, 8], [322, 16], [323, 16], [324, 16], [325, 16], [257, 32], [258, 32])
+outputs[addr, width]: ([68, 8], [65, 8], [132, 16], [3, 32], [289, 8], [322, 16], [323, 16], [257, 32], [258, 32])
 match_extractions: []
-next state parse_tcp//spilled val 0 mask [False]
 parent state parse_ipv4
 
 ------
 State : parse_udp
 shift: 8B
 match_reservations: []
-outputs[addr, width]: ([67, 8], [5, 32], [289, 8], [290, 8], [322, 16])
+outputs[addr, width]: ([68, 8], [289, 8], [65, 8], [322, 16], [257, 32])
 match_extractions: []
 parent state parse_ipv4
 
@@ -277,7 +271,7 @@
 State : parse_pkt_out
 shift: 2B
 match_reservations: []
-outputs[addr, width]: ([67, 8], [129, 16])
+outputs[addr, width]: ([68, 8], [129, 16])
 match_extractions: []
 next state parse_ethernet val 0 mask [False]
 parent state default_parser
@@ -290,9 +284,9 @@
 branch on = None, offset = 0b, dst = <POV initialization>_<Ingress intrinsic metadata>_<Phase 0>
 branch on = None, offset = 64b, dst = <POV initialization>_<Ingress intrinsic metadata>_<Phase 0>
 branch promise on = ingress_port, offset = 7b, dst = default_parser
-match_extractions: [match_window(hw_id=2, width=8), match_window(hw_id=0, width=16)]
-match key = [0, 1, 2, 3, 4, 5, 6, 7]
+match_extractions: [match_window(hw_id=0, width=16), match_window(hw_id=2, width=8)]
 match key = [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, 8]
+match key = [0, 1, 2, 3, 4, 5, 6, 7]
 next state start val 0 mask [False]
 parent state <Shim start state>
 
@@ -300,7 +294,7 @@
 State : start
 shift: 0B
 match_reservations: [match_window(hw_id=0, width=16)]
-outputs[addr, width]: ([67, 8],)
+outputs[addr, width]: ([68, 8],)
 branch on = None, offset = 96b, dst = start
 match_extractions: [match_window(hw_id=2, width=8)]
 match key = [0, 1, 2, 3, 4, 5, 6, 7]
@@ -308,14 +302,6 @@
 next state default_parser val 0 mask [False]
 parent state <POV initialization>_<Ingress intrinsic metadata>_<Phase 0>
 
-------
-State : parse_tcp//spilled
-shift: 20B
-match_reservations: []
-outputs[addr, width]: ([292, 8],)
-match_extractions: []
-parent state parse_tcp
-
 Linear Chain parse_pkt_in -> parse_ethernet
 Try merge parse_pkt_in <- parse_ethernet
 Multiple paths to state S2 : parse_ethernet <- 3
@@ -435,7 +421,7 @@
 State : parse_ethernet
 shift: 14B
 match_reservations: []
-outputs[addr, width]: ([81, 8], [300, 8], [270, 32], [338, 16], [301, 8], [271, 32], [339, 16])
+outputs[addr, width]: ([81, 8], [296, 8], [266, 32], [332, 16], [297, 8], [267, 32], [333, 16])
 branch on = etherType, offset = 96b, dst = parse_ethernet
 match_extractions: [match_window(hw_id=0, width=16)]
 match key = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]
@@ -448,12 +434,12 @@
 State : parse_ipv4
 shift: 20B
 match_reservations: []
-outputs[addr, width]: ([81, 8], [296, 8], [297, 8], [332, 16], [333, 16], [334, 16], [264, 32], [265, 32], [266, 32])
+outputs[addr, width]: ([81, 8], [292, 8], [293, 8], [326, 16], [327, 16], [328, 16], [260, 32], [261, 32], [262, 32])
 branch on = fragOffset, offset = 51b, dst = parse_ipv4
 branch on = protocol, offset = 72b, dst = parse_ipv4
-match_extractions: [match_window(hw_id=2, width=8), match_window(hw_id=0, width=16)]
-match key = [0, 1, 2, 3, 4, 5, 6, 7]
+match_extractions: [match_window(hw_id=0, width=16), match_window(hw_id=2, width=8)]
 match key = [8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, None, None, None]
+match key = [0, 1, 2, 3, 4, 5, 6, 7]
 next state parse_tcp val 6 mask [True, True, True, True, True, True, True, True, True, True, True, True, True, True, True, True, True, True, True, True, True]
 next state parse_udp val 17 mask [True, True, True, True, True, True, True, True, True, True, True, True, True, True, True, True, True, True, True, True, True]
 parent state parse_ethernet
@@ -462,7 +448,7 @@
 State : parse_tcp
 shift: 20B
 match_reservations: []
-outputs[addr, width]: ([81, 8], [298, 8], [299, 8], [335, 16], [336, 16], [337, 16], [267, 32], [268, 32], [269, 32])
+outputs[addr, width]: ([81, 8], [294, 8], [295, 8], [329, 16], [330, 16], [331, 16], [263, 32], [264, 32], [265, 32])
 match_extractions: []
 parent state parse_ipv4
 
@@ -470,7 +456,7 @@
 State : parse_udp
 shift: 8B
 match_reservations: []
-outputs[addr, width]: ([81, 8], [298, 8], [299, 8], [336, 16], [267, 32])
+outputs[addr, width]: ([81, 8], [294, 8], [295, 8], [329, 16], [263, 32])
 match_extractions: []
 parent state parse_ipv4
 
@@ -490,7 +476,7 @@
 State : parse_pkt_out
 shift: 2B
 match_reservations: []
-outputs[addr, width]: ([81, 8], [340, 16])
+outputs[addr, width]: ([81, 8], [334, 16])
 match_extractions: []
 next state parse_ethernet val 0 mask [False]
 parent state default_parser
@@ -503,9 +489,9 @@
 branch on = None, offset = 24b, dst = <POV initialization>_<Egress intrinsic metadata>_<POV skip>_<_parse_bridged_ingress_intrinsic_metadata>_start
 branch on = None, offset = 168b, dst = <POV initialization>_<Egress intrinsic metadata>_<POV skip>_<_parse_bridged_ingress_intrinsic_metadata>_start
 branch promise on = ingress_port, offset = 63b, dst = default_parser
-match_extractions: [match_window(hw_id=2, width=8), match_window(hw_id=0, width=16), match_window(hw_id=3, width=8)]
-match key = [8, 9, 10, 11, 12, 13, 14, 15]
+match_extractions: [match_window(hw_id=0, width=16), match_window(hw_id=2, width=8), match_window(hw_id=3, width=8)]
 match key = [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None]
+match key = [8, 9, 10, 11, 12, 13, 14, 15]
 match key = [0, 1, 2, 3, 4, 5, 6, 7]
 next state parse_pkt_in val 0 mask [True, True, True, True, True, True, True, True]
 next state default_parser val 0 mask [False]
@@ -515,7 +501,7 @@
 State : parse_pkt_in
 shift: 2B
 match_reservations: []
-outputs[addr, width]: ([81, 8], [340, 16])
+outputs[addr, width]: ([81, 8], [334, 16])
 match_extractions: []
 next state parse_ethernet val 0 mask [False]
 parent state <POV initialization>_<Egress intrinsic metadata>_<POV skip>_<_parse_bridged_ingress_intrinsic_metadata>_start
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/logs/parser.characterize.log b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/logs/parser.characterize.log
index 8fd7a5a..c48a218 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/logs/parser.characterize.log
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/logs/parser.characterize.log
@@ -1,6 +1,6 @@
 +---------------------------------------------------------------------+
 |  Log file: parser.characterize.log                                  |
 |  Compiler version: 5.1.0 (fca32d1)                                  |
-|  Created on: Tue Sep 12 11:15:53 2017                               |
+|  Created on: Wed Sep 13 00:59:40 2017                               |
 +---------------------------------------------------------------------+
 
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/logs/transform.log b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/logs/transform.log
index 7a7ed25..d50b7f3 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/logs/transform.log
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/logs/transform.log
@@ -1,7 +1,7 @@
 +---------------------------------------------------------------------+
 |  Log file: transform.log                                            |
 |  Compiler version: 5.1.0 (fca32d1)                                  |
-|  Created on: Tue Sep 12 11:15:53 2017                               |
+|  Created on: Wed Sep 13 00:59:40 2017                               |
 +---------------------------------------------------------------------+
 
 -------------------------------
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/name_lookup.c b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/name_lookup.c
index a1252ec..080748a 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/name_lookup.c
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/name_lookup.c
@@ -77,17 +77,17 @@
         break;
         case 3 :
         {
-          return "I [ethernet.dstAddr[39:8]]";
+          return "I [tcp.dstPort[7:0], tcp.seqNo[31:8]]";
         }
         break;
         case 4 :
         {
-          return "I [ethernet.srcAddr[31:0]]";
+          return "I [ethernet.dstAddr[39:8]]";
         }
         break;
         case 5 :
         {
-          return "I [udp.srcPort, udp.dstPort]";
+          return "I [ethernet.srcAddr[31:0]]";
         }
         break;
         case 64 :
@@ -97,21 +97,26 @@
         break;
         case 65 :
         {
-          return "I [ethernet.dstAddr[47:40]]";
+          return "I [tcp.srcPort[15:8], udp.srcPort[7:0]]";
         }
         break;
         case 66 :
         {
-          return "I [ethernet.srcAddr[39:32]]";
+          return "I [ethernet.dstAddr[47:40]]";
         }
         break;
         case 67 :
         {
-          return "I [POV[39:32]]";
+          return "I [ethernet.srcAddr[39:32]]";
         }
         break;
         case 68 :
         {
+          return "I [POV[39:32]]";
+        }
+        break;
+        case 69 :
+        {
           return "I [ig_intr_md_for_tm.drop_ctl]";
         }
         break;
@@ -147,21 +152,26 @@
         break;
         case 132 :
         {
-          return "I [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]";
+          return "I [tcp.srcPort[7:0], tcp.dstPort[15:8]]";
         }
         break;
         case 133 :
         {
-          return "I [ethernet.etherType]";
+          return "I [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]";
         }
         break;
         case 134 :
         {
-          return "I [ecmp_metadata.group_id]";
+          return "I [ethernet.etherType]";
         }
         break;
         case 135 :
         {
+          return "I [ecmp_metadata.group_id]";
+        }
+        break;
+        case 136 :
+        {
           return "I [ecmp_metadata.selector]";
         }
         break;
@@ -177,7 +187,7 @@
         break;
         case 257 :
         {
-          return "I [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]";
+          return "I [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window, udp.length_, udp.checksum]";
         }
         break;
         case 258 :
@@ -185,42 +195,42 @@
           return "I [tcp.checksum, tcp.urgentPtr]";
         }
         break;
-        case 264 :
+        case 260 :
         {
           return "E [ipv4.ttl, ipv4.protocol, ipv4.hdrChecksum]";
         }
         break;
-        case 265 :
+        case 261 :
         {
           return "E [ipv4.srcAddr]";
         }
         break;
-        case 266 :
+        case 262 :
         {
           return "E [ipv4.dstAddr]";
         }
         break;
-        case 267 :
+        case 263 :
         {
           return "E [tcp.ackNo, udp.length_, udp.checksum]";
         }
         break;
-        case 268 :
+        case 264 :
         {
           return "E [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]";
         }
         break;
-        case 269 :
+        case 265 :
         {
           return "E [tcp.checksum, tcp.urgentPtr]";
         }
         break;
-        case 270 :
+        case 266 :
         {
           return "E [ethernet.dstAddr[39:8]]";
         }
         break;
-        case 271 :
+        case 267 :
         {
           return "E [ethernet.srcAddr[31:0]]";
         }
@@ -232,50 +242,35 @@
         break;
         case 289 :
         {
-          return "I [tcp.srcPort[15:8], udp.length_[15:8]]";
-        }
-        break;
-        case 290 :
-        {
-          return "I [tcp.srcPort[7:0], udp.length_[7:0]]";
-        }
-        break;
-        case 291 :
-        {
-          return "I [tcp.dstPort[15:8]]";
+          return "I [tcp.seqNo[7:0], udp.srcPort[15:8]]";
         }
         break;
         case 292 :
         {
-          return "I [tcp.dstPort[7:0]]";
-        }
-        break;
-        case 296 :
-        {
           return "E [ipv4.version, ipv4.ihl]";
         }
         break;
-        case 297 :
+        case 293 :
         {
           return "E [ipv4.diffserv]";
         }
         break;
-        case 298 :
+        case 294 :
         {
           return "E [tcp.srcPort[15:8], udp.srcPort[15:8]]";
         }
         break;
-        case 299 :
+        case 295 :
         {
           return "E [tcp.srcPort[7:0], udp.srcPort[7:0]]";
         }
         break;
-        case 300 :
+        case 296 :
         {
           return "E [ethernet.dstAddr[47:40]]";
         }
         break;
-        case 301 :
+        case 297 :
         {
           return "E [ethernet.srcAddr[39:32]]";
         }
@@ -292,65 +287,55 @@
         break;
         case 322 :
         {
-          return "I [tcp.seqNo[31:16], udp.checksum]";
+          return "I [tcp.ackNo[31:16], udp.dstPort]";
         }
         break;
         case 323 :
         {
-          return "I [tcp.seqNo[15:0]]";
-        }
-        break;
-        case 324 :
-        {
-          return "I [tcp.ackNo[31:16]]";
-        }
-        break;
-        case 325 :
-        {
           return "I [tcp.ackNo[15:0]]";
         }
         break;
-        case 332 :
+        case 326 :
         {
           return "E [ipv4.totalLen]";
         }
         break;
-        case 333 :
+        case 327 :
         {
           return "E [ipv4.identification]";
         }
         break;
-        case 334 :
+        case 328 :
         {
           return "E [ipv4.flags, ipv4.fragOffset]";
         }
         break;
-        case 335 :
+        case 329 :
         {
-          return "E [tcp.dstPort]";
+          return "E [tcp.dstPort, udp.dstPort]";
         }
         break;
-        case 336 :
+        case 330 :
         {
-          return "E [tcp.seqNo[31:16], udp.dstPort]";
+          return "E [tcp.seqNo[31:16]]";
         }
         break;
-        case 337 :
+        case 331 :
         {
           return "E [tcp.seqNo[15:0]]";
         }
         break;
-        case 338 :
+        case 332 :
         {
           return "E [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]";
         }
         break;
-        case 339 :
+        case 333 :
         {
           return "E [ethernet.etherType]";
         }
         break;
-        case 340 :
+        case 334 :
         {
           return "E [packet_out_hdr.egress_port, packet_out_hdr._padding, packet_in_hdr.ingress_port, packet_in_hdr._padding]";
         }
@@ -378,17 +363,17 @@
         break;
         case 3 :
         {
-          return "I [ethernet.dstAddr[39:8]]";
+          return "I [tcp.dstPort[7:0], tcp.seqNo[31:8]]";
         }
         break;
         case 4 :
         {
-          return "I [ethernet.srcAddr[31:0]]";
+          return "I [ethernet.dstAddr[39:8]]";
         }
         break;
         case 5 :
         {
-          return "I [udp.srcPort, udp.dstPort]";
+          return "I [ethernet.srcAddr[31:0]]";
         }
         break;
         case 64 :
@@ -398,21 +383,26 @@
         break;
         case 65 :
         {
-          return "I [ethernet.dstAddr[47:40]]";
+          return "I [tcp.srcPort[15:8], udp.srcPort[7:0]]";
         }
         break;
         case 66 :
         {
-          return "I [ethernet.srcAddr[39:32]]";
+          return "I [ethernet.dstAddr[47:40]]";
         }
         break;
         case 67 :
         {
-          return "I [POV[39:32]]";
+          return "I [ethernet.srcAddr[39:32]]";
         }
         break;
         case 68 :
         {
+          return "I [POV[39:32]]";
+        }
+        break;
+        case 69 :
+        {
           return "I [ig_intr_md_for_tm.drop_ctl]";
         }
         break;
@@ -448,21 +438,26 @@
         break;
         case 132 :
         {
-          return "I [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]";
+          return "I [tcp.srcPort[7:0], tcp.dstPort[15:8]]";
         }
         break;
         case 133 :
         {
-          return "I [ethernet.etherType]";
+          return "I [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]";
         }
         break;
         case 134 :
         {
-          return "I [ecmp_metadata.group_id]";
+          return "I [ethernet.etherType]";
         }
         break;
         case 135 :
         {
+          return "I [ecmp_metadata.group_id]";
+        }
+        break;
+        case 136 :
+        {
           return "I [ecmp_metadata.selector]";
         }
         break;
@@ -478,7 +473,7 @@
         break;
         case 257 :
         {
-          return "I [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]";
+          return "I [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window, udp.length_, udp.checksum]";
         }
         break;
         case 258 :
@@ -486,42 +481,42 @@
           return "I [tcp.checksum, tcp.urgentPtr]";
         }
         break;
-        case 264 :
+        case 260 :
         {
           return "E [ipv4.ttl, ipv4.protocol, ipv4.hdrChecksum]";
         }
         break;
-        case 265 :
+        case 261 :
         {
           return "E [ipv4.srcAddr]";
         }
         break;
-        case 266 :
+        case 262 :
         {
           return "E [ipv4.dstAddr]";
         }
         break;
-        case 267 :
+        case 263 :
         {
           return "E [tcp.ackNo, udp.length_, udp.checksum]";
         }
         break;
-        case 268 :
+        case 264 :
         {
           return "E [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]";
         }
         break;
-        case 269 :
+        case 265 :
         {
           return "E [tcp.checksum, tcp.urgentPtr]";
         }
         break;
-        case 270 :
+        case 266 :
         {
           return "E [ethernet.dstAddr[39:8]]";
         }
         break;
-        case 271 :
+        case 267 :
         {
           return "E [ethernet.srcAddr[31:0]]";
         }
@@ -533,50 +528,35 @@
         break;
         case 289 :
         {
-          return "I [tcp.srcPort[15:8], udp.length_[15:8]]";
-        }
-        break;
-        case 290 :
-        {
-          return "I [tcp.srcPort[7:0], udp.length_[7:0]]";
-        }
-        break;
-        case 291 :
-        {
-          return "I [tcp.dstPort[15:8]]";
+          return "I [tcp.seqNo[7:0], udp.srcPort[15:8]]";
         }
         break;
         case 292 :
         {
-          return "I [tcp.dstPort[7:0]]";
-        }
-        break;
-        case 296 :
-        {
           return "E [ipv4.version, ipv4.ihl]";
         }
         break;
-        case 297 :
+        case 293 :
         {
           return "E [ipv4.diffserv]";
         }
         break;
-        case 298 :
+        case 294 :
         {
           return "E [tcp.srcPort[15:8], udp.srcPort[15:8]]";
         }
         break;
-        case 299 :
+        case 295 :
         {
           return "E [tcp.srcPort[7:0], udp.srcPort[7:0]]";
         }
         break;
-        case 300 :
+        case 296 :
         {
           return "E [ethernet.dstAddr[47:40]]";
         }
         break;
-        case 301 :
+        case 297 :
         {
           return "E [ethernet.srcAddr[39:32]]";
         }
@@ -593,65 +573,55 @@
         break;
         case 322 :
         {
-          return "I [tcp.seqNo[31:16], udp.checksum]";
+          return "I [tcp.ackNo[31:16], udp.dstPort]";
         }
         break;
         case 323 :
         {
-          return "I [tcp.seqNo[15:0]]";
-        }
-        break;
-        case 324 :
-        {
-          return "I [tcp.ackNo[31:16]]";
-        }
-        break;
-        case 325 :
-        {
           return "I [tcp.ackNo[15:0]]";
         }
         break;
-        case 332 :
+        case 326 :
         {
           return "E [ipv4.totalLen]";
         }
         break;
-        case 333 :
+        case 327 :
         {
           return "E [ipv4.identification]";
         }
         break;
-        case 334 :
+        case 328 :
         {
           return "E [ipv4.flags, ipv4.fragOffset]";
         }
         break;
-        case 335 :
+        case 329 :
         {
-          return "E [tcp.dstPort]";
+          return "E [tcp.dstPort, udp.dstPort]";
         }
         break;
-        case 336 :
+        case 330 :
         {
-          return "E [tcp.seqNo[31:16], udp.dstPort]";
+          return "E [tcp.seqNo[31:16]]";
         }
         break;
-        case 337 :
+        case 331 :
         {
           return "E [tcp.seqNo[15:0]]";
         }
         break;
-        case 338 :
+        case 332 :
         {
           return "E [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]";
         }
         break;
-        case 339 :
+        case 333 :
         {
           return "E [ethernet.etherType]";
         }
         break;
-        case 340 :
+        case 334 :
         {
           return "E [packet_out_hdr.egress_port, packet_out_hdr._padding, packet_in_hdr.ingress_port, packet_in_hdr._padding]";
         }
@@ -679,17 +649,17 @@
         break;
         case 3 :
         {
-          return "I [ethernet.dstAddr[39:8]]";
+          return "I [tcp.dstPort[7:0], tcp.seqNo[31:8]]";
         }
         break;
         case 4 :
         {
-          return "I [ethernet.srcAddr[31:0]]";
+          return "I [ethernet.dstAddr[39:8]]";
         }
         break;
         case 5 :
         {
-          return "I [udp.srcPort, udp.dstPort]";
+          return "I [ethernet.srcAddr[31:0]]";
         }
         break;
         case 64 :
@@ -699,21 +669,26 @@
         break;
         case 65 :
         {
-          return "I [ethernet.dstAddr[47:40]]";
+          return "I [tcp.srcPort[15:8], udp.srcPort[7:0]]";
         }
         break;
         case 66 :
         {
-          return "I [ethernet.srcAddr[39:32]]";
+          return "I [ethernet.dstAddr[47:40]]";
         }
         break;
         case 67 :
         {
-          return "I [POV[39:32]]";
+          return "I [ethernet.srcAddr[39:32]]";
         }
         break;
         case 68 :
         {
+          return "I [POV[39:32]]";
+        }
+        break;
+        case 69 :
+        {
           return "I [ig_intr_md_for_tm.drop_ctl]";
         }
         break;
@@ -749,21 +724,26 @@
         break;
         case 132 :
         {
-          return "I [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]";
+          return "I [tcp.srcPort[7:0], tcp.dstPort[15:8]]";
         }
         break;
         case 133 :
         {
-          return "I [ethernet.etherType]";
+          return "I [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]";
         }
         break;
         case 134 :
         {
-          return "I [ecmp_metadata.group_id]";
+          return "I [ethernet.etherType]";
         }
         break;
         case 135 :
         {
+          return "I [ecmp_metadata.group_id]";
+        }
+        break;
+        case 136 :
+        {
           return "I [ecmp_metadata.selector]";
         }
         break;
@@ -779,7 +759,7 @@
         break;
         case 257 :
         {
-          return "I [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]";
+          return "I [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window, udp.length_, udp.checksum]";
         }
         break;
         case 258 :
@@ -787,42 +767,42 @@
           return "I [tcp.checksum, tcp.urgentPtr]";
         }
         break;
-        case 264 :
+        case 260 :
         {
           return "E [ipv4.ttl, ipv4.protocol, ipv4.hdrChecksum]";
         }
         break;
-        case 265 :
+        case 261 :
         {
           return "E [ipv4.srcAddr]";
         }
         break;
-        case 266 :
+        case 262 :
         {
           return "E [ipv4.dstAddr]";
         }
         break;
-        case 267 :
+        case 263 :
         {
           return "E [tcp.ackNo, udp.length_, udp.checksum]";
         }
         break;
-        case 268 :
+        case 264 :
         {
           return "E [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]";
         }
         break;
-        case 269 :
+        case 265 :
         {
           return "E [tcp.checksum, tcp.urgentPtr]";
         }
         break;
-        case 270 :
+        case 266 :
         {
           return "E [ethernet.dstAddr[39:8]]";
         }
         break;
-        case 271 :
+        case 267 :
         {
           return "E [ethernet.srcAddr[31:0]]";
         }
@@ -834,50 +814,35 @@
         break;
         case 289 :
         {
-          return "I [tcp.srcPort[15:8], udp.length_[15:8]]";
-        }
-        break;
-        case 290 :
-        {
-          return "I [tcp.srcPort[7:0], udp.length_[7:0]]";
-        }
-        break;
-        case 291 :
-        {
-          return "I [tcp.dstPort[15:8]]";
+          return "I [tcp.seqNo[7:0], udp.srcPort[15:8]]";
         }
         break;
         case 292 :
         {
-          return "I [tcp.dstPort[7:0]]";
-        }
-        break;
-        case 296 :
-        {
           return "E [ipv4.version, ipv4.ihl]";
         }
         break;
-        case 297 :
+        case 293 :
         {
           return "E [ipv4.diffserv]";
         }
         break;
-        case 298 :
+        case 294 :
         {
           return "E [tcp.srcPort[15:8], udp.srcPort[15:8]]";
         }
         break;
-        case 299 :
+        case 295 :
         {
           return "E [tcp.srcPort[7:0], udp.srcPort[7:0]]";
         }
         break;
-        case 300 :
+        case 296 :
         {
           return "E [ethernet.dstAddr[47:40]]";
         }
         break;
-        case 301 :
+        case 297 :
         {
           return "E [ethernet.srcAddr[39:32]]";
         }
@@ -894,65 +859,55 @@
         break;
         case 322 :
         {
-          return "I [tcp.seqNo[31:16], udp.checksum]";
+          return "I [tcp.ackNo[31:16], udp.dstPort]";
         }
         break;
         case 323 :
         {
-          return "I [tcp.seqNo[15:0]]";
-        }
-        break;
-        case 324 :
-        {
-          return "I [tcp.ackNo[31:16]]";
-        }
-        break;
-        case 325 :
-        {
           return "I [tcp.ackNo[15:0]]";
         }
         break;
-        case 332 :
+        case 326 :
         {
           return "E [ipv4.totalLen]";
         }
         break;
-        case 333 :
+        case 327 :
         {
           return "E [ipv4.identification]";
         }
         break;
-        case 334 :
+        case 328 :
         {
           return "E [ipv4.flags, ipv4.fragOffset]";
         }
         break;
-        case 335 :
+        case 329 :
         {
-          return "E [tcp.dstPort]";
+          return "E [tcp.dstPort, udp.dstPort]";
         }
         break;
-        case 336 :
+        case 330 :
         {
-          return "E [tcp.seqNo[31:16], udp.dstPort]";
+          return "E [tcp.seqNo[31:16]]";
         }
         break;
-        case 337 :
+        case 331 :
         {
           return "E [tcp.seqNo[15:0]]";
         }
         break;
-        case 338 :
+        case 332 :
         {
           return "E [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]";
         }
         break;
-        case 339 :
+        case 333 :
         {
           return "E [ethernet.etherType]";
         }
         break;
-        case 340 :
+        case 334 :
         {
           return "E [packet_out_hdr.egress_port, packet_out_hdr._padding, packet_in_hdr.ingress_port, packet_in_hdr._padding]";
         }
@@ -980,17 +935,17 @@
         break;
         case 3 :
         {
-          return "I [ethernet.dstAddr[39:8]]";
+          return "I [tcp.dstPort[7:0], tcp.seqNo[31:8]]";
         }
         break;
         case 4 :
         {
-          return "I [ethernet.srcAddr[31:0]]";
+          return "I [ethernet.dstAddr[39:8]]";
         }
         break;
         case 5 :
         {
-          return "I [udp.srcPort, udp.dstPort]";
+          return "I [ethernet.srcAddr[31:0]]";
         }
         break;
         case 64 :
@@ -1000,21 +955,26 @@
         break;
         case 65 :
         {
-          return "I [ethernet.dstAddr[47:40]]";
+          return "I [tcp.srcPort[15:8], udp.srcPort[7:0]]";
         }
         break;
         case 66 :
         {
-          return "I [ethernet.srcAddr[39:32]]";
+          return "I [ethernet.dstAddr[47:40]]";
         }
         break;
         case 67 :
         {
-          return "I [POV[39:32]]";
+          return "I [ethernet.srcAddr[39:32]]";
         }
         break;
         case 68 :
         {
+          return "I [POV[39:32]]";
+        }
+        break;
+        case 69 :
+        {
           return "I [ig_intr_md_for_tm.drop_ctl]";
         }
         break;
@@ -1050,21 +1010,26 @@
         break;
         case 132 :
         {
-          return "I [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]";
+          return "I [tcp.srcPort[7:0], tcp.dstPort[15:8]]";
         }
         break;
         case 133 :
         {
-          return "I [ethernet.etherType]";
+          return "I [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]";
         }
         break;
         case 134 :
         {
-          return "I [ecmp_metadata.group_id]";
+          return "I [ethernet.etherType]";
         }
         break;
         case 135 :
         {
+          return "I [ecmp_metadata.group_id]";
+        }
+        break;
+        case 136 :
+        {
           return "I [ecmp_metadata.selector]";
         }
         break;
@@ -1080,7 +1045,7 @@
         break;
         case 257 :
         {
-          return "I [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]";
+          return "I [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window, udp.length_, udp.checksum]";
         }
         break;
         case 258 :
@@ -1088,42 +1053,42 @@
           return "I [tcp.checksum, tcp.urgentPtr]";
         }
         break;
-        case 264 :
+        case 260 :
         {
           return "E [ipv4.ttl, ipv4.protocol, ipv4.hdrChecksum]";
         }
         break;
-        case 265 :
+        case 261 :
         {
           return "E [ipv4.srcAddr]";
         }
         break;
-        case 266 :
+        case 262 :
         {
           return "E [ipv4.dstAddr]";
         }
         break;
-        case 267 :
+        case 263 :
         {
           return "E [tcp.ackNo, udp.length_, udp.checksum]";
         }
         break;
-        case 268 :
+        case 264 :
         {
           return "E [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]";
         }
         break;
-        case 269 :
+        case 265 :
         {
           return "E [tcp.checksum, tcp.urgentPtr]";
         }
         break;
-        case 270 :
+        case 266 :
         {
           return "E [ethernet.dstAddr[39:8]]";
         }
         break;
-        case 271 :
+        case 267 :
         {
           return "E [ethernet.srcAddr[31:0]]";
         }
@@ -1135,50 +1100,35 @@
         break;
         case 289 :
         {
-          return "I [tcp.srcPort[15:8], udp.length_[15:8]]";
-        }
-        break;
-        case 290 :
-        {
-          return "I [tcp.srcPort[7:0], udp.length_[7:0]]";
-        }
-        break;
-        case 291 :
-        {
-          return "I [tcp.dstPort[15:8]]";
+          return "I [tcp.seqNo[7:0], udp.srcPort[15:8]]";
         }
         break;
         case 292 :
         {
-          return "I [tcp.dstPort[7:0]]";
-        }
-        break;
-        case 296 :
-        {
           return "E [ipv4.version, ipv4.ihl]";
         }
         break;
-        case 297 :
+        case 293 :
         {
           return "E [ipv4.diffserv]";
         }
         break;
-        case 298 :
+        case 294 :
         {
           return "E [tcp.srcPort[15:8], udp.srcPort[15:8]]";
         }
         break;
-        case 299 :
+        case 295 :
         {
           return "E [tcp.srcPort[7:0], udp.srcPort[7:0]]";
         }
         break;
-        case 300 :
+        case 296 :
         {
           return "E [ethernet.dstAddr[47:40]]";
         }
         break;
-        case 301 :
+        case 297 :
         {
           return "E [ethernet.srcAddr[39:32]]";
         }
@@ -1195,65 +1145,55 @@
         break;
         case 322 :
         {
-          return "I [tcp.seqNo[31:16], udp.checksum]";
+          return "I [tcp.ackNo[31:16], udp.dstPort]";
         }
         break;
         case 323 :
         {
-          return "I [tcp.seqNo[15:0]]";
-        }
-        break;
-        case 324 :
-        {
-          return "I [tcp.ackNo[31:16]]";
-        }
-        break;
-        case 325 :
-        {
           return "I [tcp.ackNo[15:0]]";
         }
         break;
-        case 332 :
+        case 326 :
         {
           return "E [ipv4.totalLen]";
         }
         break;
-        case 333 :
+        case 327 :
         {
           return "E [ipv4.identification]";
         }
         break;
-        case 334 :
+        case 328 :
         {
           return "E [ipv4.flags, ipv4.fragOffset]";
         }
         break;
-        case 335 :
+        case 329 :
         {
-          return "E [tcp.dstPort]";
+          return "E [tcp.dstPort, udp.dstPort]";
         }
         break;
-        case 336 :
+        case 330 :
         {
-          return "E [tcp.seqNo[31:16], udp.dstPort]";
+          return "E [tcp.seqNo[31:16]]";
         }
         break;
-        case 337 :
+        case 331 :
         {
           return "E [tcp.seqNo[15:0]]";
         }
         break;
-        case 338 :
+        case 332 :
         {
           return "E [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]";
         }
         break;
-        case 339 :
+        case 333 :
         {
           return "E [ethernet.etherType]";
         }
         break;
-        case 340 :
+        case 334 :
         {
           return "E [packet_out_hdr.egress_port, packet_out_hdr._padding, packet_in_hdr.ingress_port, packet_in_hdr._padding]";
         }
@@ -1281,17 +1221,17 @@
         break;
         case 3 :
         {
-          return "I [ethernet.dstAddr[39:8]]";
+          return "I [tcp.dstPort[7:0], tcp.seqNo[31:8]]";
         }
         break;
         case 4 :
         {
-          return "I [ethernet.srcAddr[31:0]]";
+          return "I [ethernet.dstAddr[39:8]]";
         }
         break;
         case 5 :
         {
-          return "I [udp.srcPort, udp.dstPort]";
+          return "I [ethernet.srcAddr[31:0]]";
         }
         break;
         case 64 :
@@ -1301,21 +1241,26 @@
         break;
         case 65 :
         {
-          return "I [ethernet.dstAddr[47:40]]";
+          return "I [tcp.srcPort[15:8], udp.srcPort[7:0]]";
         }
         break;
         case 66 :
         {
-          return "I [ethernet.srcAddr[39:32]]";
+          return "I [ethernet.dstAddr[47:40]]";
         }
         break;
         case 67 :
         {
-          return "I [POV[39:32]]";
+          return "I [ethernet.srcAddr[39:32]]";
         }
         break;
         case 68 :
         {
+          return "I [POV[39:32]]";
+        }
+        break;
+        case 69 :
+        {
           return "I [ig_intr_md_for_tm.drop_ctl]";
         }
         break;
@@ -1351,21 +1296,26 @@
         break;
         case 132 :
         {
-          return "I [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]";
+          return "I [tcp.srcPort[7:0], tcp.dstPort[15:8]]";
         }
         break;
         case 133 :
         {
-          return "I [ethernet.etherType]";
+          return "I [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]";
         }
         break;
         case 134 :
         {
-          return "I [ecmp_metadata.group_id]";
+          return "I [ethernet.etherType]";
         }
         break;
         case 135 :
         {
+          return "I [ecmp_metadata.group_id]";
+        }
+        break;
+        case 136 :
+        {
           return "I [ecmp_metadata.selector]";
         }
         break;
@@ -1381,7 +1331,7 @@
         break;
         case 257 :
         {
-          return "I [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]";
+          return "I [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window, udp.length_, udp.checksum]";
         }
         break;
         case 258 :
@@ -1389,42 +1339,42 @@
           return "I [tcp.checksum, tcp.urgentPtr]";
         }
         break;
-        case 264 :
+        case 260 :
         {
           return "E [ipv4.ttl, ipv4.protocol, ipv4.hdrChecksum]";
         }
         break;
-        case 265 :
+        case 261 :
         {
           return "E [ipv4.srcAddr]";
         }
         break;
-        case 266 :
+        case 262 :
         {
           return "E [ipv4.dstAddr]";
         }
         break;
-        case 267 :
+        case 263 :
         {
           return "E [tcp.ackNo, udp.length_, udp.checksum]";
         }
         break;
-        case 268 :
+        case 264 :
         {
           return "E [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]";
         }
         break;
-        case 269 :
+        case 265 :
         {
           return "E [tcp.checksum, tcp.urgentPtr]";
         }
         break;
-        case 270 :
+        case 266 :
         {
           return "E [ethernet.dstAddr[39:8]]";
         }
         break;
-        case 271 :
+        case 267 :
         {
           return "E [ethernet.srcAddr[31:0]]";
         }
@@ -1436,50 +1386,35 @@
         break;
         case 289 :
         {
-          return "I [tcp.srcPort[15:8], udp.length_[15:8]]";
-        }
-        break;
-        case 290 :
-        {
-          return "I [tcp.srcPort[7:0], udp.length_[7:0]]";
-        }
-        break;
-        case 291 :
-        {
-          return "I [tcp.dstPort[15:8]]";
+          return "I [tcp.seqNo[7:0], udp.srcPort[15:8]]";
         }
         break;
         case 292 :
         {
-          return "I [tcp.dstPort[7:0]]";
-        }
-        break;
-        case 296 :
-        {
           return "E [ipv4.version, ipv4.ihl]";
         }
         break;
-        case 297 :
+        case 293 :
         {
           return "E [ipv4.diffserv]";
         }
         break;
-        case 298 :
+        case 294 :
         {
           return "E [tcp.srcPort[15:8], udp.srcPort[15:8]]";
         }
         break;
-        case 299 :
+        case 295 :
         {
           return "E [tcp.srcPort[7:0], udp.srcPort[7:0]]";
         }
         break;
-        case 300 :
+        case 296 :
         {
           return "E [ethernet.dstAddr[47:40]]";
         }
         break;
-        case 301 :
+        case 297 :
         {
           return "E [ethernet.srcAddr[39:32]]";
         }
@@ -1496,65 +1431,55 @@
         break;
         case 322 :
         {
-          return "I [tcp.seqNo[31:16], udp.checksum]";
+          return "I [tcp.ackNo[31:16], udp.dstPort]";
         }
         break;
         case 323 :
         {
-          return "I [tcp.seqNo[15:0]]";
-        }
-        break;
-        case 324 :
-        {
-          return "I [tcp.ackNo[31:16]]";
-        }
-        break;
-        case 325 :
-        {
           return "I [tcp.ackNo[15:0]]";
         }
         break;
-        case 332 :
+        case 326 :
         {
           return "E [ipv4.totalLen]";
         }
         break;
-        case 333 :
+        case 327 :
         {
           return "E [ipv4.identification]";
         }
         break;
-        case 334 :
+        case 328 :
         {
           return "E [ipv4.flags, ipv4.fragOffset]";
         }
         break;
-        case 335 :
+        case 329 :
         {
-          return "E [tcp.dstPort]";
+          return "E [tcp.dstPort, udp.dstPort]";
         }
         break;
-        case 336 :
+        case 330 :
         {
-          return "E [tcp.seqNo[31:16], udp.dstPort]";
+          return "E [tcp.seqNo[31:16]]";
         }
         break;
-        case 337 :
+        case 331 :
         {
           return "E [tcp.seqNo[15:0]]";
         }
         break;
-        case 338 :
+        case 332 :
         {
           return "E [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]";
         }
         break;
-        case 339 :
+        case 333 :
         {
           return "E [ethernet.etherType]";
         }
         break;
-        case 340 :
+        case 334 :
         {
           return "E [packet_out_hdr.egress_port, packet_out_hdr._padding, packet_in_hdr.ingress_port, packet_in_hdr._padding]";
         }
@@ -1582,17 +1507,17 @@
         break;
         case 3 :
         {
-          return "I [ethernet.dstAddr[39:8]]";
+          return "I [tcp.dstPort[7:0], tcp.seqNo[31:8]]";
         }
         break;
         case 4 :
         {
-          return "I [ethernet.srcAddr[31:0]]";
+          return "I [ethernet.dstAddr[39:8]]";
         }
         break;
         case 5 :
         {
-          return "I [udp.srcPort, udp.dstPort]";
+          return "I [ethernet.srcAddr[31:0]]";
         }
         break;
         case 64 :
@@ -1602,21 +1527,26 @@
         break;
         case 65 :
         {
-          return "I [ethernet.dstAddr[47:40]]";
+          return "I [tcp.srcPort[15:8], udp.srcPort[7:0]]";
         }
         break;
         case 66 :
         {
-          return "I [ethernet.srcAddr[39:32]]";
+          return "I [ethernet.dstAddr[47:40]]";
         }
         break;
         case 67 :
         {
-          return "I [POV[39:32]]";
+          return "I [ethernet.srcAddr[39:32]]";
         }
         break;
         case 68 :
         {
+          return "I [POV[39:32]]";
+        }
+        break;
+        case 69 :
+        {
           return "I [ig_intr_md_for_tm.drop_ctl]";
         }
         break;
@@ -1652,21 +1582,26 @@
         break;
         case 132 :
         {
-          return "I [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]";
+          return "I [tcp.srcPort[7:0], tcp.dstPort[15:8]]";
         }
         break;
         case 133 :
         {
-          return "I [ethernet.etherType]";
+          return "I [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]";
         }
         break;
         case 134 :
         {
-          return "I [ecmp_metadata.group_id]";
+          return "I [ethernet.etherType]";
         }
         break;
         case 135 :
         {
+          return "I [ecmp_metadata.group_id]";
+        }
+        break;
+        case 136 :
+        {
           return "I [ecmp_metadata.selector]";
         }
         break;
@@ -1682,7 +1617,7 @@
         break;
         case 257 :
         {
-          return "I [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]";
+          return "I [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window, udp.length_, udp.checksum]";
         }
         break;
         case 258 :
@@ -1690,42 +1625,42 @@
           return "I [tcp.checksum, tcp.urgentPtr]";
         }
         break;
-        case 264 :
+        case 260 :
         {
           return "E [ipv4.ttl, ipv4.protocol, ipv4.hdrChecksum]";
         }
         break;
-        case 265 :
+        case 261 :
         {
           return "E [ipv4.srcAddr]";
         }
         break;
-        case 266 :
+        case 262 :
         {
           return "E [ipv4.dstAddr]";
         }
         break;
-        case 267 :
+        case 263 :
         {
           return "E [tcp.ackNo, udp.length_, udp.checksum]";
         }
         break;
-        case 268 :
+        case 264 :
         {
           return "E [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]";
         }
         break;
-        case 269 :
+        case 265 :
         {
           return "E [tcp.checksum, tcp.urgentPtr]";
         }
         break;
-        case 270 :
+        case 266 :
         {
           return "E [ethernet.dstAddr[39:8]]";
         }
         break;
-        case 271 :
+        case 267 :
         {
           return "E [ethernet.srcAddr[31:0]]";
         }
@@ -1737,50 +1672,35 @@
         break;
         case 289 :
         {
-          return "I [tcp.srcPort[15:8], udp.length_[15:8]]";
-        }
-        break;
-        case 290 :
-        {
-          return "I [tcp.srcPort[7:0], udp.length_[7:0]]";
-        }
-        break;
-        case 291 :
-        {
-          return "I [tcp.dstPort[15:8]]";
+          return "I [tcp.seqNo[7:0], udp.srcPort[15:8]]";
         }
         break;
         case 292 :
         {
-          return "I [tcp.dstPort[7:0]]";
-        }
-        break;
-        case 296 :
-        {
           return "E [ipv4.version, ipv4.ihl]";
         }
         break;
-        case 297 :
+        case 293 :
         {
           return "E [ipv4.diffserv]";
         }
         break;
-        case 298 :
+        case 294 :
         {
           return "E [tcp.srcPort[15:8], udp.srcPort[15:8]]";
         }
         break;
-        case 299 :
+        case 295 :
         {
           return "E [tcp.srcPort[7:0], udp.srcPort[7:0]]";
         }
         break;
-        case 300 :
+        case 296 :
         {
           return "E [ethernet.dstAddr[47:40]]";
         }
         break;
-        case 301 :
+        case 297 :
         {
           return "E [ethernet.srcAddr[39:32]]";
         }
@@ -1797,65 +1717,55 @@
         break;
         case 322 :
         {
-          return "I [tcp.seqNo[31:16], udp.checksum]";
+          return "I [tcp.ackNo[31:16], udp.dstPort]";
         }
         break;
         case 323 :
         {
-          return "I [tcp.seqNo[15:0]]";
-        }
-        break;
-        case 324 :
-        {
-          return "I [tcp.ackNo[31:16]]";
-        }
-        break;
-        case 325 :
-        {
           return "I [tcp.ackNo[15:0]]";
         }
         break;
-        case 332 :
+        case 326 :
         {
           return "E [ipv4.totalLen]";
         }
         break;
-        case 333 :
+        case 327 :
         {
           return "E [ipv4.identification]";
         }
         break;
-        case 334 :
+        case 328 :
         {
           return "E [ipv4.flags, ipv4.fragOffset]";
         }
         break;
-        case 335 :
+        case 329 :
         {
-          return "E [tcp.dstPort]";
+          return "E [tcp.dstPort, udp.dstPort]";
         }
         break;
-        case 336 :
+        case 330 :
         {
-          return "E [tcp.seqNo[31:16], udp.dstPort]";
+          return "E [tcp.seqNo[31:16]]";
         }
         break;
-        case 337 :
+        case 331 :
         {
           return "E [tcp.seqNo[15:0]]";
         }
         break;
-        case 338 :
+        case 332 :
         {
           return "E [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]";
         }
         break;
-        case 339 :
+        case 333 :
         {
           return "E [ethernet.etherType]";
         }
         break;
-        case 340 :
+        case 334 :
         {
           return "E [packet_out_hdr.egress_port, packet_out_hdr._padding, packet_in_hdr.ingress_port, packet_in_hdr._padding]";
         }
@@ -1883,17 +1793,17 @@
         break;
         case 3 :
         {
-          return "I [ethernet.dstAddr[39:8]]";
+          return "I [tcp.dstPort[7:0], tcp.seqNo[31:8]]";
         }
         break;
         case 4 :
         {
-          return "I [ethernet.srcAddr[31:0]]";
+          return "I [ethernet.dstAddr[39:8]]";
         }
         break;
         case 5 :
         {
-          return "I [udp.srcPort, udp.dstPort]";
+          return "I [ethernet.srcAddr[31:0]]";
         }
         break;
         case 64 :
@@ -1903,21 +1813,26 @@
         break;
         case 65 :
         {
-          return "I [ethernet.dstAddr[47:40]]";
+          return "I [tcp.srcPort[15:8], udp.srcPort[7:0]]";
         }
         break;
         case 66 :
         {
-          return "I [ethernet.srcAddr[39:32]]";
+          return "I [ethernet.dstAddr[47:40]]";
         }
         break;
         case 67 :
         {
-          return "I [POV[39:32]]";
+          return "I [ethernet.srcAddr[39:32]]";
         }
         break;
         case 68 :
         {
+          return "I [POV[39:32]]";
+        }
+        break;
+        case 69 :
+        {
           return "I [ig_intr_md_for_tm.drop_ctl]";
         }
         break;
@@ -1953,21 +1868,26 @@
         break;
         case 132 :
         {
-          return "I [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]";
+          return "I [tcp.srcPort[7:0], tcp.dstPort[15:8]]";
         }
         break;
         case 133 :
         {
-          return "I [ethernet.etherType]";
+          return "I [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]";
         }
         break;
         case 134 :
         {
-          return "I [ecmp_metadata.group_id]";
+          return "I [ethernet.etherType]";
         }
         break;
         case 135 :
         {
+          return "I [ecmp_metadata.group_id]";
+        }
+        break;
+        case 136 :
+        {
           return "I [ecmp_metadata.selector]";
         }
         break;
@@ -1983,7 +1903,7 @@
         break;
         case 257 :
         {
-          return "I [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]";
+          return "I [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window, udp.length_, udp.checksum]";
         }
         break;
         case 258 :
@@ -1991,42 +1911,42 @@
           return "I [tcp.checksum, tcp.urgentPtr]";
         }
         break;
-        case 264 :
+        case 260 :
         {
           return "E [ipv4.ttl, ipv4.protocol, ipv4.hdrChecksum]";
         }
         break;
-        case 265 :
+        case 261 :
         {
           return "E [ipv4.srcAddr]";
         }
         break;
-        case 266 :
+        case 262 :
         {
           return "E [ipv4.dstAddr]";
         }
         break;
-        case 267 :
+        case 263 :
         {
           return "E [tcp.ackNo, udp.length_, udp.checksum]";
         }
         break;
-        case 268 :
+        case 264 :
         {
           return "E [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]";
         }
         break;
-        case 269 :
+        case 265 :
         {
           return "E [tcp.checksum, tcp.urgentPtr]";
         }
         break;
-        case 270 :
+        case 266 :
         {
           return "E [ethernet.dstAddr[39:8]]";
         }
         break;
-        case 271 :
+        case 267 :
         {
           return "E [ethernet.srcAddr[31:0]]";
         }
@@ -2038,50 +1958,35 @@
         break;
         case 289 :
         {
-          return "I [tcp.srcPort[15:8], udp.length_[15:8]]";
-        }
-        break;
-        case 290 :
-        {
-          return "I [tcp.srcPort[7:0], udp.length_[7:0]]";
-        }
-        break;
-        case 291 :
-        {
-          return "I [tcp.dstPort[15:8]]";
+          return "I [tcp.seqNo[7:0], udp.srcPort[15:8]]";
         }
         break;
         case 292 :
         {
-          return "I [tcp.dstPort[7:0]]";
-        }
-        break;
-        case 296 :
-        {
           return "E [ipv4.version, ipv4.ihl]";
         }
         break;
-        case 297 :
+        case 293 :
         {
           return "E [ipv4.diffserv]";
         }
         break;
-        case 298 :
+        case 294 :
         {
           return "E [tcp.srcPort[15:8], udp.srcPort[15:8]]";
         }
         break;
-        case 299 :
+        case 295 :
         {
           return "E [tcp.srcPort[7:0], udp.srcPort[7:0]]";
         }
         break;
-        case 300 :
+        case 296 :
         {
           return "E [ethernet.dstAddr[47:40]]";
         }
         break;
-        case 301 :
+        case 297 :
         {
           return "E [ethernet.srcAddr[39:32]]";
         }
@@ -2098,65 +2003,55 @@
         break;
         case 322 :
         {
-          return "I [tcp.seqNo[31:16], udp.checksum]";
+          return "I [tcp.ackNo[31:16], udp.dstPort]";
         }
         break;
         case 323 :
         {
-          return "I [tcp.seqNo[15:0]]";
-        }
-        break;
-        case 324 :
-        {
-          return "I [tcp.ackNo[31:16]]";
-        }
-        break;
-        case 325 :
-        {
           return "I [tcp.ackNo[15:0]]";
         }
         break;
-        case 332 :
+        case 326 :
         {
           return "E [ipv4.totalLen]";
         }
         break;
-        case 333 :
+        case 327 :
         {
           return "E [ipv4.identification]";
         }
         break;
-        case 334 :
+        case 328 :
         {
           return "E [ipv4.flags, ipv4.fragOffset]";
         }
         break;
-        case 335 :
+        case 329 :
         {
-          return "E [tcp.dstPort]";
+          return "E [tcp.dstPort, udp.dstPort]";
         }
         break;
-        case 336 :
+        case 330 :
         {
-          return "E [tcp.seqNo[31:16], udp.dstPort]";
+          return "E [tcp.seqNo[31:16]]";
         }
         break;
-        case 337 :
+        case 331 :
         {
           return "E [tcp.seqNo[15:0]]";
         }
         break;
-        case 338 :
+        case 332 :
         {
           return "E [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]";
         }
         break;
-        case 339 :
+        case 333 :
         {
           return "E [ethernet.etherType]";
         }
         break;
-        case 340 :
+        case 334 :
         {
           return "E [packet_out_hdr.egress_port, packet_out_hdr._padding, packet_in_hdr.ingress_port, packet_in_hdr._padding]";
         }
@@ -2184,17 +2079,17 @@
         break;
         case 3 :
         {
-          return "I [ethernet.dstAddr[39:8]]";
+          return "I [tcp.dstPort[7:0], tcp.seqNo[31:8]]";
         }
         break;
         case 4 :
         {
-          return "I [ethernet.srcAddr[31:0]]";
+          return "I [ethernet.dstAddr[39:8]]";
         }
         break;
         case 5 :
         {
-          return "I [udp.srcPort, udp.dstPort]";
+          return "I [ethernet.srcAddr[31:0]]";
         }
         break;
         case 64 :
@@ -2204,21 +2099,26 @@
         break;
         case 65 :
         {
-          return "I [ethernet.dstAddr[47:40]]";
+          return "I [tcp.srcPort[15:8], udp.srcPort[7:0]]";
         }
         break;
         case 66 :
         {
-          return "I [ethernet.srcAddr[39:32]]";
+          return "I [ethernet.dstAddr[47:40]]";
         }
         break;
         case 67 :
         {
-          return "I [POV[39:32]]";
+          return "I [ethernet.srcAddr[39:32]]";
         }
         break;
         case 68 :
         {
+          return "I [POV[39:32]]";
+        }
+        break;
+        case 69 :
+        {
           return "I [ig_intr_md_for_tm.drop_ctl]";
         }
         break;
@@ -2254,21 +2154,26 @@
         break;
         case 132 :
         {
-          return "I [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]";
+          return "I [tcp.srcPort[7:0], tcp.dstPort[15:8]]";
         }
         break;
         case 133 :
         {
-          return "I [ethernet.etherType]";
+          return "I [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]";
         }
         break;
         case 134 :
         {
-          return "I [ecmp_metadata.group_id]";
+          return "I [ethernet.etherType]";
         }
         break;
         case 135 :
         {
+          return "I [ecmp_metadata.group_id]";
+        }
+        break;
+        case 136 :
+        {
           return "I [ecmp_metadata.selector]";
         }
         break;
@@ -2284,7 +2189,7 @@
         break;
         case 257 :
         {
-          return "I [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]";
+          return "I [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window, udp.length_, udp.checksum]";
         }
         break;
         case 258 :
@@ -2292,42 +2197,42 @@
           return "I [tcp.checksum, tcp.urgentPtr]";
         }
         break;
-        case 264 :
+        case 260 :
         {
           return "E [ipv4.ttl, ipv4.protocol, ipv4.hdrChecksum]";
         }
         break;
-        case 265 :
+        case 261 :
         {
           return "E [ipv4.srcAddr]";
         }
         break;
-        case 266 :
+        case 262 :
         {
           return "E [ipv4.dstAddr]";
         }
         break;
-        case 267 :
+        case 263 :
         {
           return "E [tcp.ackNo, udp.length_, udp.checksum]";
         }
         break;
-        case 268 :
+        case 264 :
         {
           return "E [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]";
         }
         break;
-        case 269 :
+        case 265 :
         {
           return "E [tcp.checksum, tcp.urgentPtr]";
         }
         break;
-        case 270 :
+        case 266 :
         {
           return "E [ethernet.dstAddr[39:8]]";
         }
         break;
-        case 271 :
+        case 267 :
         {
           return "E [ethernet.srcAddr[31:0]]";
         }
@@ -2339,50 +2244,35 @@
         break;
         case 289 :
         {
-          return "I [tcp.srcPort[15:8], udp.length_[15:8]]";
-        }
-        break;
-        case 290 :
-        {
-          return "I [tcp.srcPort[7:0], udp.length_[7:0]]";
-        }
-        break;
-        case 291 :
-        {
-          return "I [tcp.dstPort[15:8]]";
+          return "I [tcp.seqNo[7:0], udp.srcPort[15:8]]";
         }
         break;
         case 292 :
         {
-          return "I [tcp.dstPort[7:0]]";
-        }
-        break;
-        case 296 :
-        {
           return "E [ipv4.version, ipv4.ihl]";
         }
         break;
-        case 297 :
+        case 293 :
         {
           return "E [ipv4.diffserv]";
         }
         break;
-        case 298 :
+        case 294 :
         {
           return "E [tcp.srcPort[15:8], udp.srcPort[15:8]]";
         }
         break;
-        case 299 :
+        case 295 :
         {
           return "E [tcp.srcPort[7:0], udp.srcPort[7:0]]";
         }
         break;
-        case 300 :
+        case 296 :
         {
           return "E [ethernet.dstAddr[47:40]]";
         }
         break;
-        case 301 :
+        case 297 :
         {
           return "E [ethernet.srcAddr[39:32]]";
         }
@@ -2399,65 +2289,55 @@
         break;
         case 322 :
         {
-          return "I [tcp.seqNo[31:16], udp.checksum]";
+          return "I [tcp.ackNo[31:16], udp.dstPort]";
         }
         break;
         case 323 :
         {
-          return "I [tcp.seqNo[15:0]]";
-        }
-        break;
-        case 324 :
-        {
-          return "I [tcp.ackNo[31:16]]";
-        }
-        break;
-        case 325 :
-        {
           return "I [tcp.ackNo[15:0]]";
         }
         break;
-        case 332 :
+        case 326 :
         {
           return "E [ipv4.totalLen]";
         }
         break;
-        case 333 :
+        case 327 :
         {
           return "E [ipv4.identification]";
         }
         break;
-        case 334 :
+        case 328 :
         {
           return "E [ipv4.flags, ipv4.fragOffset]";
         }
         break;
-        case 335 :
+        case 329 :
         {
-          return "E [tcp.dstPort]";
+          return "E [tcp.dstPort, udp.dstPort]";
         }
         break;
-        case 336 :
+        case 330 :
         {
-          return "E [tcp.seqNo[31:16], udp.dstPort]";
+          return "E [tcp.seqNo[31:16]]";
         }
         break;
-        case 337 :
+        case 331 :
         {
           return "E [tcp.seqNo[15:0]]";
         }
         break;
-        case 338 :
+        case 332 :
         {
           return "E [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]";
         }
         break;
-        case 339 :
+        case 333 :
         {
           return "E [ethernet.etherType]";
         }
         break;
-        case 340 :
+        case 334 :
         {
           return "E [packet_out_hdr.egress_port, packet_out_hdr._padding, packet_in_hdr.ingress_port, packet_in_hdr._padding]";
         }
@@ -2485,17 +2365,17 @@
         break;
         case 3 :
         {
-          return "I [ethernet.dstAddr[39:8]]";
+          return "I [tcp.dstPort[7:0], tcp.seqNo[31:8]]";
         }
         break;
         case 4 :
         {
-          return "I [ethernet.srcAddr[31:0]]";
+          return "I [ethernet.dstAddr[39:8]]";
         }
         break;
         case 5 :
         {
-          return "I [udp.srcPort, udp.dstPort]";
+          return "I [ethernet.srcAddr[31:0]]";
         }
         break;
         case 64 :
@@ -2505,21 +2385,26 @@
         break;
         case 65 :
         {
-          return "I [ethernet.dstAddr[47:40]]";
+          return "I [tcp.srcPort[15:8], udp.srcPort[7:0]]";
         }
         break;
         case 66 :
         {
-          return "I [ethernet.srcAddr[39:32]]";
+          return "I [ethernet.dstAddr[47:40]]";
         }
         break;
         case 67 :
         {
-          return "I [POV[39:32]]";
+          return "I [ethernet.srcAddr[39:32]]";
         }
         break;
         case 68 :
         {
+          return "I [POV[39:32]]";
+        }
+        break;
+        case 69 :
+        {
           return "I [ig_intr_md_for_tm.drop_ctl]";
         }
         break;
@@ -2555,21 +2440,26 @@
         break;
         case 132 :
         {
-          return "I [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]";
+          return "I [tcp.srcPort[7:0], tcp.dstPort[15:8]]";
         }
         break;
         case 133 :
         {
-          return "I [ethernet.etherType]";
+          return "I [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]";
         }
         break;
         case 134 :
         {
-          return "I [ecmp_metadata.group_id]";
+          return "I [ethernet.etherType]";
         }
         break;
         case 135 :
         {
+          return "I [ecmp_metadata.group_id]";
+        }
+        break;
+        case 136 :
+        {
           return "I [ecmp_metadata.selector]";
         }
         break;
@@ -2585,7 +2475,7 @@
         break;
         case 257 :
         {
-          return "I [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]";
+          return "I [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window, udp.length_, udp.checksum]";
         }
         break;
         case 258 :
@@ -2593,42 +2483,42 @@
           return "I [tcp.checksum, tcp.urgentPtr]";
         }
         break;
-        case 264 :
+        case 260 :
         {
           return "E [ipv4.ttl, ipv4.protocol, ipv4.hdrChecksum]";
         }
         break;
-        case 265 :
+        case 261 :
         {
           return "E [ipv4.srcAddr]";
         }
         break;
-        case 266 :
+        case 262 :
         {
           return "E [ipv4.dstAddr]";
         }
         break;
-        case 267 :
+        case 263 :
         {
           return "E [tcp.ackNo, udp.length_, udp.checksum]";
         }
         break;
-        case 268 :
+        case 264 :
         {
           return "E [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]";
         }
         break;
-        case 269 :
+        case 265 :
         {
           return "E [tcp.checksum, tcp.urgentPtr]";
         }
         break;
-        case 270 :
+        case 266 :
         {
           return "E [ethernet.dstAddr[39:8]]";
         }
         break;
-        case 271 :
+        case 267 :
         {
           return "E [ethernet.srcAddr[31:0]]";
         }
@@ -2640,50 +2530,35 @@
         break;
         case 289 :
         {
-          return "I [tcp.srcPort[15:8], udp.length_[15:8]]";
-        }
-        break;
-        case 290 :
-        {
-          return "I [tcp.srcPort[7:0], udp.length_[7:0]]";
-        }
-        break;
-        case 291 :
-        {
-          return "I [tcp.dstPort[15:8]]";
+          return "I [tcp.seqNo[7:0], udp.srcPort[15:8]]";
         }
         break;
         case 292 :
         {
-          return "I [tcp.dstPort[7:0]]";
-        }
-        break;
-        case 296 :
-        {
           return "E [ipv4.version, ipv4.ihl]";
         }
         break;
-        case 297 :
+        case 293 :
         {
           return "E [ipv4.diffserv]";
         }
         break;
-        case 298 :
+        case 294 :
         {
           return "E [tcp.srcPort[15:8], udp.srcPort[15:8]]";
         }
         break;
-        case 299 :
+        case 295 :
         {
           return "E [tcp.srcPort[7:0], udp.srcPort[7:0]]";
         }
         break;
-        case 300 :
+        case 296 :
         {
           return "E [ethernet.dstAddr[47:40]]";
         }
         break;
-        case 301 :
+        case 297 :
         {
           return "E [ethernet.srcAddr[39:32]]";
         }
@@ -2700,65 +2575,55 @@
         break;
         case 322 :
         {
-          return "I [tcp.seqNo[31:16], udp.checksum]";
+          return "I [tcp.ackNo[31:16], udp.dstPort]";
         }
         break;
         case 323 :
         {
-          return "I [tcp.seqNo[15:0]]";
-        }
-        break;
-        case 324 :
-        {
-          return "I [tcp.ackNo[31:16]]";
-        }
-        break;
-        case 325 :
-        {
           return "I [tcp.ackNo[15:0]]";
         }
         break;
-        case 332 :
+        case 326 :
         {
           return "E [ipv4.totalLen]";
         }
         break;
-        case 333 :
+        case 327 :
         {
           return "E [ipv4.identification]";
         }
         break;
-        case 334 :
+        case 328 :
         {
           return "E [ipv4.flags, ipv4.fragOffset]";
         }
         break;
-        case 335 :
+        case 329 :
         {
-          return "E [tcp.dstPort]";
+          return "E [tcp.dstPort, udp.dstPort]";
         }
         break;
-        case 336 :
+        case 330 :
         {
-          return "E [tcp.seqNo[31:16], udp.dstPort]";
+          return "E [tcp.seqNo[31:16]]";
         }
         break;
-        case 337 :
+        case 331 :
         {
           return "E [tcp.seqNo[15:0]]";
         }
         break;
-        case 338 :
+        case 332 :
         {
           return "E [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]";
         }
         break;
-        case 339 :
+        case 333 :
         {
           return "E [ethernet.etherType]";
         }
         break;
-        case 340 :
+        case 334 :
         {
           return "E [packet_out_hdr.egress_port, packet_out_hdr._padding, packet_in_hdr.ingress_port, packet_in_hdr._padding]";
         }
@@ -2786,17 +2651,17 @@
         break;
         case 3 :
         {
-          return "I [ethernet.dstAddr[39:8]]";
+          return "I [tcp.dstPort[7:0], tcp.seqNo[31:8]]";
         }
         break;
         case 4 :
         {
-          return "I [ethernet.srcAddr[31:0]]";
+          return "I [ethernet.dstAddr[39:8]]";
         }
         break;
         case 5 :
         {
-          return "I [udp.srcPort, udp.dstPort]";
+          return "I [ethernet.srcAddr[31:0]]";
         }
         break;
         case 64 :
@@ -2806,21 +2671,26 @@
         break;
         case 65 :
         {
-          return "I [ethernet.dstAddr[47:40]]";
+          return "I [tcp.srcPort[15:8], udp.srcPort[7:0]]";
         }
         break;
         case 66 :
         {
-          return "I [ethernet.srcAddr[39:32]]";
+          return "I [ethernet.dstAddr[47:40]]";
         }
         break;
         case 67 :
         {
-          return "I [POV[39:32]]";
+          return "I [ethernet.srcAddr[39:32]]";
         }
         break;
         case 68 :
         {
+          return "I [POV[39:32]]";
+        }
+        break;
+        case 69 :
+        {
           return "I [ig_intr_md_for_tm.drop_ctl]";
         }
         break;
@@ -2856,21 +2726,26 @@
         break;
         case 132 :
         {
-          return "I [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]";
+          return "I [tcp.srcPort[7:0], tcp.dstPort[15:8]]";
         }
         break;
         case 133 :
         {
-          return "I [ethernet.etherType]";
+          return "I [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]";
         }
         break;
         case 134 :
         {
-          return "I [ecmp_metadata.group_id]";
+          return "I [ethernet.etherType]";
         }
         break;
         case 135 :
         {
+          return "I [ecmp_metadata.group_id]";
+        }
+        break;
+        case 136 :
+        {
           return "I [ecmp_metadata.selector]";
         }
         break;
@@ -2886,7 +2761,7 @@
         break;
         case 257 :
         {
-          return "I [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]";
+          return "I [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window, udp.length_, udp.checksum]";
         }
         break;
         case 258 :
@@ -2894,42 +2769,42 @@
           return "I [tcp.checksum, tcp.urgentPtr]";
         }
         break;
-        case 264 :
+        case 260 :
         {
           return "E [ipv4.ttl, ipv4.protocol, ipv4.hdrChecksum]";
         }
         break;
-        case 265 :
+        case 261 :
         {
           return "E [ipv4.srcAddr]";
         }
         break;
-        case 266 :
+        case 262 :
         {
           return "E [ipv4.dstAddr]";
         }
         break;
-        case 267 :
+        case 263 :
         {
           return "E [tcp.ackNo, udp.length_, udp.checksum]";
         }
         break;
-        case 268 :
+        case 264 :
         {
           return "E [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]";
         }
         break;
-        case 269 :
+        case 265 :
         {
           return "E [tcp.checksum, tcp.urgentPtr]";
         }
         break;
-        case 270 :
+        case 266 :
         {
           return "E [ethernet.dstAddr[39:8]]";
         }
         break;
-        case 271 :
+        case 267 :
         {
           return "E [ethernet.srcAddr[31:0]]";
         }
@@ -2941,50 +2816,35 @@
         break;
         case 289 :
         {
-          return "I [tcp.srcPort[15:8], udp.length_[15:8]]";
-        }
-        break;
-        case 290 :
-        {
-          return "I [tcp.srcPort[7:0], udp.length_[7:0]]";
-        }
-        break;
-        case 291 :
-        {
-          return "I [tcp.dstPort[15:8]]";
+          return "I [tcp.seqNo[7:0], udp.srcPort[15:8]]";
         }
         break;
         case 292 :
         {
-          return "I [tcp.dstPort[7:0]]";
-        }
-        break;
-        case 296 :
-        {
           return "E [ipv4.version, ipv4.ihl]";
         }
         break;
-        case 297 :
+        case 293 :
         {
           return "E [ipv4.diffserv]";
         }
         break;
-        case 298 :
+        case 294 :
         {
           return "E [tcp.srcPort[15:8], udp.srcPort[15:8]]";
         }
         break;
-        case 299 :
+        case 295 :
         {
           return "E [tcp.srcPort[7:0], udp.srcPort[7:0]]";
         }
         break;
-        case 300 :
+        case 296 :
         {
           return "E [ethernet.dstAddr[47:40]]";
         }
         break;
-        case 301 :
+        case 297 :
         {
           return "E [ethernet.srcAddr[39:32]]";
         }
@@ -3001,65 +2861,55 @@
         break;
         case 322 :
         {
-          return "I [tcp.seqNo[31:16], udp.checksum]";
+          return "I [tcp.ackNo[31:16], udp.dstPort]";
         }
         break;
         case 323 :
         {
-          return "I [tcp.seqNo[15:0]]";
-        }
-        break;
-        case 324 :
-        {
-          return "I [tcp.ackNo[31:16]]";
-        }
-        break;
-        case 325 :
-        {
           return "I [tcp.ackNo[15:0]]";
         }
         break;
-        case 332 :
+        case 326 :
         {
           return "E [ipv4.totalLen]";
         }
         break;
-        case 333 :
+        case 327 :
         {
           return "E [ipv4.identification]";
         }
         break;
-        case 334 :
+        case 328 :
         {
           return "E [ipv4.flags, ipv4.fragOffset]";
         }
         break;
-        case 335 :
+        case 329 :
         {
-          return "E [tcp.dstPort]";
+          return "E [tcp.dstPort, udp.dstPort]";
         }
         break;
-        case 336 :
+        case 330 :
         {
-          return "E [tcp.seqNo[31:16], udp.dstPort]";
+          return "E [tcp.seqNo[31:16]]";
         }
         break;
-        case 337 :
+        case 331 :
         {
           return "E [tcp.seqNo[15:0]]";
         }
         break;
-        case 338 :
+        case 332 :
         {
           return "E [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]";
         }
         break;
-        case 339 :
+        case 333 :
         {
           return "E [ethernet.etherType]";
         }
         break;
-        case 340 :
+        case 334 :
         {
           return "E [packet_out_hdr.egress_port, packet_out_hdr._padding, packet_in_hdr.ingress_port, packet_in_hdr._padding]";
         }
@@ -3087,17 +2937,17 @@
         break;
         case 3 :
         {
-          return "I [ethernet.dstAddr[39:8]]";
+          return "I [tcp.dstPort[7:0], tcp.seqNo[31:8]]";
         }
         break;
         case 4 :
         {
-          return "I [ethernet.srcAddr[31:0]]";
+          return "I [ethernet.dstAddr[39:8]]";
         }
         break;
         case 5 :
         {
-          return "I [udp.srcPort, udp.dstPort]";
+          return "I [ethernet.srcAddr[31:0]]";
         }
         break;
         case 64 :
@@ -3107,21 +2957,26 @@
         break;
         case 65 :
         {
-          return "I [ethernet.dstAddr[47:40]]";
+          return "I [tcp.srcPort[15:8], udp.srcPort[7:0]]";
         }
         break;
         case 66 :
         {
-          return "I [ethernet.srcAddr[39:32]]";
+          return "I [ethernet.dstAddr[47:40]]";
         }
         break;
         case 67 :
         {
-          return "I [POV[39:32]]";
+          return "I [ethernet.srcAddr[39:32]]";
         }
         break;
         case 68 :
         {
+          return "I [POV[39:32]]";
+        }
+        break;
+        case 69 :
+        {
           return "I [ig_intr_md_for_tm.drop_ctl]";
         }
         break;
@@ -3157,21 +3012,26 @@
         break;
         case 132 :
         {
-          return "I [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]";
+          return "I [tcp.srcPort[7:0], tcp.dstPort[15:8]]";
         }
         break;
         case 133 :
         {
-          return "I [ethernet.etherType]";
+          return "I [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]";
         }
         break;
         case 134 :
         {
-          return "I [ecmp_metadata.group_id]";
+          return "I [ethernet.etherType]";
         }
         break;
         case 135 :
         {
+          return "I [ecmp_metadata.group_id]";
+        }
+        break;
+        case 136 :
+        {
           return "I [ecmp_metadata.selector]";
         }
         break;
@@ -3187,7 +3047,7 @@
         break;
         case 257 :
         {
-          return "I [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]";
+          return "I [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window, udp.length_, udp.checksum]";
         }
         break;
         case 258 :
@@ -3195,42 +3055,42 @@
           return "I [tcp.checksum, tcp.urgentPtr]";
         }
         break;
-        case 264 :
+        case 260 :
         {
           return "E [ipv4.ttl, ipv4.protocol, ipv4.hdrChecksum]";
         }
         break;
-        case 265 :
+        case 261 :
         {
           return "E [ipv4.srcAddr]";
         }
         break;
-        case 266 :
+        case 262 :
         {
           return "E [ipv4.dstAddr]";
         }
         break;
-        case 267 :
+        case 263 :
         {
           return "E [tcp.ackNo, udp.length_, udp.checksum]";
         }
         break;
-        case 268 :
+        case 264 :
         {
           return "E [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]";
         }
         break;
-        case 269 :
+        case 265 :
         {
           return "E [tcp.checksum, tcp.urgentPtr]";
         }
         break;
-        case 270 :
+        case 266 :
         {
           return "E [ethernet.dstAddr[39:8]]";
         }
         break;
-        case 271 :
+        case 267 :
         {
           return "E [ethernet.srcAddr[31:0]]";
         }
@@ -3242,50 +3102,35 @@
         break;
         case 289 :
         {
-          return "I [tcp.srcPort[15:8], udp.length_[15:8]]";
-        }
-        break;
-        case 290 :
-        {
-          return "I [tcp.srcPort[7:0], udp.length_[7:0]]";
-        }
-        break;
-        case 291 :
-        {
-          return "I [tcp.dstPort[15:8]]";
+          return "I [tcp.seqNo[7:0], udp.srcPort[15:8]]";
         }
         break;
         case 292 :
         {
-          return "I [tcp.dstPort[7:0]]";
-        }
-        break;
-        case 296 :
-        {
           return "E [ipv4.version, ipv4.ihl]";
         }
         break;
-        case 297 :
+        case 293 :
         {
           return "E [ipv4.diffserv]";
         }
         break;
-        case 298 :
+        case 294 :
         {
           return "E [tcp.srcPort[15:8], udp.srcPort[15:8]]";
         }
         break;
-        case 299 :
+        case 295 :
         {
           return "E [tcp.srcPort[7:0], udp.srcPort[7:0]]";
         }
         break;
-        case 300 :
+        case 296 :
         {
           return "E [ethernet.dstAddr[47:40]]";
         }
         break;
-        case 301 :
+        case 297 :
         {
           return "E [ethernet.srcAddr[39:32]]";
         }
@@ -3302,65 +3147,55 @@
         break;
         case 322 :
         {
-          return "I [tcp.seqNo[31:16], udp.checksum]";
+          return "I [tcp.ackNo[31:16], udp.dstPort]";
         }
         break;
         case 323 :
         {
-          return "I [tcp.seqNo[15:0]]";
-        }
-        break;
-        case 324 :
-        {
-          return "I [tcp.ackNo[31:16]]";
-        }
-        break;
-        case 325 :
-        {
           return "I [tcp.ackNo[15:0]]";
         }
         break;
-        case 332 :
+        case 326 :
         {
           return "E [ipv4.totalLen]";
         }
         break;
-        case 333 :
+        case 327 :
         {
           return "E [ipv4.identification]";
         }
         break;
-        case 334 :
+        case 328 :
         {
           return "E [ipv4.flags, ipv4.fragOffset]";
         }
         break;
-        case 335 :
+        case 329 :
         {
-          return "E [tcp.dstPort]";
+          return "E [tcp.dstPort, udp.dstPort]";
         }
         break;
-        case 336 :
+        case 330 :
         {
-          return "E [tcp.seqNo[31:16], udp.dstPort]";
+          return "E [tcp.seqNo[31:16]]";
         }
         break;
-        case 337 :
+        case 331 :
         {
           return "E [tcp.seqNo[15:0]]";
         }
         break;
-        case 338 :
+        case 332 :
         {
           return "E [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]";
         }
         break;
-        case 339 :
+        case 333 :
         {
           return "E [ethernet.etherType]";
         }
         break;
-        case 340 :
+        case 334 :
         {
           return "E [packet_out_hdr.egress_port, packet_out_hdr._padding, packet_in_hdr.ingress_port, packet_in_hdr._padding]";
         }
@@ -3388,17 +3223,17 @@
         break;
         case 3 :
         {
-          return "I [ethernet.dstAddr[39:8]]";
+          return "I [tcp.dstPort[7:0], tcp.seqNo[31:8]]";
         }
         break;
         case 4 :
         {
-          return "I [ethernet.srcAddr[31:0]]";
+          return "I [ethernet.dstAddr[39:8]]";
         }
         break;
         case 5 :
         {
-          return "I [udp.srcPort, udp.dstPort]";
+          return "I [ethernet.srcAddr[31:0]]";
         }
         break;
         case 64 :
@@ -3408,21 +3243,26 @@
         break;
         case 65 :
         {
-          return "I [ethernet.dstAddr[47:40]]";
+          return "I [tcp.srcPort[15:8], udp.srcPort[7:0]]";
         }
         break;
         case 66 :
         {
-          return "I [ethernet.srcAddr[39:32]]";
+          return "I [ethernet.dstAddr[47:40]]";
         }
         break;
         case 67 :
         {
-          return "I [POV[39:32]]";
+          return "I [ethernet.srcAddr[39:32]]";
         }
         break;
         case 68 :
         {
+          return "I [POV[39:32]]";
+        }
+        break;
+        case 69 :
+        {
           return "I [ig_intr_md_for_tm.drop_ctl]";
         }
         break;
@@ -3458,21 +3298,26 @@
         break;
         case 132 :
         {
-          return "I [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]";
+          return "I [tcp.srcPort[7:0], tcp.dstPort[15:8]]";
         }
         break;
         case 133 :
         {
-          return "I [ethernet.etherType]";
+          return "I [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]";
         }
         break;
         case 134 :
         {
-          return "I [ecmp_metadata.group_id]";
+          return "I [ethernet.etherType]";
         }
         break;
         case 135 :
         {
+          return "I [ecmp_metadata.group_id]";
+        }
+        break;
+        case 136 :
+        {
           return "I [ecmp_metadata.selector]";
         }
         break;
@@ -3488,7 +3333,7 @@
         break;
         case 257 :
         {
-          return "I [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]";
+          return "I [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window, udp.length_, udp.checksum]";
         }
         break;
         case 258 :
@@ -3496,42 +3341,42 @@
           return "I [tcp.checksum, tcp.urgentPtr]";
         }
         break;
-        case 264 :
+        case 260 :
         {
           return "E [ipv4.ttl, ipv4.protocol, ipv4.hdrChecksum]";
         }
         break;
-        case 265 :
+        case 261 :
         {
           return "E [ipv4.srcAddr]";
         }
         break;
-        case 266 :
+        case 262 :
         {
           return "E [ipv4.dstAddr]";
         }
         break;
-        case 267 :
+        case 263 :
         {
           return "E [tcp.ackNo, udp.length_, udp.checksum]";
         }
         break;
-        case 268 :
+        case 264 :
         {
           return "E [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]";
         }
         break;
-        case 269 :
+        case 265 :
         {
           return "E [tcp.checksum, tcp.urgentPtr]";
         }
         break;
-        case 270 :
+        case 266 :
         {
           return "E [ethernet.dstAddr[39:8]]";
         }
         break;
-        case 271 :
+        case 267 :
         {
           return "E [ethernet.srcAddr[31:0]]";
         }
@@ -3543,50 +3388,35 @@
         break;
         case 289 :
         {
-          return "I [tcp.srcPort[15:8], udp.length_[15:8]]";
-        }
-        break;
-        case 290 :
-        {
-          return "I [tcp.srcPort[7:0], udp.length_[7:0]]";
-        }
-        break;
-        case 291 :
-        {
-          return "I [tcp.dstPort[15:8]]";
+          return "I [tcp.seqNo[7:0], udp.srcPort[15:8]]";
         }
         break;
         case 292 :
         {
-          return "I [tcp.dstPort[7:0]]";
-        }
-        break;
-        case 296 :
-        {
           return "E [ipv4.version, ipv4.ihl]";
         }
         break;
-        case 297 :
+        case 293 :
         {
           return "E [ipv4.diffserv]";
         }
         break;
-        case 298 :
+        case 294 :
         {
           return "E [tcp.srcPort[15:8], udp.srcPort[15:8]]";
         }
         break;
-        case 299 :
+        case 295 :
         {
           return "E [tcp.srcPort[7:0], udp.srcPort[7:0]]";
         }
         break;
-        case 300 :
+        case 296 :
         {
           return "E [ethernet.dstAddr[47:40]]";
         }
         break;
-        case 301 :
+        case 297 :
         {
           return "E [ethernet.srcAddr[39:32]]";
         }
@@ -3603,65 +3433,55 @@
         break;
         case 322 :
         {
-          return "I [tcp.seqNo[31:16], udp.checksum]";
+          return "I [tcp.ackNo[31:16], udp.dstPort]";
         }
         break;
         case 323 :
         {
-          return "I [tcp.seqNo[15:0]]";
-        }
-        break;
-        case 324 :
-        {
-          return "I [tcp.ackNo[31:16]]";
-        }
-        break;
-        case 325 :
-        {
           return "I [tcp.ackNo[15:0]]";
         }
         break;
-        case 332 :
+        case 326 :
         {
           return "E [ipv4.totalLen]";
         }
         break;
-        case 333 :
+        case 327 :
         {
           return "E [ipv4.identification]";
         }
         break;
-        case 334 :
+        case 328 :
         {
           return "E [ipv4.flags, ipv4.fragOffset]";
         }
         break;
-        case 335 :
+        case 329 :
         {
-          return "E [tcp.dstPort]";
+          return "E [tcp.dstPort, udp.dstPort]";
         }
         break;
-        case 336 :
+        case 330 :
         {
-          return "E [tcp.seqNo[31:16], udp.dstPort]";
+          return "E [tcp.seqNo[31:16]]";
         }
         break;
-        case 337 :
+        case 331 :
         {
           return "E [tcp.seqNo[15:0]]";
         }
         break;
-        case 338 :
+        case 332 :
         {
           return "E [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]";
         }
         break;
-        case 339 :
+        case 333 :
         {
           return "E [ethernet.etherType]";
         }
         break;
-        case 340 :
+        case 334 :
         {
           return "E [packet_out_hdr.egress_port, packet_out_hdr._padding, packet_in_hdr.ingress_port, packet_in_hdr._padding]";
         }
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/tofino.bin b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/tofino.bin
index e5bbf3c..f1122fa 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/tofino.bin
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/tofino.bin
Binary files differ
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/visualization/deparser.html b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/visualization/deparser.html
index 5e7b125..eff550f 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/visualization/deparser.html
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/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>
@@ -163,15 +163,6 @@
         
 
         <tr class="fde_row_0">
-            <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_1">
             <td style="border-right: 1px solid black">packet_in_hdr (32)</td>
             <td>129</td>
             <td>129</td>
@@ -180,27 +171,18 @@
         </tr>
         
 
-        <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>
+        <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_1">
+        <tr class="fde_row_0">
             <td style="border-right: 1px solid black">ethernet (34)</td>
-            <td>3</td>
-            <td>132</td>
-            <td>132</td>
             <td>66</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>
@@ -209,8 +191,26 @@
 
         <tr class="fde_row_1">
             <td style="border-right: 1px solid black">ethernet (34)</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>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>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>
         
 
@@ -400,164 +400,164 @@
 <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><font color=#333333><i>340</i></font></td>
-            <td><font color=#333333><i>340</i></font></td>
-            <td>-</td>
-            <td>-</td>
-        </tr>
-        
-
-        <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>
         
 
-        <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 style="border-right: 1px solid black">packet_out_hdr (1)</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 style="border-right: 1px solid black">ethernet (2)</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:16:13 2017</i>
+<br><i>Created on Wed Sep 13 00:59:58 2017</i>
 
 <br><i>Compiler version: 5.1.0 (fca32d1)</i>
 
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/visualization/mau.html b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/visualization/mau.html
index c657339..89076e7 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/visualization/mau.html
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/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:10 2017</i>
+<br><i>Created on Wed Sep 13 00:59:54 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/mavericks/visualization/parser.egress.html b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/visualization/parser.egress.html
index 3352020..b65220b 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/visualization/parser.egress.html
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/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:16:13 2017</i>
+<br><i>Created on Wed Sep 13 00:59:58 2017</i>
 
 <br><i>Compiler version: 5.1.0 (fca32d1)</i>
 
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/visualization/parser.ingress.html b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/visualization/parser.ingress.html
index b7b2079..370291f 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/visualization/parser.ingress.html
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/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>0140 && 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:16:13 2017</i>
+<br><i>Created on Wed Sep 13 00:59:58 2017</i>
 
 <br><i>Compiler version: 5.1.0 (fca32d1)</i>
 
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/visualization/phv_allocation.html b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/visualization/phv_allocation.html
index b2946d0..8a13a77 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/visualization/phv_allocation.html
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/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:10 2017</i>
+<br><i>Created on Wed Sep 13 00:59:55 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/mavericks/visualization/table_placement.html b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/visualization/table_placement.html
index 8dfe6b9..6d0bec7 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/visualization/table_placement.html
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/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:10 2017</i>
+<br><i>Created on Wed Sep 13 00:59:54 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/context/context.json b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/context/context.json
index 57f4c85..008d972 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/context/context.json
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/context/context.json
@@ -1,5 +1,5 @@
 {
-    "build_date": "Tue Sep 12 11:17:02 2017", 
+    "build_date": "Wed Sep 13 01:00:43 2017", 
     "phv_allocation": [
         {
             "ingress": [
@@ -84,6 +84,35 @@
                     "records": [
                         {
                             "word_bit_width": 32, 
+                            "position_offset": 33, 
+                            "phv_lsb": 24, 
+                            "is_pov": false, 
+                            "field_msb": 7, 
+                            "phv_msb": 31, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_dstPort", 
+                            "field_width": 2, 
+                            "field_lsb": 0
+                        }, 
+                        {
+                            "word_bit_width": 32, 
+                            "position_offset": 76, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 31, 
+                            "phv_msb": 23, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_seqNo", 
+                            "field_width": 4, 
+                            "field_lsb": 8
+                        }
+                    ]
+                }, 
+                {
+                    "phv_number": 4, 
+                    "records": [
+                        {
+                            "word_bit_width": 32, 
                             "position_offset": 20, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
@@ -97,7 +126,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 4, 
+                    "phv_number": 5, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -114,35 +143,6 @@
                     ]
                 }, 
                 {
-                    "phv_number": 5, 
-                    "records": [
-                        {
-                            "word_bit_width": 32, 
-                            "position_offset": 66, 
-                            "phv_lsb": 16, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 31, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_srcPort", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }, 
-                        {
-                            "word_bit_width": 32, 
-                            "position_offset": 55, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_dstPort", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
                     "phv_number": 64, 
                     "records": [
                         {
@@ -164,6 +164,35 @@
                     "records": [
                         {
                             "word_bit_width": 8, 
+                            "position_offset": 38, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 7, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_srcPort", 
+                            "field_width": 2, 
+                            "field_lsb": 8
+                        }, 
+                        {
+                            "word_bit_width": 8, 
+                            "position_offset": 66, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 7, 
+                            "phv_msb": 7, 
+                            "is_compiler_generated": false, 
+                            "field_name": "udp_srcPort", 
+                            "field_width": 2, 
+                            "field_lsb": 0
+                        }
+                    ]
+                }, 
+                {
+                    "phv_number": 66, 
+                    "records": [
+                        {
+                            "word_bit_width": 8, 
                             "position_offset": 20, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
@@ -177,7 +206,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 66, 
+                    "phv_number": 67, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -194,7 +223,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 67, 
+                    "phv_number": 68, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -249,7 +278,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 68, 
+                    "phv_number": 69, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -362,6 +391,35 @@
                     "records": [
                         {
                             "word_bit_width": 16, 
+                            "position_offset": 38, 
+                            "phv_lsb": 8, 
+                            "is_pov": false, 
+                            "field_msb": 7, 
+                            "phv_msb": 15, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_srcPort", 
+                            "field_width": 2, 
+                            "field_lsb": 0
+                        }, 
+                        {
+                            "word_bit_width": 16, 
+                            "position_offset": 33, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 7, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_dstPort", 
+                            "field_width": 2, 
+                            "field_lsb": 8
+                        }
+                    ]
+                }, 
+                {
+                    "phv_number": 133, 
+                    "records": [
+                        {
+                            "word_bit_width": 16, 
                             "position_offset": 20, 
                             "phv_lsb": 8, 
                             "is_pov": false, 
@@ -387,7 +445,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 133, 
+                    "phv_number": 134, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -404,7 +462,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 134, 
+                    "phv_number": 135, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -421,7 +479,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 135, 
+                    "phv_number": 136, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -552,6 +610,30 @@
                             "field_name": "tcp_window", 
                             "field_width": 2, 
                             "field_lsb": 0
+                        }, 
+                        {
+                            "word_bit_width": 32, 
+                            "position_offset": 17, 
+                            "phv_lsb": 16, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 31, 
+                            "is_compiler_generated": false, 
+                            "field_name": "udp_length_", 
+                            "field_width": 2, 
+                            "field_lsb": 0
+                        }, 
+                        {
+                            "word_bit_width": 32, 
+                            "position_offset": 68, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 15, 
+                            "is_compiler_generated": false, 
+                            "field_name": "udp_checksum", 
+                            "field_width": 2, 
+                            "field_lsb": 0
                         }
                     ]
                 }, 
@@ -618,94 +700,31 @@
                     "records": [
                         {
                             "word_bit_width": 8, 
-                            "position_offset": 38, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 7, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_srcPort", 
-                            "field_width": 2, 
-                            "field_lsb": 8
-                        }, 
-                        {
-                            "word_bit_width": 8, 
-                            "position_offset": 17, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 7, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_length_", 
-                            "field_width": 2, 
-                            "field_lsb": 8
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 290, 
-                    "records": [
-                        {
-                            "word_bit_width": 8, 
-                            "position_offset": 38, 
+                            "position_offset": 76, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 7, 
                             "phv_msb": 7, 
                             "is_compiler_generated": false, 
-                            "field_name": "tcp_srcPort", 
-                            "field_width": 2, 
+                            "field_name": "tcp_seqNo", 
+                            "field_width": 4, 
                             "field_lsb": 0
                         }, 
                         {
                             "word_bit_width": 8, 
-                            "position_offset": 17, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 7, 
-                            "phv_msb": 7, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_length_", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 291, 
-                    "records": [
-                        {
-                            "word_bit_width": 8, 
-                            "position_offset": 33, 
+                            "position_offset": 66, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 15, 
                             "phv_msb": 7, 
                             "is_compiler_generated": false, 
-                            "field_name": "tcp_dstPort", 
+                            "field_name": "udp_srcPort", 
                             "field_width": 2, 
                             "field_lsb": 8
                         }
                     ]
                 }, 
                 {
-                    "phv_number": 292, 
-                    "records": [
-                        {
-                            "word_bit_width": 8, 
-                            "position_offset": 33, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 7, 
-                            "phv_msb": 7, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_dstPort", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
                     "phv_number": 320, 
                     "records": [
                         {
@@ -768,52 +787,6 @@
                     "records": [
                         {
                             "word_bit_width": 16, 
-                            "position_offset": 76, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 31, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_seqNo", 
-                            "field_width": 4, 
-                            "field_lsb": 16
-                        }, 
-                        {
-                            "word_bit_width": 16, 
-                            "position_offset": 68, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_checksum", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 323, 
-                    "records": [
-                        {
-                            "word_bit_width": 16, 
-                            "position_offset": 76, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_seqNo", 
-                            "field_width": 4, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 324, 
-                    "records": [
-                        {
-                            "word_bit_width": 16, 
                             "position_offset": 26, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
@@ -823,11 +796,23 @@
                             "field_name": "tcp_ackNo", 
                             "field_width": 4, 
                             "field_lsb": 16
+                        }, 
+                        {
+                            "word_bit_width": 16, 
+                            "position_offset": 55, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 15, 
+                            "is_compiler_generated": false, 
+                            "field_name": "udp_dstPort", 
+                            "field_width": 2, 
+                            "field_lsb": 0
                         }
                     ]
                 }, 
                 {
-                    "phv_number": 325, 
+                    "phv_number": 323, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -935,7 +920,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 264, 
+                    "phv_number": 260, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -976,7 +961,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 265, 
+                    "phv_number": 261, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -993,7 +978,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 266, 
+                    "phv_number": 262, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -1010,7 +995,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 267, 
+                    "phv_number": 263, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -1051,7 +1036,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 268, 
+                    "phv_number": 264, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -1116,7 +1101,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 269, 
+                    "phv_number": 265, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -1145,7 +1130,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 270, 
+                    "phv_number": 266, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -1162,7 +1147,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 271, 
+                    "phv_number": 267, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -1179,7 +1164,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 296, 
+                    "phv_number": 292, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -1208,7 +1193,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 297, 
+                    "phv_number": 293, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -1225,7 +1210,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 298, 
+                    "phv_number": 294, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -1254,7 +1239,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 299, 
+                    "phv_number": 295, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -1283,7 +1268,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 300, 
+                    "phv_number": 296, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -1300,7 +1285,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 301, 
+                    "phv_number": 297, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -1317,7 +1302,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 332, 
+                    "phv_number": 326, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -1334,7 +1319,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 333, 
+                    "phv_number": 327, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -1351,7 +1336,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 334, 
+                    "phv_number": 328, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -1380,7 +1365,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 335, 
+                    "phv_number": 329, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -1393,23 +1378,6 @@
                             "field_name": "tcp_dstPort", 
                             "field_width": 2, 
                             "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 336, 
-                    "records": [
-                        {
-                            "word_bit_width": 16, 
-                            "position_offset": 69, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 31, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_seqNo", 
-                            "field_width": 4, 
-                            "field_lsb": 16
                         }, 
                         {
                             "word_bit_width": 16, 
@@ -1426,7 +1394,24 @@
                     ]
                 }, 
                 {
-                    "phv_number": 337, 
+                    "phv_number": 330, 
+                    "records": [
+                        {
+                            "word_bit_width": 16, 
+                            "position_offset": 69, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 31, 
+                            "phv_msb": 15, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_seqNo", 
+                            "field_width": 4, 
+                            "field_lsb": 16
+                        }
+                    ]
+                }, 
+                {
+                    "phv_number": 331, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -1443,7 +1428,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 338, 
+                    "phv_number": 332, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -1472,7 +1457,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 339, 
+                    "phv_number": 333, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -1489,7 +1474,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 340, 
+                    "phv_number": 334, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -1603,6 +1588,35 @@
                     "records": [
                         {
                             "word_bit_width": 32, 
+                            "position_offset": 33, 
+                            "phv_lsb": 24, 
+                            "is_pov": false, 
+                            "field_msb": 7, 
+                            "phv_msb": 31, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_dstPort", 
+                            "field_width": 2, 
+                            "field_lsb": 0
+                        }, 
+                        {
+                            "word_bit_width": 32, 
+                            "position_offset": 76, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 31, 
+                            "phv_msb": 23, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_seqNo", 
+                            "field_width": 4, 
+                            "field_lsb": 8
+                        }
+                    ]
+                }, 
+                {
+                    "phv_number": 4, 
+                    "records": [
+                        {
+                            "word_bit_width": 32, 
                             "position_offset": 20, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
@@ -1616,7 +1630,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 4, 
+                    "phv_number": 5, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -1633,35 +1647,6 @@
                     ]
                 }, 
                 {
-                    "phv_number": 5, 
-                    "records": [
-                        {
-                            "word_bit_width": 32, 
-                            "position_offset": 66, 
-                            "phv_lsb": 16, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 31, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_srcPort", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }, 
-                        {
-                            "word_bit_width": 32, 
-                            "position_offset": 55, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_dstPort", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
                     "phv_number": 64, 
                     "records": [
                         {
@@ -1683,6 +1668,35 @@
                     "records": [
                         {
                             "word_bit_width": 8, 
+                            "position_offset": 38, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 7, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_srcPort", 
+                            "field_width": 2, 
+                            "field_lsb": 8
+                        }, 
+                        {
+                            "word_bit_width": 8, 
+                            "position_offset": 66, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 7, 
+                            "phv_msb": 7, 
+                            "is_compiler_generated": false, 
+                            "field_name": "udp_srcPort", 
+                            "field_width": 2, 
+                            "field_lsb": 0
+                        }
+                    ]
+                }, 
+                {
+                    "phv_number": 66, 
+                    "records": [
+                        {
+                            "word_bit_width": 8, 
                             "position_offset": 20, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
@@ -1696,7 +1710,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 66, 
+                    "phv_number": 67, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -1713,7 +1727,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 67, 
+                    "phv_number": 68, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -1768,7 +1782,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 68, 
+                    "phv_number": 69, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -1881,6 +1895,35 @@
                     "records": [
                         {
                             "word_bit_width": 16, 
+                            "position_offset": 38, 
+                            "phv_lsb": 8, 
+                            "is_pov": false, 
+                            "field_msb": 7, 
+                            "phv_msb": 15, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_srcPort", 
+                            "field_width": 2, 
+                            "field_lsb": 0
+                        }, 
+                        {
+                            "word_bit_width": 16, 
+                            "position_offset": 33, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 7, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_dstPort", 
+                            "field_width": 2, 
+                            "field_lsb": 8
+                        }
+                    ]
+                }, 
+                {
+                    "phv_number": 133, 
+                    "records": [
+                        {
+                            "word_bit_width": 16, 
                             "position_offset": 20, 
                             "phv_lsb": 8, 
                             "is_pov": false, 
@@ -1906,7 +1949,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 133, 
+                    "phv_number": 134, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -1923,7 +1966,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 134, 
+                    "phv_number": 135, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -1940,7 +1983,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 135, 
+                    "phv_number": 136, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -2071,6 +2114,30 @@
                             "field_name": "tcp_window", 
                             "field_width": 2, 
                             "field_lsb": 0
+                        }, 
+                        {
+                            "word_bit_width": 32, 
+                            "position_offset": 17, 
+                            "phv_lsb": 16, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 31, 
+                            "is_compiler_generated": false, 
+                            "field_name": "udp_length_", 
+                            "field_width": 2, 
+                            "field_lsb": 0
+                        }, 
+                        {
+                            "word_bit_width": 32, 
+                            "position_offset": 68, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 15, 
+                            "is_compiler_generated": false, 
+                            "field_name": "udp_checksum", 
+                            "field_width": 2, 
+                            "field_lsb": 0
                         }
                     ]
                 }, 
@@ -2137,94 +2204,31 @@
                     "records": [
                         {
                             "word_bit_width": 8, 
-                            "position_offset": 38, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 7, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_srcPort", 
-                            "field_width": 2, 
-                            "field_lsb": 8
-                        }, 
-                        {
-                            "word_bit_width": 8, 
-                            "position_offset": 17, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 7, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_length_", 
-                            "field_width": 2, 
-                            "field_lsb": 8
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 290, 
-                    "records": [
-                        {
-                            "word_bit_width": 8, 
-                            "position_offset": 38, 
+                            "position_offset": 76, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 7, 
                             "phv_msb": 7, 
                             "is_compiler_generated": false, 
-                            "field_name": "tcp_srcPort", 
-                            "field_width": 2, 
+                            "field_name": "tcp_seqNo", 
+                            "field_width": 4, 
                             "field_lsb": 0
                         }, 
                         {
                             "word_bit_width": 8, 
-                            "position_offset": 17, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 7, 
-                            "phv_msb": 7, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_length_", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 291, 
-                    "records": [
-                        {
-                            "word_bit_width": 8, 
-                            "position_offset": 33, 
+                            "position_offset": 66, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 15, 
                             "phv_msb": 7, 
                             "is_compiler_generated": false, 
-                            "field_name": "tcp_dstPort", 
+                            "field_name": "udp_srcPort", 
                             "field_width": 2, 
                             "field_lsb": 8
                         }
                     ]
                 }, 
                 {
-                    "phv_number": 292, 
-                    "records": [
-                        {
-                            "word_bit_width": 8, 
-                            "position_offset": 33, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 7, 
-                            "phv_msb": 7, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_dstPort", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
                     "phv_number": 320, 
                     "records": [
                         {
@@ -2287,52 +2291,6 @@
                     "records": [
                         {
                             "word_bit_width": 16, 
-                            "position_offset": 76, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 31, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_seqNo", 
-                            "field_width": 4, 
-                            "field_lsb": 16
-                        }, 
-                        {
-                            "word_bit_width": 16, 
-                            "position_offset": 68, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_checksum", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 323, 
-                    "records": [
-                        {
-                            "word_bit_width": 16, 
-                            "position_offset": 76, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_seqNo", 
-                            "field_width": 4, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 324, 
-                    "records": [
-                        {
-                            "word_bit_width": 16, 
                             "position_offset": 26, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
@@ -2342,11 +2300,23 @@
                             "field_name": "tcp_ackNo", 
                             "field_width": 4, 
                             "field_lsb": 16
+                        }, 
+                        {
+                            "word_bit_width": 16, 
+                            "position_offset": 55, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 15, 
+                            "is_compiler_generated": false, 
+                            "field_name": "udp_dstPort", 
+                            "field_width": 2, 
+                            "field_lsb": 0
                         }
                     ]
                 }, 
                 {
-                    "phv_number": 325, 
+                    "phv_number": 323, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -2454,7 +2424,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 264, 
+                    "phv_number": 260, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -2495,7 +2465,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 265, 
+                    "phv_number": 261, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -2512,7 +2482,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 266, 
+                    "phv_number": 262, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -2529,7 +2499,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 267, 
+                    "phv_number": 263, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -2570,7 +2540,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 268, 
+                    "phv_number": 264, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -2635,7 +2605,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 269, 
+                    "phv_number": 265, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -2664,7 +2634,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 270, 
+                    "phv_number": 266, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -2681,7 +2651,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 271, 
+                    "phv_number": 267, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -2698,7 +2668,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 296, 
+                    "phv_number": 292, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -2727,7 +2697,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 297, 
+                    "phv_number": 293, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -2744,7 +2714,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 298, 
+                    "phv_number": 294, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -2773,7 +2743,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 299, 
+                    "phv_number": 295, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -2802,7 +2772,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 300, 
+                    "phv_number": 296, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -2819,7 +2789,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 301, 
+                    "phv_number": 297, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -2836,7 +2806,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 332, 
+                    "phv_number": 326, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -2853,7 +2823,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 333, 
+                    "phv_number": 327, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -2870,7 +2840,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 334, 
+                    "phv_number": 328, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -2899,7 +2869,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 335, 
+                    "phv_number": 329, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -2912,23 +2882,6 @@
                             "field_name": "tcp_dstPort", 
                             "field_width": 2, 
                             "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 336, 
-                    "records": [
-                        {
-                            "word_bit_width": 16, 
-                            "position_offset": 69, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 31, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_seqNo", 
-                            "field_width": 4, 
-                            "field_lsb": 16
                         }, 
                         {
                             "word_bit_width": 16, 
@@ -2945,7 +2898,24 @@
                     ]
                 }, 
                 {
-                    "phv_number": 337, 
+                    "phv_number": 330, 
+                    "records": [
+                        {
+                            "word_bit_width": 16, 
+                            "position_offset": 69, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 31, 
+                            "phv_msb": 15, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_seqNo", 
+                            "field_width": 4, 
+                            "field_lsb": 16
+                        }
+                    ]
+                }, 
+                {
+                    "phv_number": 331, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -2962,7 +2932,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 338, 
+                    "phv_number": 332, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -2991,7 +2961,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 339, 
+                    "phv_number": 333, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -3008,7 +2978,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 340, 
+                    "phv_number": 334, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -3122,6 +3092,35 @@
                     "records": [
                         {
                             "word_bit_width": 32, 
+                            "position_offset": 33, 
+                            "phv_lsb": 24, 
+                            "is_pov": false, 
+                            "field_msb": 7, 
+                            "phv_msb": 31, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_dstPort", 
+                            "field_width": 2, 
+                            "field_lsb": 0
+                        }, 
+                        {
+                            "word_bit_width": 32, 
+                            "position_offset": 76, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 31, 
+                            "phv_msb": 23, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_seqNo", 
+                            "field_width": 4, 
+                            "field_lsb": 8
+                        }
+                    ]
+                }, 
+                {
+                    "phv_number": 4, 
+                    "records": [
+                        {
+                            "word_bit_width": 32, 
                             "position_offset": 20, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
@@ -3135,7 +3134,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 4, 
+                    "phv_number": 5, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -3152,35 +3151,6 @@
                     ]
                 }, 
                 {
-                    "phv_number": 5, 
-                    "records": [
-                        {
-                            "word_bit_width": 32, 
-                            "position_offset": 66, 
-                            "phv_lsb": 16, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 31, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_srcPort", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }, 
-                        {
-                            "word_bit_width": 32, 
-                            "position_offset": 55, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_dstPort", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
                     "phv_number": 64, 
                     "records": [
                         {
@@ -3202,6 +3172,35 @@
                     "records": [
                         {
                             "word_bit_width": 8, 
+                            "position_offset": 38, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 7, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_srcPort", 
+                            "field_width": 2, 
+                            "field_lsb": 8
+                        }, 
+                        {
+                            "word_bit_width": 8, 
+                            "position_offset": 66, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 7, 
+                            "phv_msb": 7, 
+                            "is_compiler_generated": false, 
+                            "field_name": "udp_srcPort", 
+                            "field_width": 2, 
+                            "field_lsb": 0
+                        }
+                    ]
+                }, 
+                {
+                    "phv_number": 66, 
+                    "records": [
+                        {
+                            "word_bit_width": 8, 
                             "position_offset": 20, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
@@ -3215,7 +3214,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 66, 
+                    "phv_number": 67, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -3232,7 +3231,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 67, 
+                    "phv_number": 68, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -3287,7 +3286,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 68, 
+                    "phv_number": 69, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -3400,6 +3399,35 @@
                     "records": [
                         {
                             "word_bit_width": 16, 
+                            "position_offset": 38, 
+                            "phv_lsb": 8, 
+                            "is_pov": false, 
+                            "field_msb": 7, 
+                            "phv_msb": 15, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_srcPort", 
+                            "field_width": 2, 
+                            "field_lsb": 0
+                        }, 
+                        {
+                            "word_bit_width": 16, 
+                            "position_offset": 33, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 7, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_dstPort", 
+                            "field_width": 2, 
+                            "field_lsb": 8
+                        }
+                    ]
+                }, 
+                {
+                    "phv_number": 133, 
+                    "records": [
+                        {
+                            "word_bit_width": 16, 
                             "position_offset": 20, 
                             "phv_lsb": 8, 
                             "is_pov": false, 
@@ -3425,7 +3453,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 133, 
+                    "phv_number": 134, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -3442,7 +3470,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 134, 
+                    "phv_number": 135, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -3459,7 +3487,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 135, 
+                    "phv_number": 136, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -3590,6 +3618,30 @@
                             "field_name": "tcp_window", 
                             "field_width": 2, 
                             "field_lsb": 0
+                        }, 
+                        {
+                            "word_bit_width": 32, 
+                            "position_offset": 17, 
+                            "phv_lsb": 16, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 31, 
+                            "is_compiler_generated": false, 
+                            "field_name": "udp_length_", 
+                            "field_width": 2, 
+                            "field_lsb": 0
+                        }, 
+                        {
+                            "word_bit_width": 32, 
+                            "position_offset": 68, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 15, 
+                            "is_compiler_generated": false, 
+                            "field_name": "udp_checksum", 
+                            "field_width": 2, 
+                            "field_lsb": 0
                         }
                     ]
                 }, 
@@ -3656,94 +3708,31 @@
                     "records": [
                         {
                             "word_bit_width": 8, 
-                            "position_offset": 38, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 7, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_srcPort", 
-                            "field_width": 2, 
-                            "field_lsb": 8
-                        }, 
-                        {
-                            "word_bit_width": 8, 
-                            "position_offset": 17, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 7, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_length_", 
-                            "field_width": 2, 
-                            "field_lsb": 8
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 290, 
-                    "records": [
-                        {
-                            "word_bit_width": 8, 
-                            "position_offset": 38, 
+                            "position_offset": 76, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 7, 
                             "phv_msb": 7, 
                             "is_compiler_generated": false, 
-                            "field_name": "tcp_srcPort", 
-                            "field_width": 2, 
+                            "field_name": "tcp_seqNo", 
+                            "field_width": 4, 
                             "field_lsb": 0
                         }, 
                         {
                             "word_bit_width": 8, 
-                            "position_offset": 17, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 7, 
-                            "phv_msb": 7, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_length_", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 291, 
-                    "records": [
-                        {
-                            "word_bit_width": 8, 
-                            "position_offset": 33, 
+                            "position_offset": 66, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 15, 
                             "phv_msb": 7, 
                             "is_compiler_generated": false, 
-                            "field_name": "tcp_dstPort", 
+                            "field_name": "udp_srcPort", 
                             "field_width": 2, 
                             "field_lsb": 8
                         }
                     ]
                 }, 
                 {
-                    "phv_number": 292, 
-                    "records": [
-                        {
-                            "word_bit_width": 8, 
-                            "position_offset": 33, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 7, 
-                            "phv_msb": 7, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_dstPort", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
                     "phv_number": 320, 
                     "records": [
                         {
@@ -3806,52 +3795,6 @@
                     "records": [
                         {
                             "word_bit_width": 16, 
-                            "position_offset": 76, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 31, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_seqNo", 
-                            "field_width": 4, 
-                            "field_lsb": 16
-                        }, 
-                        {
-                            "word_bit_width": 16, 
-                            "position_offset": 68, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_checksum", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 323, 
-                    "records": [
-                        {
-                            "word_bit_width": 16, 
-                            "position_offset": 76, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_seqNo", 
-                            "field_width": 4, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 324, 
-                    "records": [
-                        {
-                            "word_bit_width": 16, 
                             "position_offset": 26, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
@@ -3861,11 +3804,23 @@
                             "field_name": "tcp_ackNo", 
                             "field_width": 4, 
                             "field_lsb": 16
+                        }, 
+                        {
+                            "word_bit_width": 16, 
+                            "position_offset": 55, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 15, 
+                            "is_compiler_generated": false, 
+                            "field_name": "udp_dstPort", 
+                            "field_width": 2, 
+                            "field_lsb": 0
                         }
                     ]
                 }, 
                 {
-                    "phv_number": 325, 
+                    "phv_number": 323, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -3973,7 +3928,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 264, 
+                    "phv_number": 260, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -4014,7 +3969,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 265, 
+                    "phv_number": 261, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -4031,7 +3986,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 266, 
+                    "phv_number": 262, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -4048,7 +4003,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 267, 
+                    "phv_number": 263, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -4089,7 +4044,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 268, 
+                    "phv_number": 264, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -4154,7 +4109,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 269, 
+                    "phv_number": 265, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -4183,7 +4138,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 270, 
+                    "phv_number": 266, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -4200,7 +4155,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 271, 
+                    "phv_number": 267, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -4217,7 +4172,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 296, 
+                    "phv_number": 292, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -4246,7 +4201,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 297, 
+                    "phv_number": 293, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -4263,7 +4218,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 298, 
+                    "phv_number": 294, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -4292,7 +4247,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 299, 
+                    "phv_number": 295, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -4321,7 +4276,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 300, 
+                    "phv_number": 296, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -4338,7 +4293,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 301, 
+                    "phv_number": 297, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -4355,7 +4310,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 332, 
+                    "phv_number": 326, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -4372,7 +4327,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 333, 
+                    "phv_number": 327, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -4389,7 +4344,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 334, 
+                    "phv_number": 328, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -4418,7 +4373,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 335, 
+                    "phv_number": 329, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -4431,23 +4386,6 @@
                             "field_name": "tcp_dstPort", 
                             "field_width": 2, 
                             "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 336, 
-                    "records": [
-                        {
-                            "word_bit_width": 16, 
-                            "position_offset": 69, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 31, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_seqNo", 
-                            "field_width": 4, 
-                            "field_lsb": 16
                         }, 
                         {
                             "word_bit_width": 16, 
@@ -4464,7 +4402,24 @@
                     ]
                 }, 
                 {
-                    "phv_number": 337, 
+                    "phv_number": 330, 
+                    "records": [
+                        {
+                            "word_bit_width": 16, 
+                            "position_offset": 69, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 31, 
+                            "phv_msb": 15, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_seqNo", 
+                            "field_width": 4, 
+                            "field_lsb": 16
+                        }
+                    ]
+                }, 
+                {
+                    "phv_number": 331, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -4481,7 +4436,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 338, 
+                    "phv_number": 332, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -4510,7 +4465,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 339, 
+                    "phv_number": 333, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -4527,7 +4482,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 340, 
+                    "phv_number": 334, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -4641,6 +4596,35 @@
                     "records": [
                         {
                             "word_bit_width": 32, 
+                            "position_offset": 33, 
+                            "phv_lsb": 24, 
+                            "is_pov": false, 
+                            "field_msb": 7, 
+                            "phv_msb": 31, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_dstPort", 
+                            "field_width": 2, 
+                            "field_lsb": 0
+                        }, 
+                        {
+                            "word_bit_width": 32, 
+                            "position_offset": 76, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 31, 
+                            "phv_msb": 23, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_seqNo", 
+                            "field_width": 4, 
+                            "field_lsb": 8
+                        }
+                    ]
+                }, 
+                {
+                    "phv_number": 4, 
+                    "records": [
+                        {
+                            "word_bit_width": 32, 
                             "position_offset": 20, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
@@ -4654,7 +4638,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 4, 
+                    "phv_number": 5, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -4671,35 +4655,6 @@
                     ]
                 }, 
                 {
-                    "phv_number": 5, 
-                    "records": [
-                        {
-                            "word_bit_width": 32, 
-                            "position_offset": 66, 
-                            "phv_lsb": 16, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 31, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_srcPort", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }, 
-                        {
-                            "word_bit_width": 32, 
-                            "position_offset": 55, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_dstPort", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
                     "phv_number": 64, 
                     "records": [
                         {
@@ -4721,6 +4676,35 @@
                     "records": [
                         {
                             "word_bit_width": 8, 
+                            "position_offset": 38, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 7, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_srcPort", 
+                            "field_width": 2, 
+                            "field_lsb": 8
+                        }, 
+                        {
+                            "word_bit_width": 8, 
+                            "position_offset": 66, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 7, 
+                            "phv_msb": 7, 
+                            "is_compiler_generated": false, 
+                            "field_name": "udp_srcPort", 
+                            "field_width": 2, 
+                            "field_lsb": 0
+                        }
+                    ]
+                }, 
+                {
+                    "phv_number": 66, 
+                    "records": [
+                        {
+                            "word_bit_width": 8, 
                             "position_offset": 20, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
@@ -4734,7 +4718,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 66, 
+                    "phv_number": 67, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -4751,7 +4735,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 67, 
+                    "phv_number": 68, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -4806,7 +4790,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 68, 
+                    "phv_number": 69, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -4919,6 +4903,35 @@
                     "records": [
                         {
                             "word_bit_width": 16, 
+                            "position_offset": 38, 
+                            "phv_lsb": 8, 
+                            "is_pov": false, 
+                            "field_msb": 7, 
+                            "phv_msb": 15, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_srcPort", 
+                            "field_width": 2, 
+                            "field_lsb": 0
+                        }, 
+                        {
+                            "word_bit_width": 16, 
+                            "position_offset": 33, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 7, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_dstPort", 
+                            "field_width": 2, 
+                            "field_lsb": 8
+                        }
+                    ]
+                }, 
+                {
+                    "phv_number": 133, 
+                    "records": [
+                        {
+                            "word_bit_width": 16, 
                             "position_offset": 20, 
                             "phv_lsb": 8, 
                             "is_pov": false, 
@@ -4944,7 +4957,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 133, 
+                    "phv_number": 134, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -4961,7 +4974,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 134, 
+                    "phv_number": 135, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -4978,7 +4991,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 135, 
+                    "phv_number": 136, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -5109,6 +5122,30 @@
                             "field_name": "tcp_window", 
                             "field_width": 2, 
                             "field_lsb": 0
+                        }, 
+                        {
+                            "word_bit_width": 32, 
+                            "position_offset": 17, 
+                            "phv_lsb": 16, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 31, 
+                            "is_compiler_generated": false, 
+                            "field_name": "udp_length_", 
+                            "field_width": 2, 
+                            "field_lsb": 0
+                        }, 
+                        {
+                            "word_bit_width": 32, 
+                            "position_offset": 68, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 15, 
+                            "is_compiler_generated": false, 
+                            "field_name": "udp_checksum", 
+                            "field_width": 2, 
+                            "field_lsb": 0
                         }
                     ]
                 }, 
@@ -5175,94 +5212,31 @@
                     "records": [
                         {
                             "word_bit_width": 8, 
-                            "position_offset": 38, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 7, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_srcPort", 
-                            "field_width": 2, 
-                            "field_lsb": 8
-                        }, 
-                        {
-                            "word_bit_width": 8, 
-                            "position_offset": 17, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 7, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_length_", 
-                            "field_width": 2, 
-                            "field_lsb": 8
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 290, 
-                    "records": [
-                        {
-                            "word_bit_width": 8, 
-                            "position_offset": 38, 
+                            "position_offset": 76, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 7, 
                             "phv_msb": 7, 
                             "is_compiler_generated": false, 
-                            "field_name": "tcp_srcPort", 
-                            "field_width": 2, 
+                            "field_name": "tcp_seqNo", 
+                            "field_width": 4, 
                             "field_lsb": 0
                         }, 
                         {
                             "word_bit_width": 8, 
-                            "position_offset": 17, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 7, 
-                            "phv_msb": 7, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_length_", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 291, 
-                    "records": [
-                        {
-                            "word_bit_width": 8, 
-                            "position_offset": 33, 
+                            "position_offset": 66, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 15, 
                             "phv_msb": 7, 
                             "is_compiler_generated": false, 
-                            "field_name": "tcp_dstPort", 
+                            "field_name": "udp_srcPort", 
                             "field_width": 2, 
                             "field_lsb": 8
                         }
                     ]
                 }, 
                 {
-                    "phv_number": 292, 
-                    "records": [
-                        {
-                            "word_bit_width": 8, 
-                            "position_offset": 33, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 7, 
-                            "phv_msb": 7, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_dstPort", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
                     "phv_number": 320, 
                     "records": [
                         {
@@ -5325,52 +5299,6 @@
                     "records": [
                         {
                             "word_bit_width": 16, 
-                            "position_offset": 76, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 31, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_seqNo", 
-                            "field_width": 4, 
-                            "field_lsb": 16
-                        }, 
-                        {
-                            "word_bit_width": 16, 
-                            "position_offset": 68, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_checksum", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 323, 
-                    "records": [
-                        {
-                            "word_bit_width": 16, 
-                            "position_offset": 76, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_seqNo", 
-                            "field_width": 4, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 324, 
-                    "records": [
-                        {
-                            "word_bit_width": 16, 
                             "position_offset": 26, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
@@ -5380,11 +5308,23 @@
                             "field_name": "tcp_ackNo", 
                             "field_width": 4, 
                             "field_lsb": 16
+                        }, 
+                        {
+                            "word_bit_width": 16, 
+                            "position_offset": 55, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 15, 
+                            "is_compiler_generated": false, 
+                            "field_name": "udp_dstPort", 
+                            "field_width": 2, 
+                            "field_lsb": 0
                         }
                     ]
                 }, 
                 {
-                    "phv_number": 325, 
+                    "phv_number": 323, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -5492,7 +5432,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 264, 
+                    "phv_number": 260, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -5533,7 +5473,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 265, 
+                    "phv_number": 261, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -5550,7 +5490,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 266, 
+                    "phv_number": 262, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -5567,7 +5507,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 267, 
+                    "phv_number": 263, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -5608,7 +5548,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 268, 
+                    "phv_number": 264, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -5673,7 +5613,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 269, 
+                    "phv_number": 265, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -5702,7 +5642,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 270, 
+                    "phv_number": 266, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -5719,7 +5659,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 271, 
+                    "phv_number": 267, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -5736,7 +5676,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 296, 
+                    "phv_number": 292, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -5765,7 +5705,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 297, 
+                    "phv_number": 293, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -5782,7 +5722,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 298, 
+                    "phv_number": 294, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -5811,7 +5751,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 299, 
+                    "phv_number": 295, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -5840,7 +5780,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 300, 
+                    "phv_number": 296, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -5857,7 +5797,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 301, 
+                    "phv_number": 297, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -5874,7 +5814,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 332, 
+                    "phv_number": 326, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -5891,7 +5831,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 333, 
+                    "phv_number": 327, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -5908,7 +5848,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 334, 
+                    "phv_number": 328, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -5937,7 +5877,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 335, 
+                    "phv_number": 329, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -5950,23 +5890,6 @@
                             "field_name": "tcp_dstPort", 
                             "field_width": 2, 
                             "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 336, 
-                    "records": [
-                        {
-                            "word_bit_width": 16, 
-                            "position_offset": 69, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 31, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_seqNo", 
-                            "field_width": 4, 
-                            "field_lsb": 16
                         }, 
                         {
                             "word_bit_width": 16, 
@@ -5983,7 +5906,24 @@
                     ]
                 }, 
                 {
-                    "phv_number": 337, 
+                    "phv_number": 330, 
+                    "records": [
+                        {
+                            "word_bit_width": 16, 
+                            "position_offset": 69, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 31, 
+                            "phv_msb": 15, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_seqNo", 
+                            "field_width": 4, 
+                            "field_lsb": 16
+                        }
+                    ]
+                }, 
+                {
+                    "phv_number": 331, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -6000,7 +5940,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 338, 
+                    "phv_number": 332, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -6029,7 +5969,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 339, 
+                    "phv_number": 333, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -6046,7 +5986,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 340, 
+                    "phv_number": 334, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -6160,6 +6100,35 @@
                     "records": [
                         {
                             "word_bit_width": 32, 
+                            "position_offset": 33, 
+                            "phv_lsb": 24, 
+                            "is_pov": false, 
+                            "field_msb": 7, 
+                            "phv_msb": 31, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_dstPort", 
+                            "field_width": 2, 
+                            "field_lsb": 0
+                        }, 
+                        {
+                            "word_bit_width": 32, 
+                            "position_offset": 76, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 31, 
+                            "phv_msb": 23, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_seqNo", 
+                            "field_width": 4, 
+                            "field_lsb": 8
+                        }
+                    ]
+                }, 
+                {
+                    "phv_number": 4, 
+                    "records": [
+                        {
+                            "word_bit_width": 32, 
                             "position_offset": 20, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
@@ -6173,7 +6142,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 4, 
+                    "phv_number": 5, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -6190,35 +6159,6 @@
                     ]
                 }, 
                 {
-                    "phv_number": 5, 
-                    "records": [
-                        {
-                            "word_bit_width": 32, 
-                            "position_offset": 66, 
-                            "phv_lsb": 16, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 31, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_srcPort", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }, 
-                        {
-                            "word_bit_width": 32, 
-                            "position_offset": 55, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_dstPort", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
                     "phv_number": 64, 
                     "records": [
                         {
@@ -6240,6 +6180,35 @@
                     "records": [
                         {
                             "word_bit_width": 8, 
+                            "position_offset": 38, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 7, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_srcPort", 
+                            "field_width": 2, 
+                            "field_lsb": 8
+                        }, 
+                        {
+                            "word_bit_width": 8, 
+                            "position_offset": 66, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 7, 
+                            "phv_msb": 7, 
+                            "is_compiler_generated": false, 
+                            "field_name": "udp_srcPort", 
+                            "field_width": 2, 
+                            "field_lsb": 0
+                        }
+                    ]
+                }, 
+                {
+                    "phv_number": 66, 
+                    "records": [
+                        {
+                            "word_bit_width": 8, 
                             "position_offset": 20, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
@@ -6253,7 +6222,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 66, 
+                    "phv_number": 67, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -6270,7 +6239,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 67, 
+                    "phv_number": 68, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -6325,7 +6294,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 68, 
+                    "phv_number": 69, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -6438,6 +6407,35 @@
                     "records": [
                         {
                             "word_bit_width": 16, 
+                            "position_offset": 38, 
+                            "phv_lsb": 8, 
+                            "is_pov": false, 
+                            "field_msb": 7, 
+                            "phv_msb": 15, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_srcPort", 
+                            "field_width": 2, 
+                            "field_lsb": 0
+                        }, 
+                        {
+                            "word_bit_width": 16, 
+                            "position_offset": 33, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 7, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_dstPort", 
+                            "field_width": 2, 
+                            "field_lsb": 8
+                        }
+                    ]
+                }, 
+                {
+                    "phv_number": 133, 
+                    "records": [
+                        {
+                            "word_bit_width": 16, 
                             "position_offset": 20, 
                             "phv_lsb": 8, 
                             "is_pov": false, 
@@ -6463,7 +6461,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 133, 
+                    "phv_number": 134, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -6480,7 +6478,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 134, 
+                    "phv_number": 135, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -6497,7 +6495,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 135, 
+                    "phv_number": 136, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -6628,6 +6626,30 @@
                             "field_name": "tcp_window", 
                             "field_width": 2, 
                             "field_lsb": 0
+                        }, 
+                        {
+                            "word_bit_width": 32, 
+                            "position_offset": 17, 
+                            "phv_lsb": 16, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 31, 
+                            "is_compiler_generated": false, 
+                            "field_name": "udp_length_", 
+                            "field_width": 2, 
+                            "field_lsb": 0
+                        }, 
+                        {
+                            "word_bit_width": 32, 
+                            "position_offset": 68, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 15, 
+                            "is_compiler_generated": false, 
+                            "field_name": "udp_checksum", 
+                            "field_width": 2, 
+                            "field_lsb": 0
                         }
                     ]
                 }, 
@@ -6694,94 +6716,31 @@
                     "records": [
                         {
                             "word_bit_width": 8, 
-                            "position_offset": 38, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 7, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_srcPort", 
-                            "field_width": 2, 
-                            "field_lsb": 8
-                        }, 
-                        {
-                            "word_bit_width": 8, 
-                            "position_offset": 17, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 7, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_length_", 
-                            "field_width": 2, 
-                            "field_lsb": 8
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 290, 
-                    "records": [
-                        {
-                            "word_bit_width": 8, 
-                            "position_offset": 38, 
+                            "position_offset": 76, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 7, 
                             "phv_msb": 7, 
                             "is_compiler_generated": false, 
-                            "field_name": "tcp_srcPort", 
-                            "field_width": 2, 
+                            "field_name": "tcp_seqNo", 
+                            "field_width": 4, 
                             "field_lsb": 0
                         }, 
                         {
                             "word_bit_width": 8, 
-                            "position_offset": 17, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 7, 
-                            "phv_msb": 7, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_length_", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 291, 
-                    "records": [
-                        {
-                            "word_bit_width": 8, 
-                            "position_offset": 33, 
+                            "position_offset": 66, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 15, 
                             "phv_msb": 7, 
                             "is_compiler_generated": false, 
-                            "field_name": "tcp_dstPort", 
+                            "field_name": "udp_srcPort", 
                             "field_width": 2, 
                             "field_lsb": 8
                         }
                     ]
                 }, 
                 {
-                    "phv_number": 292, 
-                    "records": [
-                        {
-                            "word_bit_width": 8, 
-                            "position_offset": 33, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 7, 
-                            "phv_msb": 7, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_dstPort", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
                     "phv_number": 320, 
                     "records": [
                         {
@@ -6844,52 +6803,6 @@
                     "records": [
                         {
                             "word_bit_width": 16, 
-                            "position_offset": 76, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 31, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_seqNo", 
-                            "field_width": 4, 
-                            "field_lsb": 16
-                        }, 
-                        {
-                            "word_bit_width": 16, 
-                            "position_offset": 68, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_checksum", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 323, 
-                    "records": [
-                        {
-                            "word_bit_width": 16, 
-                            "position_offset": 76, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_seqNo", 
-                            "field_width": 4, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 324, 
-                    "records": [
-                        {
-                            "word_bit_width": 16, 
                             "position_offset": 26, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
@@ -6899,11 +6812,23 @@
                             "field_name": "tcp_ackNo", 
                             "field_width": 4, 
                             "field_lsb": 16
+                        }, 
+                        {
+                            "word_bit_width": 16, 
+                            "position_offset": 55, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 15, 
+                            "is_compiler_generated": false, 
+                            "field_name": "udp_dstPort", 
+                            "field_width": 2, 
+                            "field_lsb": 0
                         }
                     ]
                 }, 
                 {
-                    "phv_number": 325, 
+                    "phv_number": 323, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -7011,7 +6936,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 264, 
+                    "phv_number": 260, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -7052,7 +6977,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 265, 
+                    "phv_number": 261, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -7069,7 +6994,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 266, 
+                    "phv_number": 262, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -7086,7 +7011,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 267, 
+                    "phv_number": 263, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -7127,7 +7052,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 268, 
+                    "phv_number": 264, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -7192,7 +7117,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 269, 
+                    "phv_number": 265, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -7221,7 +7146,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 270, 
+                    "phv_number": 266, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -7238,7 +7163,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 271, 
+                    "phv_number": 267, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -7255,7 +7180,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 296, 
+                    "phv_number": 292, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -7284,7 +7209,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 297, 
+                    "phv_number": 293, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -7301,7 +7226,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 298, 
+                    "phv_number": 294, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -7330,7 +7255,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 299, 
+                    "phv_number": 295, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -7359,7 +7284,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 300, 
+                    "phv_number": 296, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -7376,7 +7301,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 301, 
+                    "phv_number": 297, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -7393,7 +7318,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 332, 
+                    "phv_number": 326, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -7410,7 +7335,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 333, 
+                    "phv_number": 327, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -7427,7 +7352,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 334, 
+                    "phv_number": 328, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -7456,7 +7381,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 335, 
+                    "phv_number": 329, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -7469,23 +7394,6 @@
                             "field_name": "tcp_dstPort", 
                             "field_width": 2, 
                             "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 336, 
-                    "records": [
-                        {
-                            "word_bit_width": 16, 
-                            "position_offset": 69, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 31, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_seqNo", 
-                            "field_width": 4, 
-                            "field_lsb": 16
                         }, 
                         {
                             "word_bit_width": 16, 
@@ -7502,7 +7410,24 @@
                     ]
                 }, 
                 {
-                    "phv_number": 337, 
+                    "phv_number": 330, 
+                    "records": [
+                        {
+                            "word_bit_width": 16, 
+                            "position_offset": 69, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 31, 
+                            "phv_msb": 15, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_seqNo", 
+                            "field_width": 4, 
+                            "field_lsb": 16
+                        }
+                    ]
+                }, 
+                {
+                    "phv_number": 331, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -7519,7 +7444,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 338, 
+                    "phv_number": 332, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -7548,7 +7473,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 339, 
+                    "phv_number": 333, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -7565,7 +7490,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 340, 
+                    "phv_number": 334, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -7679,6 +7604,35 @@
                     "records": [
                         {
                             "word_bit_width": 32, 
+                            "position_offset": 33, 
+                            "phv_lsb": 24, 
+                            "is_pov": false, 
+                            "field_msb": 7, 
+                            "phv_msb": 31, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_dstPort", 
+                            "field_width": 2, 
+                            "field_lsb": 0
+                        }, 
+                        {
+                            "word_bit_width": 32, 
+                            "position_offset": 76, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 31, 
+                            "phv_msb": 23, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_seqNo", 
+                            "field_width": 4, 
+                            "field_lsb": 8
+                        }
+                    ]
+                }, 
+                {
+                    "phv_number": 4, 
+                    "records": [
+                        {
+                            "word_bit_width": 32, 
                             "position_offset": 20, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
@@ -7692,7 +7646,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 4, 
+                    "phv_number": 5, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -7709,35 +7663,6 @@
                     ]
                 }, 
                 {
-                    "phv_number": 5, 
-                    "records": [
-                        {
-                            "word_bit_width": 32, 
-                            "position_offset": 66, 
-                            "phv_lsb": 16, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 31, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_srcPort", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }, 
-                        {
-                            "word_bit_width": 32, 
-                            "position_offset": 55, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_dstPort", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
                     "phv_number": 64, 
                     "records": [
                         {
@@ -7759,6 +7684,35 @@
                     "records": [
                         {
                             "word_bit_width": 8, 
+                            "position_offset": 38, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 7, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_srcPort", 
+                            "field_width": 2, 
+                            "field_lsb": 8
+                        }, 
+                        {
+                            "word_bit_width": 8, 
+                            "position_offset": 66, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 7, 
+                            "phv_msb": 7, 
+                            "is_compiler_generated": false, 
+                            "field_name": "udp_srcPort", 
+                            "field_width": 2, 
+                            "field_lsb": 0
+                        }
+                    ]
+                }, 
+                {
+                    "phv_number": 66, 
+                    "records": [
+                        {
+                            "word_bit_width": 8, 
                             "position_offset": 20, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
@@ -7772,7 +7726,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 66, 
+                    "phv_number": 67, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -7789,7 +7743,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 67, 
+                    "phv_number": 68, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -7844,7 +7798,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 68, 
+                    "phv_number": 69, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -7957,6 +7911,35 @@
                     "records": [
                         {
                             "word_bit_width": 16, 
+                            "position_offset": 38, 
+                            "phv_lsb": 8, 
+                            "is_pov": false, 
+                            "field_msb": 7, 
+                            "phv_msb": 15, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_srcPort", 
+                            "field_width": 2, 
+                            "field_lsb": 0
+                        }, 
+                        {
+                            "word_bit_width": 16, 
+                            "position_offset": 33, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 7, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_dstPort", 
+                            "field_width": 2, 
+                            "field_lsb": 8
+                        }
+                    ]
+                }, 
+                {
+                    "phv_number": 133, 
+                    "records": [
+                        {
+                            "word_bit_width": 16, 
                             "position_offset": 20, 
                             "phv_lsb": 8, 
                             "is_pov": false, 
@@ -7982,7 +7965,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 133, 
+                    "phv_number": 134, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -7999,7 +7982,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 134, 
+                    "phv_number": 135, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -8016,7 +7999,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 135, 
+                    "phv_number": 136, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -8147,6 +8130,30 @@
                             "field_name": "tcp_window", 
                             "field_width": 2, 
                             "field_lsb": 0
+                        }, 
+                        {
+                            "word_bit_width": 32, 
+                            "position_offset": 17, 
+                            "phv_lsb": 16, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 31, 
+                            "is_compiler_generated": false, 
+                            "field_name": "udp_length_", 
+                            "field_width": 2, 
+                            "field_lsb": 0
+                        }, 
+                        {
+                            "word_bit_width": 32, 
+                            "position_offset": 68, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 15, 
+                            "is_compiler_generated": false, 
+                            "field_name": "udp_checksum", 
+                            "field_width": 2, 
+                            "field_lsb": 0
                         }
                     ]
                 }, 
@@ -8213,94 +8220,31 @@
                     "records": [
                         {
                             "word_bit_width": 8, 
-                            "position_offset": 38, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 7, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_srcPort", 
-                            "field_width": 2, 
-                            "field_lsb": 8
-                        }, 
-                        {
-                            "word_bit_width": 8, 
-                            "position_offset": 17, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 7, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_length_", 
-                            "field_width": 2, 
-                            "field_lsb": 8
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 290, 
-                    "records": [
-                        {
-                            "word_bit_width": 8, 
-                            "position_offset": 38, 
+                            "position_offset": 76, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 7, 
                             "phv_msb": 7, 
                             "is_compiler_generated": false, 
-                            "field_name": "tcp_srcPort", 
-                            "field_width": 2, 
+                            "field_name": "tcp_seqNo", 
+                            "field_width": 4, 
                             "field_lsb": 0
                         }, 
                         {
                             "word_bit_width": 8, 
-                            "position_offset": 17, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 7, 
-                            "phv_msb": 7, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_length_", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 291, 
-                    "records": [
-                        {
-                            "word_bit_width": 8, 
-                            "position_offset": 33, 
+                            "position_offset": 66, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 15, 
                             "phv_msb": 7, 
                             "is_compiler_generated": false, 
-                            "field_name": "tcp_dstPort", 
+                            "field_name": "udp_srcPort", 
                             "field_width": 2, 
                             "field_lsb": 8
                         }
                     ]
                 }, 
                 {
-                    "phv_number": 292, 
-                    "records": [
-                        {
-                            "word_bit_width": 8, 
-                            "position_offset": 33, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 7, 
-                            "phv_msb": 7, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_dstPort", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
                     "phv_number": 320, 
                     "records": [
                         {
@@ -8363,52 +8307,6 @@
                     "records": [
                         {
                             "word_bit_width": 16, 
-                            "position_offset": 76, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 31, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_seqNo", 
-                            "field_width": 4, 
-                            "field_lsb": 16
-                        }, 
-                        {
-                            "word_bit_width": 16, 
-                            "position_offset": 68, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_checksum", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 323, 
-                    "records": [
-                        {
-                            "word_bit_width": 16, 
-                            "position_offset": 76, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_seqNo", 
-                            "field_width": 4, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 324, 
-                    "records": [
-                        {
-                            "word_bit_width": 16, 
                             "position_offset": 26, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
@@ -8418,11 +8316,23 @@
                             "field_name": "tcp_ackNo", 
                             "field_width": 4, 
                             "field_lsb": 16
+                        }, 
+                        {
+                            "word_bit_width": 16, 
+                            "position_offset": 55, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 15, 
+                            "is_compiler_generated": false, 
+                            "field_name": "udp_dstPort", 
+                            "field_width": 2, 
+                            "field_lsb": 0
                         }
                     ]
                 }, 
                 {
-                    "phv_number": 325, 
+                    "phv_number": 323, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -8530,7 +8440,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 264, 
+                    "phv_number": 260, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -8571,7 +8481,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 265, 
+                    "phv_number": 261, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -8588,7 +8498,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 266, 
+                    "phv_number": 262, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -8605,7 +8515,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 267, 
+                    "phv_number": 263, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -8646,7 +8556,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 268, 
+                    "phv_number": 264, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -8711,7 +8621,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 269, 
+                    "phv_number": 265, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -8740,7 +8650,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 270, 
+                    "phv_number": 266, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -8757,7 +8667,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 271, 
+                    "phv_number": 267, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -8774,7 +8684,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 296, 
+                    "phv_number": 292, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -8803,7 +8713,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 297, 
+                    "phv_number": 293, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -8820,7 +8730,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 298, 
+                    "phv_number": 294, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -8849,7 +8759,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 299, 
+                    "phv_number": 295, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -8878,7 +8788,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 300, 
+                    "phv_number": 296, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -8895,7 +8805,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 301, 
+                    "phv_number": 297, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -8912,7 +8822,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 332, 
+                    "phv_number": 326, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -8929,7 +8839,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 333, 
+                    "phv_number": 327, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -8946,7 +8856,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 334, 
+                    "phv_number": 328, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -8975,7 +8885,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 335, 
+                    "phv_number": 329, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -8988,23 +8898,6 @@
                             "field_name": "tcp_dstPort", 
                             "field_width": 2, 
                             "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 336, 
-                    "records": [
-                        {
-                            "word_bit_width": 16, 
-                            "position_offset": 69, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 31, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_seqNo", 
-                            "field_width": 4, 
-                            "field_lsb": 16
                         }, 
                         {
                             "word_bit_width": 16, 
@@ -9021,7 +8914,24 @@
                     ]
                 }, 
                 {
-                    "phv_number": 337, 
+                    "phv_number": 330, 
+                    "records": [
+                        {
+                            "word_bit_width": 16, 
+                            "position_offset": 69, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 31, 
+                            "phv_msb": 15, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_seqNo", 
+                            "field_width": 4, 
+                            "field_lsb": 16
+                        }
+                    ]
+                }, 
+                {
+                    "phv_number": 331, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -9038,7 +8948,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 338, 
+                    "phv_number": 332, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -9067,7 +8977,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 339, 
+                    "phv_number": 333, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -9084,7 +8994,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 340, 
+                    "phv_number": 334, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -9198,6 +9108,35 @@
                     "records": [
                         {
                             "word_bit_width": 32, 
+                            "position_offset": 33, 
+                            "phv_lsb": 24, 
+                            "is_pov": false, 
+                            "field_msb": 7, 
+                            "phv_msb": 31, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_dstPort", 
+                            "field_width": 2, 
+                            "field_lsb": 0
+                        }, 
+                        {
+                            "word_bit_width": 32, 
+                            "position_offset": 76, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 31, 
+                            "phv_msb": 23, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_seqNo", 
+                            "field_width": 4, 
+                            "field_lsb": 8
+                        }
+                    ]
+                }, 
+                {
+                    "phv_number": 4, 
+                    "records": [
+                        {
+                            "word_bit_width": 32, 
                             "position_offset": 20, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
@@ -9211,7 +9150,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 4, 
+                    "phv_number": 5, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -9228,35 +9167,6 @@
                     ]
                 }, 
                 {
-                    "phv_number": 5, 
-                    "records": [
-                        {
-                            "word_bit_width": 32, 
-                            "position_offset": 66, 
-                            "phv_lsb": 16, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 31, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_srcPort", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }, 
-                        {
-                            "word_bit_width": 32, 
-                            "position_offset": 55, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_dstPort", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
                     "phv_number": 64, 
                     "records": [
                         {
@@ -9278,6 +9188,35 @@
                     "records": [
                         {
                             "word_bit_width": 8, 
+                            "position_offset": 38, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 7, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_srcPort", 
+                            "field_width": 2, 
+                            "field_lsb": 8
+                        }, 
+                        {
+                            "word_bit_width": 8, 
+                            "position_offset": 66, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 7, 
+                            "phv_msb": 7, 
+                            "is_compiler_generated": false, 
+                            "field_name": "udp_srcPort", 
+                            "field_width": 2, 
+                            "field_lsb": 0
+                        }
+                    ]
+                }, 
+                {
+                    "phv_number": 66, 
+                    "records": [
+                        {
+                            "word_bit_width": 8, 
                             "position_offset": 20, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
@@ -9291,7 +9230,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 66, 
+                    "phv_number": 67, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -9308,7 +9247,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 67, 
+                    "phv_number": 68, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -9363,7 +9302,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 68, 
+                    "phv_number": 69, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -9476,6 +9415,35 @@
                     "records": [
                         {
                             "word_bit_width": 16, 
+                            "position_offset": 38, 
+                            "phv_lsb": 8, 
+                            "is_pov": false, 
+                            "field_msb": 7, 
+                            "phv_msb": 15, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_srcPort", 
+                            "field_width": 2, 
+                            "field_lsb": 0
+                        }, 
+                        {
+                            "word_bit_width": 16, 
+                            "position_offset": 33, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 7, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_dstPort", 
+                            "field_width": 2, 
+                            "field_lsb": 8
+                        }
+                    ]
+                }, 
+                {
+                    "phv_number": 133, 
+                    "records": [
+                        {
+                            "word_bit_width": 16, 
                             "position_offset": 20, 
                             "phv_lsb": 8, 
                             "is_pov": false, 
@@ -9501,7 +9469,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 133, 
+                    "phv_number": 134, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -9518,7 +9486,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 134, 
+                    "phv_number": 135, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -9535,7 +9503,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 135, 
+                    "phv_number": 136, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -9666,6 +9634,30 @@
                             "field_name": "tcp_window", 
                             "field_width": 2, 
                             "field_lsb": 0
+                        }, 
+                        {
+                            "word_bit_width": 32, 
+                            "position_offset": 17, 
+                            "phv_lsb": 16, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 31, 
+                            "is_compiler_generated": false, 
+                            "field_name": "udp_length_", 
+                            "field_width": 2, 
+                            "field_lsb": 0
+                        }, 
+                        {
+                            "word_bit_width": 32, 
+                            "position_offset": 68, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 15, 
+                            "is_compiler_generated": false, 
+                            "field_name": "udp_checksum", 
+                            "field_width": 2, 
+                            "field_lsb": 0
                         }
                     ]
                 }, 
@@ -9732,94 +9724,31 @@
                     "records": [
                         {
                             "word_bit_width": 8, 
-                            "position_offset": 38, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 7, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_srcPort", 
-                            "field_width": 2, 
-                            "field_lsb": 8
-                        }, 
-                        {
-                            "word_bit_width": 8, 
-                            "position_offset": 17, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 7, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_length_", 
-                            "field_width": 2, 
-                            "field_lsb": 8
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 290, 
-                    "records": [
-                        {
-                            "word_bit_width": 8, 
-                            "position_offset": 38, 
+                            "position_offset": 76, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 7, 
                             "phv_msb": 7, 
                             "is_compiler_generated": false, 
-                            "field_name": "tcp_srcPort", 
-                            "field_width": 2, 
+                            "field_name": "tcp_seqNo", 
+                            "field_width": 4, 
                             "field_lsb": 0
                         }, 
                         {
                             "word_bit_width": 8, 
-                            "position_offset": 17, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 7, 
-                            "phv_msb": 7, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_length_", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 291, 
-                    "records": [
-                        {
-                            "word_bit_width": 8, 
-                            "position_offset": 33, 
+                            "position_offset": 66, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 15, 
                             "phv_msb": 7, 
                             "is_compiler_generated": false, 
-                            "field_name": "tcp_dstPort", 
+                            "field_name": "udp_srcPort", 
                             "field_width": 2, 
                             "field_lsb": 8
                         }
                     ]
                 }, 
                 {
-                    "phv_number": 292, 
-                    "records": [
-                        {
-                            "word_bit_width": 8, 
-                            "position_offset": 33, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 7, 
-                            "phv_msb": 7, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_dstPort", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
                     "phv_number": 320, 
                     "records": [
                         {
@@ -9882,52 +9811,6 @@
                     "records": [
                         {
                             "word_bit_width": 16, 
-                            "position_offset": 76, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 31, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_seqNo", 
-                            "field_width": 4, 
-                            "field_lsb": 16
-                        }, 
-                        {
-                            "word_bit_width": 16, 
-                            "position_offset": 68, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_checksum", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 323, 
-                    "records": [
-                        {
-                            "word_bit_width": 16, 
-                            "position_offset": 76, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_seqNo", 
-                            "field_width": 4, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 324, 
-                    "records": [
-                        {
-                            "word_bit_width": 16, 
                             "position_offset": 26, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
@@ -9937,11 +9820,23 @@
                             "field_name": "tcp_ackNo", 
                             "field_width": 4, 
                             "field_lsb": 16
+                        }, 
+                        {
+                            "word_bit_width": 16, 
+                            "position_offset": 55, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 15, 
+                            "is_compiler_generated": false, 
+                            "field_name": "udp_dstPort", 
+                            "field_width": 2, 
+                            "field_lsb": 0
                         }
                     ]
                 }, 
                 {
-                    "phv_number": 325, 
+                    "phv_number": 323, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -10049,7 +9944,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 264, 
+                    "phv_number": 260, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -10090,7 +9985,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 265, 
+                    "phv_number": 261, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -10107,7 +10002,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 266, 
+                    "phv_number": 262, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -10124,7 +10019,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 267, 
+                    "phv_number": 263, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -10165,7 +10060,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 268, 
+                    "phv_number": 264, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -10230,7 +10125,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 269, 
+                    "phv_number": 265, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -10259,7 +10154,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 270, 
+                    "phv_number": 266, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -10276,7 +10171,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 271, 
+                    "phv_number": 267, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -10293,7 +10188,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 296, 
+                    "phv_number": 292, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -10322,7 +10217,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 297, 
+                    "phv_number": 293, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -10339,7 +10234,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 298, 
+                    "phv_number": 294, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -10368,7 +10263,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 299, 
+                    "phv_number": 295, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -10397,7 +10292,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 300, 
+                    "phv_number": 296, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -10414,7 +10309,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 301, 
+                    "phv_number": 297, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -10431,7 +10326,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 332, 
+                    "phv_number": 326, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -10448,7 +10343,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 333, 
+                    "phv_number": 327, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -10465,7 +10360,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 334, 
+                    "phv_number": 328, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -10494,7 +10389,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 335, 
+                    "phv_number": 329, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -10507,23 +10402,6 @@
                             "field_name": "tcp_dstPort", 
                             "field_width": 2, 
                             "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 336, 
-                    "records": [
-                        {
-                            "word_bit_width": 16, 
-                            "position_offset": 69, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 31, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_seqNo", 
-                            "field_width": 4, 
-                            "field_lsb": 16
                         }, 
                         {
                             "word_bit_width": 16, 
@@ -10540,7 +10418,24 @@
                     ]
                 }, 
                 {
-                    "phv_number": 337, 
+                    "phv_number": 330, 
+                    "records": [
+                        {
+                            "word_bit_width": 16, 
+                            "position_offset": 69, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 31, 
+                            "phv_msb": 15, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_seqNo", 
+                            "field_width": 4, 
+                            "field_lsb": 16
+                        }
+                    ]
+                }, 
+                {
+                    "phv_number": 331, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -10557,7 +10452,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 338, 
+                    "phv_number": 332, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -10586,7 +10481,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 339, 
+                    "phv_number": 333, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -10603,7 +10498,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 340, 
+                    "phv_number": 334, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -10717,6 +10612,35 @@
                     "records": [
                         {
                             "word_bit_width": 32, 
+                            "position_offset": 33, 
+                            "phv_lsb": 24, 
+                            "is_pov": false, 
+                            "field_msb": 7, 
+                            "phv_msb": 31, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_dstPort", 
+                            "field_width": 2, 
+                            "field_lsb": 0
+                        }, 
+                        {
+                            "word_bit_width": 32, 
+                            "position_offset": 76, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 31, 
+                            "phv_msb": 23, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_seqNo", 
+                            "field_width": 4, 
+                            "field_lsb": 8
+                        }
+                    ]
+                }, 
+                {
+                    "phv_number": 4, 
+                    "records": [
+                        {
+                            "word_bit_width": 32, 
                             "position_offset": 20, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
@@ -10730,7 +10654,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 4, 
+                    "phv_number": 5, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -10747,35 +10671,6 @@
                     ]
                 }, 
                 {
-                    "phv_number": 5, 
-                    "records": [
-                        {
-                            "word_bit_width": 32, 
-                            "position_offset": 66, 
-                            "phv_lsb": 16, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 31, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_srcPort", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }, 
-                        {
-                            "word_bit_width": 32, 
-                            "position_offset": 55, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_dstPort", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
                     "phv_number": 64, 
                     "records": [
                         {
@@ -10797,6 +10692,35 @@
                     "records": [
                         {
                             "word_bit_width": 8, 
+                            "position_offset": 38, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 7, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_srcPort", 
+                            "field_width": 2, 
+                            "field_lsb": 8
+                        }, 
+                        {
+                            "word_bit_width": 8, 
+                            "position_offset": 66, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 7, 
+                            "phv_msb": 7, 
+                            "is_compiler_generated": false, 
+                            "field_name": "udp_srcPort", 
+                            "field_width": 2, 
+                            "field_lsb": 0
+                        }
+                    ]
+                }, 
+                {
+                    "phv_number": 66, 
+                    "records": [
+                        {
+                            "word_bit_width": 8, 
                             "position_offset": 20, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
@@ -10810,7 +10734,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 66, 
+                    "phv_number": 67, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -10827,7 +10751,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 67, 
+                    "phv_number": 68, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -10882,7 +10806,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 68, 
+                    "phv_number": 69, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -10995,6 +10919,35 @@
                     "records": [
                         {
                             "word_bit_width": 16, 
+                            "position_offset": 38, 
+                            "phv_lsb": 8, 
+                            "is_pov": false, 
+                            "field_msb": 7, 
+                            "phv_msb": 15, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_srcPort", 
+                            "field_width": 2, 
+                            "field_lsb": 0
+                        }, 
+                        {
+                            "word_bit_width": 16, 
+                            "position_offset": 33, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 7, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_dstPort", 
+                            "field_width": 2, 
+                            "field_lsb": 8
+                        }
+                    ]
+                }, 
+                {
+                    "phv_number": 133, 
+                    "records": [
+                        {
+                            "word_bit_width": 16, 
                             "position_offset": 20, 
                             "phv_lsb": 8, 
                             "is_pov": false, 
@@ -11020,7 +10973,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 133, 
+                    "phv_number": 134, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -11037,7 +10990,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 134, 
+                    "phv_number": 135, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -11054,7 +11007,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 135, 
+                    "phv_number": 136, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -11185,6 +11138,30 @@
                             "field_name": "tcp_window", 
                             "field_width": 2, 
                             "field_lsb": 0
+                        }, 
+                        {
+                            "word_bit_width": 32, 
+                            "position_offset": 17, 
+                            "phv_lsb": 16, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 31, 
+                            "is_compiler_generated": false, 
+                            "field_name": "udp_length_", 
+                            "field_width": 2, 
+                            "field_lsb": 0
+                        }, 
+                        {
+                            "word_bit_width": 32, 
+                            "position_offset": 68, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 15, 
+                            "is_compiler_generated": false, 
+                            "field_name": "udp_checksum", 
+                            "field_width": 2, 
+                            "field_lsb": 0
                         }
                     ]
                 }, 
@@ -11251,94 +11228,31 @@
                     "records": [
                         {
                             "word_bit_width": 8, 
-                            "position_offset": 38, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 7, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_srcPort", 
-                            "field_width": 2, 
-                            "field_lsb": 8
-                        }, 
-                        {
-                            "word_bit_width": 8, 
-                            "position_offset": 17, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 7, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_length_", 
-                            "field_width": 2, 
-                            "field_lsb": 8
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 290, 
-                    "records": [
-                        {
-                            "word_bit_width": 8, 
-                            "position_offset": 38, 
+                            "position_offset": 76, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 7, 
                             "phv_msb": 7, 
                             "is_compiler_generated": false, 
-                            "field_name": "tcp_srcPort", 
-                            "field_width": 2, 
+                            "field_name": "tcp_seqNo", 
+                            "field_width": 4, 
                             "field_lsb": 0
                         }, 
                         {
                             "word_bit_width": 8, 
-                            "position_offset": 17, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 7, 
-                            "phv_msb": 7, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_length_", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 291, 
-                    "records": [
-                        {
-                            "word_bit_width": 8, 
-                            "position_offset": 33, 
+                            "position_offset": 66, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 15, 
                             "phv_msb": 7, 
                             "is_compiler_generated": false, 
-                            "field_name": "tcp_dstPort", 
+                            "field_name": "udp_srcPort", 
                             "field_width": 2, 
                             "field_lsb": 8
                         }
                     ]
                 }, 
                 {
-                    "phv_number": 292, 
-                    "records": [
-                        {
-                            "word_bit_width": 8, 
-                            "position_offset": 33, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 7, 
-                            "phv_msb": 7, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_dstPort", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
                     "phv_number": 320, 
                     "records": [
                         {
@@ -11401,52 +11315,6 @@
                     "records": [
                         {
                             "word_bit_width": 16, 
-                            "position_offset": 76, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 31, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_seqNo", 
-                            "field_width": 4, 
-                            "field_lsb": 16
-                        }, 
-                        {
-                            "word_bit_width": 16, 
-                            "position_offset": 68, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_checksum", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 323, 
-                    "records": [
-                        {
-                            "word_bit_width": 16, 
-                            "position_offset": 76, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_seqNo", 
-                            "field_width": 4, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 324, 
-                    "records": [
-                        {
-                            "word_bit_width": 16, 
                             "position_offset": 26, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
@@ -11456,11 +11324,23 @@
                             "field_name": "tcp_ackNo", 
                             "field_width": 4, 
                             "field_lsb": 16
+                        }, 
+                        {
+                            "word_bit_width": 16, 
+                            "position_offset": 55, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 15, 
+                            "is_compiler_generated": false, 
+                            "field_name": "udp_dstPort", 
+                            "field_width": 2, 
+                            "field_lsb": 0
                         }
                     ]
                 }, 
                 {
-                    "phv_number": 325, 
+                    "phv_number": 323, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -11568,7 +11448,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 264, 
+                    "phv_number": 260, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -11609,7 +11489,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 265, 
+                    "phv_number": 261, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -11626,7 +11506,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 266, 
+                    "phv_number": 262, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -11643,7 +11523,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 267, 
+                    "phv_number": 263, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -11684,7 +11564,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 268, 
+                    "phv_number": 264, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -11749,7 +11629,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 269, 
+                    "phv_number": 265, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -11778,7 +11658,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 270, 
+                    "phv_number": 266, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -11795,7 +11675,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 271, 
+                    "phv_number": 267, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -11812,7 +11692,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 296, 
+                    "phv_number": 292, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -11841,7 +11721,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 297, 
+                    "phv_number": 293, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -11858,7 +11738,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 298, 
+                    "phv_number": 294, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -11887,7 +11767,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 299, 
+                    "phv_number": 295, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -11916,7 +11796,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 300, 
+                    "phv_number": 296, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -11933,7 +11813,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 301, 
+                    "phv_number": 297, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -11950,7 +11830,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 332, 
+                    "phv_number": 326, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -11967,7 +11847,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 333, 
+                    "phv_number": 327, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -11984,7 +11864,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 334, 
+                    "phv_number": 328, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -12013,7 +11893,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 335, 
+                    "phv_number": 329, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -12026,23 +11906,6 @@
                             "field_name": "tcp_dstPort", 
                             "field_width": 2, 
                             "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 336, 
-                    "records": [
-                        {
-                            "word_bit_width": 16, 
-                            "position_offset": 69, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 31, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_seqNo", 
-                            "field_width": 4, 
-                            "field_lsb": 16
                         }, 
                         {
                             "word_bit_width": 16, 
@@ -12059,7 +11922,24 @@
                     ]
                 }, 
                 {
-                    "phv_number": 337, 
+                    "phv_number": 330, 
+                    "records": [
+                        {
+                            "word_bit_width": 16, 
+                            "position_offset": 69, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 31, 
+                            "phv_msb": 15, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_seqNo", 
+                            "field_width": 4, 
+                            "field_lsb": 16
+                        }
+                    ]
+                }, 
+                {
+                    "phv_number": 331, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -12076,7 +11956,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 338, 
+                    "phv_number": 332, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -12105,7 +11985,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 339, 
+                    "phv_number": 333, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -12122,7 +12002,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 340, 
+                    "phv_number": 334, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -12236,6 +12116,35 @@
                     "records": [
                         {
                             "word_bit_width": 32, 
+                            "position_offset": 33, 
+                            "phv_lsb": 24, 
+                            "is_pov": false, 
+                            "field_msb": 7, 
+                            "phv_msb": 31, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_dstPort", 
+                            "field_width": 2, 
+                            "field_lsb": 0
+                        }, 
+                        {
+                            "word_bit_width": 32, 
+                            "position_offset": 76, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 31, 
+                            "phv_msb": 23, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_seqNo", 
+                            "field_width": 4, 
+                            "field_lsb": 8
+                        }
+                    ]
+                }, 
+                {
+                    "phv_number": 4, 
+                    "records": [
+                        {
+                            "word_bit_width": 32, 
                             "position_offset": 20, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
@@ -12249,7 +12158,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 4, 
+                    "phv_number": 5, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -12266,35 +12175,6 @@
                     ]
                 }, 
                 {
-                    "phv_number": 5, 
-                    "records": [
-                        {
-                            "word_bit_width": 32, 
-                            "position_offset": 66, 
-                            "phv_lsb": 16, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 31, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_srcPort", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }, 
-                        {
-                            "word_bit_width": 32, 
-                            "position_offset": 55, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_dstPort", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
                     "phv_number": 64, 
                     "records": [
                         {
@@ -12316,6 +12196,35 @@
                     "records": [
                         {
                             "word_bit_width": 8, 
+                            "position_offset": 38, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 7, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_srcPort", 
+                            "field_width": 2, 
+                            "field_lsb": 8
+                        }, 
+                        {
+                            "word_bit_width": 8, 
+                            "position_offset": 66, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 7, 
+                            "phv_msb": 7, 
+                            "is_compiler_generated": false, 
+                            "field_name": "udp_srcPort", 
+                            "field_width": 2, 
+                            "field_lsb": 0
+                        }
+                    ]
+                }, 
+                {
+                    "phv_number": 66, 
+                    "records": [
+                        {
+                            "word_bit_width": 8, 
                             "position_offset": 20, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
@@ -12329,7 +12238,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 66, 
+                    "phv_number": 67, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -12346,7 +12255,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 67, 
+                    "phv_number": 68, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -12401,7 +12310,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 68, 
+                    "phv_number": 69, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -12514,6 +12423,35 @@
                     "records": [
                         {
                             "word_bit_width": 16, 
+                            "position_offset": 38, 
+                            "phv_lsb": 8, 
+                            "is_pov": false, 
+                            "field_msb": 7, 
+                            "phv_msb": 15, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_srcPort", 
+                            "field_width": 2, 
+                            "field_lsb": 0
+                        }, 
+                        {
+                            "word_bit_width": 16, 
+                            "position_offset": 33, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 7, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_dstPort", 
+                            "field_width": 2, 
+                            "field_lsb": 8
+                        }
+                    ]
+                }, 
+                {
+                    "phv_number": 133, 
+                    "records": [
+                        {
+                            "word_bit_width": 16, 
                             "position_offset": 20, 
                             "phv_lsb": 8, 
                             "is_pov": false, 
@@ -12539,7 +12477,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 133, 
+                    "phv_number": 134, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -12556,7 +12494,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 134, 
+                    "phv_number": 135, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -12573,7 +12511,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 135, 
+                    "phv_number": 136, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -12704,6 +12642,30 @@
                             "field_name": "tcp_window", 
                             "field_width": 2, 
                             "field_lsb": 0
+                        }, 
+                        {
+                            "word_bit_width": 32, 
+                            "position_offset": 17, 
+                            "phv_lsb": 16, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 31, 
+                            "is_compiler_generated": false, 
+                            "field_name": "udp_length_", 
+                            "field_width": 2, 
+                            "field_lsb": 0
+                        }, 
+                        {
+                            "word_bit_width": 32, 
+                            "position_offset": 68, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 15, 
+                            "is_compiler_generated": false, 
+                            "field_name": "udp_checksum", 
+                            "field_width": 2, 
+                            "field_lsb": 0
                         }
                     ]
                 }, 
@@ -12770,94 +12732,31 @@
                     "records": [
                         {
                             "word_bit_width": 8, 
-                            "position_offset": 38, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 7, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_srcPort", 
-                            "field_width": 2, 
-                            "field_lsb": 8
-                        }, 
-                        {
-                            "word_bit_width": 8, 
-                            "position_offset": 17, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 7, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_length_", 
-                            "field_width": 2, 
-                            "field_lsb": 8
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 290, 
-                    "records": [
-                        {
-                            "word_bit_width": 8, 
-                            "position_offset": 38, 
+                            "position_offset": 76, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 7, 
                             "phv_msb": 7, 
                             "is_compiler_generated": false, 
-                            "field_name": "tcp_srcPort", 
-                            "field_width": 2, 
+                            "field_name": "tcp_seqNo", 
+                            "field_width": 4, 
                             "field_lsb": 0
                         }, 
                         {
                             "word_bit_width": 8, 
-                            "position_offset": 17, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 7, 
-                            "phv_msb": 7, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_length_", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 291, 
-                    "records": [
-                        {
-                            "word_bit_width": 8, 
-                            "position_offset": 33, 
+                            "position_offset": 66, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 15, 
                             "phv_msb": 7, 
                             "is_compiler_generated": false, 
-                            "field_name": "tcp_dstPort", 
+                            "field_name": "udp_srcPort", 
                             "field_width": 2, 
                             "field_lsb": 8
                         }
                     ]
                 }, 
                 {
-                    "phv_number": 292, 
-                    "records": [
-                        {
-                            "word_bit_width": 8, 
-                            "position_offset": 33, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 7, 
-                            "phv_msb": 7, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_dstPort", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
                     "phv_number": 320, 
                     "records": [
                         {
@@ -12920,52 +12819,6 @@
                     "records": [
                         {
                             "word_bit_width": 16, 
-                            "position_offset": 76, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 31, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_seqNo", 
-                            "field_width": 4, 
-                            "field_lsb": 16
-                        }, 
-                        {
-                            "word_bit_width": 16, 
-                            "position_offset": 68, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_checksum", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 323, 
-                    "records": [
-                        {
-                            "word_bit_width": 16, 
-                            "position_offset": 76, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_seqNo", 
-                            "field_width": 4, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 324, 
-                    "records": [
-                        {
-                            "word_bit_width": 16, 
                             "position_offset": 26, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
@@ -12975,11 +12828,23 @@
                             "field_name": "tcp_ackNo", 
                             "field_width": 4, 
                             "field_lsb": 16
+                        }, 
+                        {
+                            "word_bit_width": 16, 
+                            "position_offset": 55, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 15, 
+                            "is_compiler_generated": false, 
+                            "field_name": "udp_dstPort", 
+                            "field_width": 2, 
+                            "field_lsb": 0
                         }
                     ]
                 }, 
                 {
-                    "phv_number": 325, 
+                    "phv_number": 323, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -13087,7 +12952,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 264, 
+                    "phv_number": 260, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -13128,7 +12993,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 265, 
+                    "phv_number": 261, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -13145,7 +13010,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 266, 
+                    "phv_number": 262, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -13162,7 +13027,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 267, 
+                    "phv_number": 263, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -13203,7 +13068,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 268, 
+                    "phv_number": 264, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -13268,7 +13133,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 269, 
+                    "phv_number": 265, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -13297,7 +13162,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 270, 
+                    "phv_number": 266, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -13314,7 +13179,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 271, 
+                    "phv_number": 267, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -13331,7 +13196,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 296, 
+                    "phv_number": 292, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -13360,7 +13225,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 297, 
+                    "phv_number": 293, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -13377,7 +13242,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 298, 
+                    "phv_number": 294, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -13406,7 +13271,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 299, 
+                    "phv_number": 295, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -13435,7 +13300,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 300, 
+                    "phv_number": 296, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -13452,7 +13317,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 301, 
+                    "phv_number": 297, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -13469,7 +13334,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 332, 
+                    "phv_number": 326, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -13486,7 +13351,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 333, 
+                    "phv_number": 327, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -13503,7 +13368,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 334, 
+                    "phv_number": 328, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -13532,7 +13397,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 335, 
+                    "phv_number": 329, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -13545,23 +13410,6 @@
                             "field_name": "tcp_dstPort", 
                             "field_width": 2, 
                             "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 336, 
-                    "records": [
-                        {
-                            "word_bit_width": 16, 
-                            "position_offset": 69, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 31, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_seqNo", 
-                            "field_width": 4, 
-                            "field_lsb": 16
                         }, 
                         {
                             "word_bit_width": 16, 
@@ -13578,7 +13426,24 @@
                     ]
                 }, 
                 {
-                    "phv_number": 337, 
+                    "phv_number": 330, 
+                    "records": [
+                        {
+                            "word_bit_width": 16, 
+                            "position_offset": 69, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 31, 
+                            "phv_msb": 15, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_seqNo", 
+                            "field_width": 4, 
+                            "field_lsb": 16
+                        }
+                    ]
+                }, 
+                {
+                    "phv_number": 331, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -13595,7 +13460,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 338, 
+                    "phv_number": 332, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -13624,7 +13489,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 339, 
+                    "phv_number": 333, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -13641,7 +13506,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 340, 
+                    "phv_number": 334, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -13755,6 +13620,35 @@
                     "records": [
                         {
                             "word_bit_width": 32, 
+                            "position_offset": 33, 
+                            "phv_lsb": 24, 
+                            "is_pov": false, 
+                            "field_msb": 7, 
+                            "phv_msb": 31, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_dstPort", 
+                            "field_width": 2, 
+                            "field_lsb": 0
+                        }, 
+                        {
+                            "word_bit_width": 32, 
+                            "position_offset": 76, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 31, 
+                            "phv_msb": 23, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_seqNo", 
+                            "field_width": 4, 
+                            "field_lsb": 8
+                        }
+                    ]
+                }, 
+                {
+                    "phv_number": 4, 
+                    "records": [
+                        {
+                            "word_bit_width": 32, 
                             "position_offset": 20, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
@@ -13768,7 +13662,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 4, 
+                    "phv_number": 5, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -13785,35 +13679,6 @@
                     ]
                 }, 
                 {
-                    "phv_number": 5, 
-                    "records": [
-                        {
-                            "word_bit_width": 32, 
-                            "position_offset": 66, 
-                            "phv_lsb": 16, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 31, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_srcPort", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }, 
-                        {
-                            "word_bit_width": 32, 
-                            "position_offset": 55, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_dstPort", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
                     "phv_number": 64, 
                     "records": [
                         {
@@ -13835,6 +13700,35 @@
                     "records": [
                         {
                             "word_bit_width": 8, 
+                            "position_offset": 38, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 7, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_srcPort", 
+                            "field_width": 2, 
+                            "field_lsb": 8
+                        }, 
+                        {
+                            "word_bit_width": 8, 
+                            "position_offset": 66, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 7, 
+                            "phv_msb": 7, 
+                            "is_compiler_generated": false, 
+                            "field_name": "udp_srcPort", 
+                            "field_width": 2, 
+                            "field_lsb": 0
+                        }
+                    ]
+                }, 
+                {
+                    "phv_number": 66, 
+                    "records": [
+                        {
+                            "word_bit_width": 8, 
                             "position_offset": 20, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
@@ -13848,7 +13742,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 66, 
+                    "phv_number": 67, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -13865,7 +13759,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 67, 
+                    "phv_number": 68, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -13920,7 +13814,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 68, 
+                    "phv_number": 69, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -14033,6 +13927,35 @@
                     "records": [
                         {
                             "word_bit_width": 16, 
+                            "position_offset": 38, 
+                            "phv_lsb": 8, 
+                            "is_pov": false, 
+                            "field_msb": 7, 
+                            "phv_msb": 15, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_srcPort", 
+                            "field_width": 2, 
+                            "field_lsb": 0
+                        }, 
+                        {
+                            "word_bit_width": 16, 
+                            "position_offset": 33, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 7, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_dstPort", 
+                            "field_width": 2, 
+                            "field_lsb": 8
+                        }
+                    ]
+                }, 
+                {
+                    "phv_number": 133, 
+                    "records": [
+                        {
+                            "word_bit_width": 16, 
                             "position_offset": 20, 
                             "phv_lsb": 8, 
                             "is_pov": false, 
@@ -14058,7 +13981,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 133, 
+                    "phv_number": 134, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -14075,7 +13998,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 134, 
+                    "phv_number": 135, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -14092,7 +14015,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 135, 
+                    "phv_number": 136, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -14223,6 +14146,30 @@
                             "field_name": "tcp_window", 
                             "field_width": 2, 
                             "field_lsb": 0
+                        }, 
+                        {
+                            "word_bit_width": 32, 
+                            "position_offset": 17, 
+                            "phv_lsb": 16, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 31, 
+                            "is_compiler_generated": false, 
+                            "field_name": "udp_length_", 
+                            "field_width": 2, 
+                            "field_lsb": 0
+                        }, 
+                        {
+                            "word_bit_width": 32, 
+                            "position_offset": 68, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 15, 
+                            "is_compiler_generated": false, 
+                            "field_name": "udp_checksum", 
+                            "field_width": 2, 
+                            "field_lsb": 0
                         }
                     ]
                 }, 
@@ -14289,94 +14236,31 @@
                     "records": [
                         {
                             "word_bit_width": 8, 
-                            "position_offset": 38, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 7, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_srcPort", 
-                            "field_width": 2, 
-                            "field_lsb": 8
-                        }, 
-                        {
-                            "word_bit_width": 8, 
-                            "position_offset": 17, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 7, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_length_", 
-                            "field_width": 2, 
-                            "field_lsb": 8
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 290, 
-                    "records": [
-                        {
-                            "word_bit_width": 8, 
-                            "position_offset": 38, 
+                            "position_offset": 76, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 7, 
                             "phv_msb": 7, 
                             "is_compiler_generated": false, 
-                            "field_name": "tcp_srcPort", 
-                            "field_width": 2, 
+                            "field_name": "tcp_seqNo", 
+                            "field_width": 4, 
                             "field_lsb": 0
                         }, 
                         {
                             "word_bit_width": 8, 
-                            "position_offset": 17, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 7, 
-                            "phv_msb": 7, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_length_", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 291, 
-                    "records": [
-                        {
-                            "word_bit_width": 8, 
-                            "position_offset": 33, 
+                            "position_offset": 66, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 15, 
                             "phv_msb": 7, 
                             "is_compiler_generated": false, 
-                            "field_name": "tcp_dstPort", 
+                            "field_name": "udp_srcPort", 
                             "field_width": 2, 
                             "field_lsb": 8
                         }
                     ]
                 }, 
                 {
-                    "phv_number": 292, 
-                    "records": [
-                        {
-                            "word_bit_width": 8, 
-                            "position_offset": 33, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 7, 
-                            "phv_msb": 7, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_dstPort", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
                     "phv_number": 320, 
                     "records": [
                         {
@@ -14439,52 +14323,6 @@
                     "records": [
                         {
                             "word_bit_width": 16, 
-                            "position_offset": 76, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 31, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_seqNo", 
-                            "field_width": 4, 
-                            "field_lsb": 16
-                        }, 
-                        {
-                            "word_bit_width": 16, 
-                            "position_offset": 68, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_checksum", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 323, 
-                    "records": [
-                        {
-                            "word_bit_width": 16, 
-                            "position_offset": 76, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_seqNo", 
-                            "field_width": 4, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 324, 
-                    "records": [
-                        {
-                            "word_bit_width": 16, 
                             "position_offset": 26, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
@@ -14494,11 +14332,23 @@
                             "field_name": "tcp_ackNo", 
                             "field_width": 4, 
                             "field_lsb": 16
+                        }, 
+                        {
+                            "word_bit_width": 16, 
+                            "position_offset": 55, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 15, 
+                            "is_compiler_generated": false, 
+                            "field_name": "udp_dstPort", 
+                            "field_width": 2, 
+                            "field_lsb": 0
                         }
                     ]
                 }, 
                 {
-                    "phv_number": 325, 
+                    "phv_number": 323, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -14606,7 +14456,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 264, 
+                    "phv_number": 260, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -14647,7 +14497,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 265, 
+                    "phv_number": 261, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -14664,7 +14514,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 266, 
+                    "phv_number": 262, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -14681,7 +14531,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 267, 
+                    "phv_number": 263, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -14722,7 +14572,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 268, 
+                    "phv_number": 264, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -14787,7 +14637,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 269, 
+                    "phv_number": 265, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -14816,7 +14666,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 270, 
+                    "phv_number": 266, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -14833,7 +14683,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 271, 
+                    "phv_number": 267, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -14850,7 +14700,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 296, 
+                    "phv_number": 292, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -14879,7 +14729,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 297, 
+                    "phv_number": 293, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -14896,7 +14746,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 298, 
+                    "phv_number": 294, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -14925,7 +14775,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 299, 
+                    "phv_number": 295, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -14954,7 +14804,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 300, 
+                    "phv_number": 296, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -14971,7 +14821,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 301, 
+                    "phv_number": 297, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -14988,7 +14838,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 332, 
+                    "phv_number": 326, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -15005,7 +14855,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 333, 
+                    "phv_number": 327, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -15022,7 +14872,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 334, 
+                    "phv_number": 328, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -15051,7 +14901,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 335, 
+                    "phv_number": 329, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -15064,23 +14914,6 @@
                             "field_name": "tcp_dstPort", 
                             "field_width": 2, 
                             "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 336, 
-                    "records": [
-                        {
-                            "word_bit_width": 16, 
-                            "position_offset": 69, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 31, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_seqNo", 
-                            "field_width": 4, 
-                            "field_lsb": 16
                         }, 
                         {
                             "word_bit_width": 16, 
@@ -15097,7 +14930,24 @@
                     ]
                 }, 
                 {
-                    "phv_number": 337, 
+                    "phv_number": 330, 
+                    "records": [
+                        {
+                            "word_bit_width": 16, 
+                            "position_offset": 69, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 31, 
+                            "phv_msb": 15, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_seqNo", 
+                            "field_width": 4, 
+                            "field_lsb": 16
+                        }
+                    ]
+                }, 
+                {
+                    "phv_number": 331, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -15114,7 +14964,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 338, 
+                    "phv_number": 332, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -15143,7 +14993,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 339, 
+                    "phv_number": 333, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -15160,7 +15010,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 340, 
+                    "phv_number": 334, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -15274,6 +15124,35 @@
                     "records": [
                         {
                             "word_bit_width": 32, 
+                            "position_offset": 33, 
+                            "phv_lsb": 24, 
+                            "is_pov": false, 
+                            "field_msb": 7, 
+                            "phv_msb": 31, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_dstPort", 
+                            "field_width": 2, 
+                            "field_lsb": 0
+                        }, 
+                        {
+                            "word_bit_width": 32, 
+                            "position_offset": 76, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 31, 
+                            "phv_msb": 23, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_seqNo", 
+                            "field_width": 4, 
+                            "field_lsb": 8
+                        }
+                    ]
+                }, 
+                {
+                    "phv_number": 4, 
+                    "records": [
+                        {
+                            "word_bit_width": 32, 
                             "position_offset": 20, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
@@ -15287,7 +15166,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 4, 
+                    "phv_number": 5, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -15304,35 +15183,6 @@
                     ]
                 }, 
                 {
-                    "phv_number": 5, 
-                    "records": [
-                        {
-                            "word_bit_width": 32, 
-                            "position_offset": 66, 
-                            "phv_lsb": 16, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 31, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_srcPort", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }, 
-                        {
-                            "word_bit_width": 32, 
-                            "position_offset": 55, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_dstPort", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
                     "phv_number": 64, 
                     "records": [
                         {
@@ -15354,6 +15204,35 @@
                     "records": [
                         {
                             "word_bit_width": 8, 
+                            "position_offset": 38, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 7, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_srcPort", 
+                            "field_width": 2, 
+                            "field_lsb": 8
+                        }, 
+                        {
+                            "word_bit_width": 8, 
+                            "position_offset": 66, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 7, 
+                            "phv_msb": 7, 
+                            "is_compiler_generated": false, 
+                            "field_name": "udp_srcPort", 
+                            "field_width": 2, 
+                            "field_lsb": 0
+                        }
+                    ]
+                }, 
+                {
+                    "phv_number": 66, 
+                    "records": [
+                        {
+                            "word_bit_width": 8, 
                             "position_offset": 20, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
@@ -15367,7 +15246,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 66, 
+                    "phv_number": 67, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -15384,7 +15263,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 67, 
+                    "phv_number": 68, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -15439,7 +15318,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 68, 
+                    "phv_number": 69, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -15552,6 +15431,35 @@
                     "records": [
                         {
                             "word_bit_width": 16, 
+                            "position_offset": 38, 
+                            "phv_lsb": 8, 
+                            "is_pov": false, 
+                            "field_msb": 7, 
+                            "phv_msb": 15, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_srcPort", 
+                            "field_width": 2, 
+                            "field_lsb": 0
+                        }, 
+                        {
+                            "word_bit_width": 16, 
+                            "position_offset": 33, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 7, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_dstPort", 
+                            "field_width": 2, 
+                            "field_lsb": 8
+                        }
+                    ]
+                }, 
+                {
+                    "phv_number": 133, 
+                    "records": [
+                        {
+                            "word_bit_width": 16, 
                             "position_offset": 20, 
                             "phv_lsb": 8, 
                             "is_pov": false, 
@@ -15577,7 +15485,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 133, 
+                    "phv_number": 134, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -15594,7 +15502,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 134, 
+                    "phv_number": 135, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -15611,7 +15519,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 135, 
+                    "phv_number": 136, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -15742,6 +15650,30 @@
                             "field_name": "tcp_window", 
                             "field_width": 2, 
                             "field_lsb": 0
+                        }, 
+                        {
+                            "word_bit_width": 32, 
+                            "position_offset": 17, 
+                            "phv_lsb": 16, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 31, 
+                            "is_compiler_generated": false, 
+                            "field_name": "udp_length_", 
+                            "field_width": 2, 
+                            "field_lsb": 0
+                        }, 
+                        {
+                            "word_bit_width": 32, 
+                            "position_offset": 68, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 15, 
+                            "is_compiler_generated": false, 
+                            "field_name": "udp_checksum", 
+                            "field_width": 2, 
+                            "field_lsb": 0
                         }
                     ]
                 }, 
@@ -15808,94 +15740,31 @@
                     "records": [
                         {
                             "word_bit_width": 8, 
-                            "position_offset": 38, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 7, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_srcPort", 
-                            "field_width": 2, 
-                            "field_lsb": 8
-                        }, 
-                        {
-                            "word_bit_width": 8, 
-                            "position_offset": 17, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 7, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_length_", 
-                            "field_width": 2, 
-                            "field_lsb": 8
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 290, 
-                    "records": [
-                        {
-                            "word_bit_width": 8, 
-                            "position_offset": 38, 
+                            "position_offset": 76, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 7, 
                             "phv_msb": 7, 
                             "is_compiler_generated": false, 
-                            "field_name": "tcp_srcPort", 
-                            "field_width": 2, 
+                            "field_name": "tcp_seqNo", 
+                            "field_width": 4, 
                             "field_lsb": 0
                         }, 
                         {
                             "word_bit_width": 8, 
-                            "position_offset": 17, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 7, 
-                            "phv_msb": 7, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_length_", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 291, 
-                    "records": [
-                        {
-                            "word_bit_width": 8, 
-                            "position_offset": 33, 
+                            "position_offset": 66, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 15, 
                             "phv_msb": 7, 
                             "is_compiler_generated": false, 
-                            "field_name": "tcp_dstPort", 
+                            "field_name": "udp_srcPort", 
                             "field_width": 2, 
                             "field_lsb": 8
                         }
                     ]
                 }, 
                 {
-                    "phv_number": 292, 
-                    "records": [
-                        {
-                            "word_bit_width": 8, 
-                            "position_offset": 33, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 7, 
-                            "phv_msb": 7, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_dstPort", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
                     "phv_number": 320, 
                     "records": [
                         {
@@ -15958,52 +15827,6 @@
                     "records": [
                         {
                             "word_bit_width": 16, 
-                            "position_offset": 76, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 31, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_seqNo", 
-                            "field_width": 4, 
-                            "field_lsb": 16
-                        }, 
-                        {
-                            "word_bit_width": 16, 
-                            "position_offset": 68, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_checksum", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 323, 
-                    "records": [
-                        {
-                            "word_bit_width": 16, 
-                            "position_offset": 76, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_seqNo", 
-                            "field_width": 4, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 324, 
-                    "records": [
-                        {
-                            "word_bit_width": 16, 
                             "position_offset": 26, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
@@ -16013,11 +15836,23 @@
                             "field_name": "tcp_ackNo", 
                             "field_width": 4, 
                             "field_lsb": 16
+                        }, 
+                        {
+                            "word_bit_width": 16, 
+                            "position_offset": 55, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 15, 
+                            "is_compiler_generated": false, 
+                            "field_name": "udp_dstPort", 
+                            "field_width": 2, 
+                            "field_lsb": 0
                         }
                     ]
                 }, 
                 {
-                    "phv_number": 325, 
+                    "phv_number": 323, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -16125,7 +15960,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 264, 
+                    "phv_number": 260, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -16166,7 +16001,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 265, 
+                    "phv_number": 261, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -16183,7 +16018,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 266, 
+                    "phv_number": 262, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -16200,7 +16035,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 267, 
+                    "phv_number": 263, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -16241,7 +16076,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 268, 
+                    "phv_number": 264, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -16306,7 +16141,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 269, 
+                    "phv_number": 265, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -16335,7 +16170,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 270, 
+                    "phv_number": 266, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -16352,7 +16187,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 271, 
+                    "phv_number": 267, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -16369,7 +16204,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 296, 
+                    "phv_number": 292, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -16398,7 +16233,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 297, 
+                    "phv_number": 293, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -16415,7 +16250,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 298, 
+                    "phv_number": 294, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -16444,7 +16279,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 299, 
+                    "phv_number": 295, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -16473,7 +16308,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 300, 
+                    "phv_number": 296, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -16490,7 +16325,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 301, 
+                    "phv_number": 297, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -16507,7 +16342,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 332, 
+                    "phv_number": 326, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -16524,7 +16359,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 333, 
+                    "phv_number": 327, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -16541,7 +16376,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 334, 
+                    "phv_number": 328, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -16570,7 +16405,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 335, 
+                    "phv_number": 329, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -16583,23 +16418,6 @@
                             "field_name": "tcp_dstPort", 
                             "field_width": 2, 
                             "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 336, 
-                    "records": [
-                        {
-                            "word_bit_width": 16, 
-                            "position_offset": 69, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 31, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_seqNo", 
-                            "field_width": 4, 
-                            "field_lsb": 16
                         }, 
                         {
                             "word_bit_width": 16, 
@@ -16616,7 +16434,24 @@
                     ]
                 }, 
                 {
-                    "phv_number": 337, 
+                    "phv_number": 330, 
+                    "records": [
+                        {
+                            "word_bit_width": 16, 
+                            "position_offset": 69, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 31, 
+                            "phv_msb": 15, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_seqNo", 
+                            "field_width": 4, 
+                            "field_lsb": 16
+                        }
+                    ]
+                }, 
+                {
+                    "phv_number": 331, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -16633,7 +16468,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 338, 
+                    "phv_number": 332, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -16662,7 +16497,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 339, 
+                    "phv_number": 333, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -16679,7 +16514,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 340, 
+                    "phv_number": 334, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -16793,6 +16628,35 @@
                     "records": [
                         {
                             "word_bit_width": 32, 
+                            "position_offset": 33, 
+                            "phv_lsb": 24, 
+                            "is_pov": false, 
+                            "field_msb": 7, 
+                            "phv_msb": 31, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_dstPort", 
+                            "field_width": 2, 
+                            "field_lsb": 0
+                        }, 
+                        {
+                            "word_bit_width": 32, 
+                            "position_offset": 76, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 31, 
+                            "phv_msb": 23, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_seqNo", 
+                            "field_width": 4, 
+                            "field_lsb": 8
+                        }
+                    ]
+                }, 
+                {
+                    "phv_number": 4, 
+                    "records": [
+                        {
+                            "word_bit_width": 32, 
                             "position_offset": 20, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
@@ -16806,7 +16670,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 4, 
+                    "phv_number": 5, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -16823,35 +16687,6 @@
                     ]
                 }, 
                 {
-                    "phv_number": 5, 
-                    "records": [
-                        {
-                            "word_bit_width": 32, 
-                            "position_offset": 66, 
-                            "phv_lsb": 16, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 31, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_srcPort", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }, 
-                        {
-                            "word_bit_width": 32, 
-                            "position_offset": 55, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_dstPort", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
                     "phv_number": 64, 
                     "records": [
                         {
@@ -16873,6 +16708,35 @@
                     "records": [
                         {
                             "word_bit_width": 8, 
+                            "position_offset": 38, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 7, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_srcPort", 
+                            "field_width": 2, 
+                            "field_lsb": 8
+                        }, 
+                        {
+                            "word_bit_width": 8, 
+                            "position_offset": 66, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 7, 
+                            "phv_msb": 7, 
+                            "is_compiler_generated": false, 
+                            "field_name": "udp_srcPort", 
+                            "field_width": 2, 
+                            "field_lsb": 0
+                        }
+                    ]
+                }, 
+                {
+                    "phv_number": 66, 
+                    "records": [
+                        {
+                            "word_bit_width": 8, 
                             "position_offset": 20, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
@@ -16886,7 +16750,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 66, 
+                    "phv_number": 67, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -16903,7 +16767,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 67, 
+                    "phv_number": 68, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -16958,7 +16822,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 68, 
+                    "phv_number": 69, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -17071,6 +16935,35 @@
                     "records": [
                         {
                             "word_bit_width": 16, 
+                            "position_offset": 38, 
+                            "phv_lsb": 8, 
+                            "is_pov": false, 
+                            "field_msb": 7, 
+                            "phv_msb": 15, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_srcPort", 
+                            "field_width": 2, 
+                            "field_lsb": 0
+                        }, 
+                        {
+                            "word_bit_width": 16, 
+                            "position_offset": 33, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 7, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_dstPort", 
+                            "field_width": 2, 
+                            "field_lsb": 8
+                        }
+                    ]
+                }, 
+                {
+                    "phv_number": 133, 
+                    "records": [
+                        {
+                            "word_bit_width": 16, 
                             "position_offset": 20, 
                             "phv_lsb": 8, 
                             "is_pov": false, 
@@ -17096,7 +16989,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 133, 
+                    "phv_number": 134, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -17113,7 +17006,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 134, 
+                    "phv_number": 135, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -17130,7 +17023,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 135, 
+                    "phv_number": 136, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -17261,6 +17154,30 @@
                             "field_name": "tcp_window", 
                             "field_width": 2, 
                             "field_lsb": 0
+                        }, 
+                        {
+                            "word_bit_width": 32, 
+                            "position_offset": 17, 
+                            "phv_lsb": 16, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 31, 
+                            "is_compiler_generated": false, 
+                            "field_name": "udp_length_", 
+                            "field_width": 2, 
+                            "field_lsb": 0
+                        }, 
+                        {
+                            "word_bit_width": 32, 
+                            "position_offset": 68, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 15, 
+                            "is_compiler_generated": false, 
+                            "field_name": "udp_checksum", 
+                            "field_width": 2, 
+                            "field_lsb": 0
                         }
                     ]
                 }, 
@@ -17327,94 +17244,31 @@
                     "records": [
                         {
                             "word_bit_width": 8, 
-                            "position_offset": 38, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 7, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_srcPort", 
-                            "field_width": 2, 
-                            "field_lsb": 8
-                        }, 
-                        {
-                            "word_bit_width": 8, 
-                            "position_offset": 17, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 7, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_length_", 
-                            "field_width": 2, 
-                            "field_lsb": 8
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 290, 
-                    "records": [
-                        {
-                            "word_bit_width": 8, 
-                            "position_offset": 38, 
+                            "position_offset": 76, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 7, 
                             "phv_msb": 7, 
                             "is_compiler_generated": false, 
-                            "field_name": "tcp_srcPort", 
-                            "field_width": 2, 
+                            "field_name": "tcp_seqNo", 
+                            "field_width": 4, 
                             "field_lsb": 0
                         }, 
                         {
                             "word_bit_width": 8, 
-                            "position_offset": 17, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 7, 
-                            "phv_msb": 7, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_length_", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 291, 
-                    "records": [
-                        {
-                            "word_bit_width": 8, 
-                            "position_offset": 33, 
+                            "position_offset": 66, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 15, 
                             "phv_msb": 7, 
                             "is_compiler_generated": false, 
-                            "field_name": "tcp_dstPort", 
+                            "field_name": "udp_srcPort", 
                             "field_width": 2, 
                             "field_lsb": 8
                         }
                     ]
                 }, 
                 {
-                    "phv_number": 292, 
-                    "records": [
-                        {
-                            "word_bit_width": 8, 
-                            "position_offset": 33, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 7, 
-                            "phv_msb": 7, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_dstPort", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
                     "phv_number": 320, 
                     "records": [
                         {
@@ -17477,52 +17331,6 @@
                     "records": [
                         {
                             "word_bit_width": 16, 
-                            "position_offset": 76, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 31, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_seqNo", 
-                            "field_width": 4, 
-                            "field_lsb": 16
-                        }, 
-                        {
-                            "word_bit_width": 16, 
-                            "position_offset": 68, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "udp_checksum", 
-                            "field_width": 2, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 323, 
-                    "records": [
-                        {
-                            "word_bit_width": 16, 
-                            "position_offset": 76, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 15, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_seqNo", 
-                            "field_width": 4, 
-                            "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 324, 
-                    "records": [
-                        {
-                            "word_bit_width": 16, 
                             "position_offset": 26, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
@@ -17532,11 +17340,23 @@
                             "field_name": "tcp_ackNo", 
                             "field_width": 4, 
                             "field_lsb": 16
+                        }, 
+                        {
+                            "word_bit_width": 16, 
+                            "position_offset": 55, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 15, 
+                            "phv_msb": 15, 
+                            "is_compiler_generated": false, 
+                            "field_name": "udp_dstPort", 
+                            "field_width": 2, 
+                            "field_lsb": 0
                         }
                     ]
                 }, 
                 {
-                    "phv_number": 325, 
+                    "phv_number": 323, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -17644,7 +17464,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 264, 
+                    "phv_number": 260, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -17685,7 +17505,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 265, 
+                    "phv_number": 261, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -17702,7 +17522,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 266, 
+                    "phv_number": 262, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -17719,7 +17539,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 267, 
+                    "phv_number": 263, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -17760,7 +17580,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 268, 
+                    "phv_number": 264, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -17825,7 +17645,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 269, 
+                    "phv_number": 265, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -17854,7 +17674,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 270, 
+                    "phv_number": 266, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -17871,7 +17691,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 271, 
+                    "phv_number": 267, 
                     "records": [
                         {
                             "word_bit_width": 32, 
@@ -17888,7 +17708,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 296, 
+                    "phv_number": 292, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -17917,7 +17737,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 297, 
+                    "phv_number": 293, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -17934,7 +17754,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 298, 
+                    "phv_number": 294, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -17963,7 +17783,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 299, 
+                    "phv_number": 295, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -17992,7 +17812,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 300, 
+                    "phv_number": 296, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -18009,7 +17829,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 301, 
+                    "phv_number": 297, 
                     "records": [
                         {
                             "word_bit_width": 8, 
@@ -18026,7 +17846,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 332, 
+                    "phv_number": 326, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -18043,7 +17863,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 333, 
+                    "phv_number": 327, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -18060,7 +17880,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 334, 
+                    "phv_number": 328, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -18089,7 +17909,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 335, 
+                    "phv_number": 329, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -18102,23 +17922,6 @@
                             "field_name": "tcp_dstPort", 
                             "field_width": 2, 
                             "field_lsb": 0
-                        }
-                    ]
-                }, 
-                {
-                    "phv_number": 336, 
-                    "records": [
-                        {
-                            "word_bit_width": 16, 
-                            "position_offset": 69, 
-                            "phv_lsb": 0, 
-                            "is_pov": false, 
-                            "field_msb": 31, 
-                            "phv_msb": 15, 
-                            "is_compiler_generated": false, 
-                            "field_name": "tcp_seqNo", 
-                            "field_width": 4, 
-                            "field_lsb": 16
                         }, 
                         {
                             "word_bit_width": 16, 
@@ -18135,7 +17938,24 @@
                     ]
                 }, 
                 {
-                    "phv_number": 337, 
+                    "phv_number": 330, 
+                    "records": [
+                        {
+                            "word_bit_width": 16, 
+                            "position_offset": 69, 
+                            "phv_lsb": 0, 
+                            "is_pov": false, 
+                            "field_msb": 31, 
+                            "phv_msb": 15, 
+                            "is_compiler_generated": false, 
+                            "field_name": "tcp_seqNo", 
+                            "field_width": 4, 
+                            "field_lsb": 16
+                        }
+                    ]
+                }, 
+                {
+                    "phv_number": 331, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -18152,7 +17972,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 338, 
+                    "phv_number": 332, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -18181,7 +18001,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 339, 
+                    "phv_number": 333, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -18198,7 +18018,7 @@
                     ]
                 }, 
                 {
-                    "phv_number": 340, 
+                    "phv_number": 334, 
                     "records": [
                         {
                             "word_bit_width": 16, 
@@ -18273,12 +18093,13 @@
             "actions": [
                 {
                     "p4_parameters": [], 
+                    "disallowed_as_default_action_reason": "USES_HASH_DIST", 
                     "handle": 536870914, 
                     "name": "count_ingress", 
                     "indirect_resources": [], 
                     "override_stat_full_addr": 0, 
                     "override_meter_addr_pfe": false, 
-                    "allowed_as_default_action": true, 
+                    "allowed_as_default_action": false, 
                     "override_stat_addr_pfe": true, 
                     "override_stateful_addr_pfe": false, 
                     "override_meter_full_addr": 0, 
@@ -18308,12 +18129,13 @@
             "actions": [
                 {
                     "p4_parameters": [], 
+                    "disallowed_as_default_action_reason": "USES_HASH_DIST", 
                     "handle": 536870914, 
                     "name": "count_ingress", 
                     "indirect_resources": [], 
                     "override_stat_full_addr": 0, 
                     "override_meter_addr_pfe": false, 
-                    "allowed_as_default_action": true, 
+                    "allowed_as_default_action": false, 
                     "override_stat_addr_pfe": true, 
                     "override_stateful_addr_pfe": false, 
                     "override_meter_full_addr": 0, 
@@ -18346,18 +18168,24 @@
                         "pack_format": [
                             {
                                 "memory_word_width": 0, 
-                                "entries_per_table_word": 1, 
+                                "entries_per_table_word": 0, 
                                 "table_word_width": 0, 
                                 "number_memory_units_per_table_word": 0
                             }
                         ], 
+                        "hash_functions": [
+                            {
+                                "hash_function_number": 0, 
+                                "hash_bits": []
+                            }
+                        ], 
                         "result_physical_buses": [
                             1
                         ], 
                         "logical_table_id": 0, 
                         "stage_number": 2, 
                         "stage_table_type": "match_with_no_key", 
-                        "size": 1
+                        "size": 1024
                     }
                 ], 
                 "match_type": "match_with_no_key"
@@ -18410,12 +18238,13 @@
             "actions": [
                 {
                     "p4_parameters": [], 
+                    "disallowed_as_default_action_reason": "USES_HASH_DIST", 
                     "handle": 536870916, 
                     "name": "count_egress", 
                     "indirect_resources": [], 
                     "override_stat_full_addr": 0, 
                     "override_meter_addr_pfe": false, 
-                    "allowed_as_default_action": true, 
+                    "allowed_as_default_action": false, 
                     "override_stat_addr_pfe": true, 
                     "override_stateful_addr_pfe": false, 
                     "override_meter_full_addr": 0, 
@@ -18445,12 +18274,13 @@
             "actions": [
                 {
                     "p4_parameters": [], 
+                    "disallowed_as_default_action_reason": "USES_HASH_DIST", 
                     "handle": 536870916, 
                     "name": "count_egress", 
                     "indirect_resources": [], 
                     "override_stat_full_addr": 0, 
                     "override_meter_addr_pfe": false, 
-                    "allowed_as_default_action": true, 
+                    "allowed_as_default_action": false, 
                     "override_stat_addr_pfe": true, 
                     "override_stateful_addr_pfe": false, 
                     "override_meter_full_addr": 0, 
@@ -18483,18 +18313,24 @@
                         "pack_format": [
                             {
                                 "memory_word_width": 0, 
-                                "entries_per_table_word": 1, 
+                                "entries_per_table_word": 0, 
                                 "table_word_width": 0, 
                                 "number_memory_units_per_table_word": 0
                             }
                         ], 
+                        "hash_functions": [
+                            {
+                                "hash_function_number": 0, 
+                                "hash_bits": []
+                            }
+                        ], 
                         "result_physical_buses": [
                             0
                         ], 
                         "logical_table_id": 1, 
                         "stage_number": 2, 
                         "stage_table_type": "match_with_no_key", 
-                        "size": 1
+                        "size": 1024
                     }
                 ], 
                 "match_type": "match_with_no_key"
@@ -23238,7 +23074,7 @@
             "packet_counter_resolution": 32, 
             "pfe_bit_position": 19, 
             "how_referenced": "indirect", 
-            "size": 510
+            "size": 512
         }, 
         {
             "direction": "ingress", 
@@ -23281,7 +23117,7 @@
             "packet_counter_resolution": 32, 
             "pfe_bit_position": 19, 
             "how_referenced": "indirect", 
-            "size": 510
+            "size": 512
         }, 
         {
             "direction": "ingress", 
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/context/mau.context.json b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/context/mau.context.json
index 5d17e12..dc5a92e 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/context/mau.context.json
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/context/mau.context.json
@@ -1,13 +1,74 @@
 {
   "ProgramInfo": {
     "ProgramName": "ecmp", 
-    "BuildDate": "Tue Sep 12 11:17:01 2017", 
+    "BuildDate": "Wed Sep 13 01:00:43 2017", 
     "CompilerVersion": "5.1.0"
   }, 
   "HashJsonNode": {
-    "TableCount": 1, 
+    "TableCount": 3, 
     "ProxyTables": {}, 
     "AllTables": {
+      "ingress_port_count_table": {
+        "2": [
+          {
+            "0": [
+              {}, 
+              {
+                "seed": 0
+              }
+            ], 
+            "1": [
+              {}, 
+              {
+                "seed": 0
+              }
+            ], 
+            "2": [
+              {}, 
+              {
+                "seed": 0
+              }
+            ], 
+            "3": [
+              {}, 
+              {
+                "seed": 0
+              }
+            ], 
+            "4": [
+              {}, 
+              {
+                "seed": 0
+              }
+            ], 
+            "5": [
+              {}, 
+              {
+                "seed": 0
+              }
+            ], 
+            "6": [
+              {}, 
+              {
+                "seed": 0
+              }
+            ], 
+            "7": [
+              {}, 
+              {
+                "seed": 0
+              }
+            ], 
+            "8": [
+              {}, 
+              {
+                "seed": 0
+              }
+            ]
+          }
+        ], 
+        "Handle": 16777217
+      }, 
       "ecmp_group_table": {
         "1": [
           {
@@ -1939,9 +2000,70 @@
           }
         ], 
         "Handle": 16777221
+      }, 
+      "egress_port_count_table": {
+        "2": [
+          {
+            "0": [
+              {}, 
+              {
+                "seed": 0
+              }
+            ], 
+            "1": [
+              {}, 
+              {
+                "seed": 0
+              }
+            ], 
+            "2": [
+              {}, 
+              {
+                "seed": 0
+              }
+            ], 
+            "3": [
+              {}, 
+              {
+                "seed": 0
+              }
+            ], 
+            "4": [
+              {}, 
+              {
+                "seed": 0
+              }
+            ], 
+            "5": [
+              {}, 
+              {
+                "seed": 0
+              }
+            ], 
+            "6": [
+              {}, 
+              {
+                "seed": 0
+              }
+            ], 
+            "7": [
+              {}, 
+              {
+                "seed": 0
+              }
+            ], 
+            "8": [
+              {}, 
+              {
+                "seed": 0
+              }
+            ]
+          }
+        ], 
+        "Handle": 16777218
       }
     }, 
-    "HashFieldCount": 1
+    "HashFieldCount": 3
   }, 
   "EntryFormatNode": {
     "ExmEntryFormat": {
@@ -4832,7 +4954,7 @@
       "PhvDetails": [
         {
           "TOTALPOVHEADERS": 13, 
-          "TOTALSTAGEPHVS": 59, 
+          "TOTALSTAGEPHVS": 56, 
           "TOTALPHVRECORDS": 95, 
           "Phvs": [
             {
@@ -4912,6 +5034,31 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 31, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_dstPort", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 24, 
+                      "POSITIONOFFSET": 33
+                    }, 
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 23, 
+                      "FIELDMSB": 31, 
+                      "PHVNAME": "tcp_seqNo", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 76
+                    }
+                  ], 
+                  "PHVNUMBER": 3
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 8, 
                       "PHVMSB": 31, 
@@ -4922,7 +5069,7 @@
                       "POSITIONOFFSET": 20
                     }
                   ], 
-                  "PHVNUMBER": 3
+                  "PHVNUMBER": 4
                 }, 
                 {
                   "PHVRECORD": [
@@ -4937,31 +5084,6 @@
                       "POSITIONOFFSET": 70
                     }
                   ], 
-                  "PHVNUMBER": 4
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 31, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_srcPort", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 16, 
-                      "POSITIONOFFSET": 66
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_dstPort", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 55
-                    }
-                  ], 
                   "PHVNUMBER": 5
                 }, 
                 {
@@ -4971,10 +5093,10 @@
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "ecmp_metadata_group_id", 
+                      "PHVNAME": "ethernet_etherType", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 36
+                      "POSITIONOFFSET": 5
                     }
                   ], 
                   "PHVNUMBER": 134
@@ -5007,17 +5129,17 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 16, 
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
                       "PHVMSB": 15, 
-                      "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_ackNo", 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "ecmp_metadata_selector", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 26
+                      "POSITIONOFFSET": 61
                     }
                   ], 
-                  "PHVNUMBER": 324
+                  "PHVNUMBER": 136
                 }, 
                 {
                   "PHVRECORD": [
@@ -5147,6 +5269,31 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_srcPort", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 8, 
+                      "POSITIONOFFSET": 38
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_dstPort", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 33
+                    }
+                  ], 
+                  "PHVNUMBER": 132
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
@@ -5167,21 +5314,6 @@
                       "POSITIONOFFSET": 70
                     }
                   ], 
-                  "PHVNUMBER": 132
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "ethernet_etherType", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 5
-                    }
-                  ], 
                   "PHVNUMBER": 133
                 }, 
                 {
@@ -5212,24 +5344,24 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 8, 
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 0, 
                       "PHVMSB": 7, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_srcPort", 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_seqNo", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
+                      "POSITIONOFFSET": 76
                     }, 
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 8, 
                       "PHVMSB": 7, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "udp_length_", 
+                      "PHVNAME": "udp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 17
+                      "POSITIONOFFSET": 66
                     }
                   ], 
                   "PHVNUMBER": 289
@@ -5239,67 +5371,12 @@
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 0, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "tcp_srcPort", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "udp_length_", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 17
-                    }
-                  ], 
-                  "PHVNUMBER": 290
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 8, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_dstPort", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 33
-                    }
-                  ], 
-                  "PHVNUMBER": 291
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "tcp_dstPort", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 33
-                    }
-                  ], 
-                  "PHVNUMBER": 292
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "ecmp_metadata_selector", 
+                      "PHVNAME": "ecmp_metadata_group_id", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 61
+                      "POSITIONOFFSET": 36
                     }
                   ], 
                   "PHVNUMBER": 135
@@ -5355,6 +5432,26 @@
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
                       "POSITIONOFFSET": 46
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 31, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_length_", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 16, 
+                      "POSITIONOFFSET": 17
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_checksum", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 68
                     }
                   ], 
                   "PHVNUMBER": 257
@@ -5402,6 +5499,31 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_srcPort", 
+                      "CONTAINERWIDTH": 8, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 38
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "udp_srcPort", 
+                      "CONTAINERWIDTH": 8, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 66
+                    }
+                  ], 
+                  "PHVNUMBER": 65
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 40, 
                       "PHVMSB": 7, 
@@ -5412,7 +5534,7 @@
                       "POSITIONOFFSET": 20
                     }
                   ], 
-                  "PHVNUMBER": 65
+                  "PHVNUMBER": 66
                 }, 
                 {
                   "PHVRECORD": [
@@ -5427,7 +5549,7 @@
                       "POSITIONOFFSET": 70
                     }
                   ], 
-                  "PHVNUMBER": 66
+                  "PHVNUMBER": 67
                 }, 
                 {
                   "PHVRECORD": [
@@ -5478,7 +5600,7 @@
                       ]
                     }
                   ], 
-                  "PHVNUMBER": 67
+                  "PHVNUMBER": 68
                 }, 
                 {
                   "PHVRECORD": [
@@ -5493,22 +5615,7 @@
                       "POSITIONOFFSET": 51
                     }
                   ], 
-                  "PHVNUMBER": 68
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_ackNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 26
-                    }
-                  ], 
-                  "PHVNUMBER": 325
+                  "PHVNUMBER": 69
                 }, 
                 {
                   "PHVRECORD": [
@@ -5542,20 +5649,20 @@
                       "FIELDLSB": 16, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_seqNo", 
+                      "PHVNAME": "tcp_ackNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 76
+                      "POSITIONOFFSET": 26
                     }, 
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "udp_checksum", 
+                      "PHVNAME": "udp_dstPort", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 68
+                      "POSITIONOFFSET": 55
                     }
                   ], 
                   "PHVNUMBER": 322
@@ -5567,16 +5674,16 @@
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_seqNo", 
+                      "PHVNAME": "tcp_ackNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 76
+                      "POSITIONOFFSET": 26
                     }
                   ], 
                   "PHVNUMBER": 323
                 }
               ], 
-              "TOTALINGRESSPHVS": 33
+              "TOTALINGRESSPHVS": 30
             }, 
             {
               "PHVDIRECTION": 1, 
@@ -5614,7 +5721,7 @@
                       "POSITIONOFFSET": 9
                     }
                   ], 
-                  "PHVNUMBER": 264
+                  "PHVNUMBER": 260
                 }, 
                 {
                   "PHVRECORD": [
@@ -5629,7 +5736,7 @@
                       "POSITIONOFFSET": 12
                     }
                   ], 
-                  "PHVNUMBER": 265
+                  "PHVNUMBER": 261
                 }, 
                 {
                   "PHVRECORD": [
@@ -5644,7 +5751,7 @@
                       "POSITIONOFFSET": 50
                     }
                   ], 
-                  "PHVNUMBER": 266
+                  "PHVNUMBER": 262
                 }, 
                 {
                   "PHVRECORD": [
@@ -5679,7 +5786,7 @@
                       "POSITIONOFFSET": 59
                     }
                   ], 
-                  "PHVNUMBER": 267
+                  "PHVNUMBER": 263
                 }, 
                 {
                   "PHVRECORD": [
@@ -5734,7 +5841,7 @@
                       "POSITIONOFFSET": 41
                     }
                   ], 
-                  "PHVNUMBER": 268
+                  "PHVNUMBER": 264
                 }, 
                 {
                   "PHVRECORD": [
@@ -5759,7 +5866,7 @@
                       "POSITIONOFFSET": 45
                     }
                   ], 
-                  "PHVNUMBER": 269
+                  "PHVNUMBER": 265
                 }, 
                 {
                   "PHVRECORD": [
@@ -5774,7 +5881,7 @@
                       "POSITIONOFFSET": 19
                     }
                   ], 
-                  "PHVNUMBER": 270
+                  "PHVNUMBER": 266
                 }, 
                 {
                   "PHVRECORD": [
@@ -5789,7 +5896,7 @@
                       "POSITIONOFFSET": 63
                     }
                   ], 
-                  "PHVNUMBER": 271
+                  "PHVNUMBER": 267
                 }, 
                 {
                   "PHVRECORD": [
@@ -5829,7 +5936,7 @@
                       "POSITIONOFFSET": 37
                     }
                   ], 
-                  "PHVNUMBER": 296
+                  "PHVNUMBER": 292
                 }, 
                 {
                   "PHVRECORD": [
@@ -5844,7 +5951,7 @@
                       "POSITIONOFFSET": 4
                     }
                   ], 
-                  "PHVNUMBER": 297
+                  "PHVNUMBER": 293
                 }, 
                 {
                   "PHVRECORD": [
@@ -5869,7 +5976,7 @@
                       "POSITIONOFFSET": 56
                     }
                   ], 
-                  "PHVNUMBER": 298
+                  "PHVNUMBER": 294
                 }, 
                 {
                   "PHVRECORD": [
@@ -5894,7 +6001,7 @@
                       "POSITIONOFFSET": 56
                     }
                   ], 
-                  "PHVNUMBER": 299
+                  "PHVNUMBER": 295
                 }, 
                 {
                   "PHVRECORD": [
@@ -5909,7 +6016,7 @@
                       "POSITIONOFFSET": 19
                     }
                   ], 
-                  "PHVNUMBER": 300
+                  "PHVNUMBER": 296
                 }, 
                 {
                   "PHVRECORD": [
@@ -5924,7 +6031,7 @@
                       "POSITIONOFFSET": 63
                     }
                   ], 
-                  "PHVNUMBER": 301
+                  "PHVNUMBER": 297
                 }, 
                 {
                   "PHVRECORD": [
@@ -5939,7 +6046,7 @@
                       "POSITIONOFFSET": 54
                     }
                   ], 
-                  "PHVNUMBER": 332
+                  "PHVNUMBER": 326
                 }, 
                 {
                   "PHVRECORD": [
@@ -5954,7 +6061,7 @@
                       "POSITIONOFFSET": 43
                     }
                   ], 
-                  "PHVNUMBER": 333
+                  "PHVNUMBER": 327
                 }, 
                 {
                   "PHVRECORD": [
@@ -5979,7 +6086,7 @@
                       "POSITIONOFFSET": 5
                     }
                   ], 
-                  "PHVNUMBER": 334
+                  "PHVNUMBER": 328
                 }, 
                 {
                   "PHVRECORD": [
@@ -5992,9 +6099,114 @@
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
                       "POSITIONOFFSET": 32
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_dstPort", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 48
                     }
                   ], 
-                  "PHVNUMBER": 335
+                  "PHVNUMBER": 329
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 16, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 31, 
+                      "PHVNAME": "tcp_seqNo", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 69
+                    }
+                  ], 
+                  "PHVNUMBER": 330
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_seqNo", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 69
+                    }
+                  ], 
+                  "PHVNUMBER": 331
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 6, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "ethernet_dstAddr", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 8, 
+                      "POSITIONOFFSET": 19
+                    }, 
+                    {
+                      "FIELDWIDTH": 6, 
+                      "FIELDLSB": 40, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 47, 
+                      "PHVNAME": "ethernet_srcAddr", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 63
+                    }
+                  ], 
+                  "PHVNUMBER": 332
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "ethernet_etherType", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 39
+                    }
+                  ], 
+                  "PHVNUMBER": 333
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 8, 
+                      "PHVNAME": "packet_out_hdr_egress_port", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 7, 
+                      "POSITIONOFFSET": 0
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 8, 
+                      "PHVNAME": "packet_in_hdr_ingress_port", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 7, 
+                      "POSITIONOFFSET": 30
+                    }
+                  ], 
+                  "PHVNUMBER": 334
                 }, 
                 {
                   "PHVRECORD": [
@@ -6061,111 +6273,6 @@
                     }
                   ], 
                   "PHVNUMBER": 81
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 6, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "ethernet_dstAddr", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 8, 
-                      "POSITIONOFFSET": 19
-                    }, 
-                    {
-                      "FIELDWIDTH": 6, 
-                      "FIELDLSB": 40, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 47, 
-                      "PHVNAME": "ethernet_srcAddr", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 63
-                    }
-                  ], 
-                  "PHVNUMBER": 338
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "ethernet_etherType", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 39
-                    }
-                  ], 
-                  "PHVNUMBER": 339
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 8, 
-                      "PHVNAME": "packet_out_hdr_egress_port", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 7, 
-                      "POSITIONOFFSET": 0
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 8, 
-                      "PHVNAME": "packet_in_hdr_ingress_port", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 7, 
-                      "POSITIONOFFSET": 30
-                    }
-                  ], 
-                  "PHVNUMBER": 340
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 16, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_seqNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 69
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_dstPort", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 48
-                    }
-                  ], 
-                  "PHVNUMBER": 336
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_seqNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 69
-                    }
-                  ], 
-                  "PHVNUMBER": 337
                 }
               ], 
               "TOTALEGRESSPHVS": 26
@@ -6175,7 +6282,7 @@
         }, 
         {
           "TOTALPOVHEADERS": 13, 
-          "TOTALSTAGEPHVS": 59, 
+          "TOTALSTAGEPHVS": 56, 
           "TOTALPHVRECORDS": 95, 
           "Phvs": [
             {
@@ -6255,6 +6362,31 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 31, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_dstPort", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 24, 
+                      "POSITIONOFFSET": 33
+                    }, 
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 23, 
+                      "FIELDMSB": 31, 
+                      "PHVNAME": "tcp_seqNo", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 76
+                    }
+                  ], 
+                  "PHVNUMBER": 3
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 8, 
                       "PHVMSB": 31, 
@@ -6265,7 +6397,7 @@
                       "POSITIONOFFSET": 20
                     }
                   ], 
-                  "PHVNUMBER": 3
+                  "PHVNUMBER": 4
                 }, 
                 {
                   "PHVRECORD": [
@@ -6280,31 +6412,6 @@
                       "POSITIONOFFSET": 70
                     }
                   ], 
-                  "PHVNUMBER": 4
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 31, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_srcPort", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 16, 
-                      "POSITIONOFFSET": 66
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_dstPort", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 55
-                    }
-                  ], 
                   "PHVNUMBER": 5
                 }, 
                 {
@@ -6314,10 +6421,10 @@
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "ecmp_metadata_group_id", 
+                      "PHVNAME": "ethernet_etherType", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 36
+                      "POSITIONOFFSET": 5
                     }
                   ], 
                   "PHVNUMBER": 134
@@ -6350,17 +6457,17 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 16, 
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
                       "PHVMSB": 15, 
-                      "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_ackNo", 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "ecmp_metadata_selector", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 26
+                      "POSITIONOFFSET": 61
                     }
                   ], 
-                  "PHVNUMBER": 324
+                  "PHVNUMBER": 136
                 }, 
                 {
                   "PHVRECORD": [
@@ -6490,6 +6597,31 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_srcPort", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 8, 
+                      "POSITIONOFFSET": 38
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_dstPort", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 33
+                    }
+                  ], 
+                  "PHVNUMBER": 132
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
@@ -6510,21 +6642,6 @@
                       "POSITIONOFFSET": 70
                     }
                   ], 
-                  "PHVNUMBER": 132
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "ethernet_etherType", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 5
-                    }
-                  ], 
                   "PHVNUMBER": 133
                 }, 
                 {
@@ -6555,24 +6672,24 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 8, 
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 0, 
                       "PHVMSB": 7, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_srcPort", 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_seqNo", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
+                      "POSITIONOFFSET": 76
                     }, 
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 8, 
                       "PHVMSB": 7, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "udp_length_", 
+                      "PHVNAME": "udp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 17
+                      "POSITIONOFFSET": 66
                     }
                   ], 
                   "PHVNUMBER": 289
@@ -6582,67 +6699,12 @@
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 0, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "tcp_srcPort", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "udp_length_", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 17
-                    }
-                  ], 
-                  "PHVNUMBER": 290
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 8, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_dstPort", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 33
-                    }
-                  ], 
-                  "PHVNUMBER": 291
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "tcp_dstPort", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 33
-                    }
-                  ], 
-                  "PHVNUMBER": 292
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "ecmp_metadata_selector", 
+                      "PHVNAME": "ecmp_metadata_group_id", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 61
+                      "POSITIONOFFSET": 36
                     }
                   ], 
                   "PHVNUMBER": 135
@@ -6698,6 +6760,26 @@
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
                       "POSITIONOFFSET": 46
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 31, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_length_", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 16, 
+                      "POSITIONOFFSET": 17
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_checksum", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 68
                     }
                   ], 
                   "PHVNUMBER": 257
@@ -6745,6 +6827,31 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_srcPort", 
+                      "CONTAINERWIDTH": 8, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 38
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "udp_srcPort", 
+                      "CONTAINERWIDTH": 8, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 66
+                    }
+                  ], 
+                  "PHVNUMBER": 65
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 40, 
                       "PHVMSB": 7, 
@@ -6755,7 +6862,7 @@
                       "POSITIONOFFSET": 20
                     }
                   ], 
-                  "PHVNUMBER": 65
+                  "PHVNUMBER": 66
                 }, 
                 {
                   "PHVRECORD": [
@@ -6770,7 +6877,7 @@
                       "POSITIONOFFSET": 70
                     }
                   ], 
-                  "PHVNUMBER": 66
+                  "PHVNUMBER": 67
                 }, 
                 {
                   "PHVRECORD": [
@@ -6821,7 +6928,7 @@
                       ]
                     }
                   ], 
-                  "PHVNUMBER": 67
+                  "PHVNUMBER": 68
                 }, 
                 {
                   "PHVRECORD": [
@@ -6836,22 +6943,7 @@
                       "POSITIONOFFSET": 51
                     }
                   ], 
-                  "PHVNUMBER": 68
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_ackNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 26
-                    }
-                  ], 
-                  "PHVNUMBER": 325
+                  "PHVNUMBER": 69
                 }, 
                 {
                   "PHVRECORD": [
@@ -6885,20 +6977,20 @@
                       "FIELDLSB": 16, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_seqNo", 
+                      "PHVNAME": "tcp_ackNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 76
+                      "POSITIONOFFSET": 26
                     }, 
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "udp_checksum", 
+                      "PHVNAME": "udp_dstPort", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 68
+                      "POSITIONOFFSET": 55
                     }
                   ], 
                   "PHVNUMBER": 322
@@ -6910,16 +7002,16 @@
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_seqNo", 
+                      "PHVNAME": "tcp_ackNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 76
+                      "POSITIONOFFSET": 26
                     }
                   ], 
                   "PHVNUMBER": 323
                 }
               ], 
-              "TOTALINGRESSPHVS": 33
+              "TOTALINGRESSPHVS": 30
             }, 
             {
               "PHVDIRECTION": 1, 
@@ -6957,7 +7049,7 @@
                       "POSITIONOFFSET": 9
                     }
                   ], 
-                  "PHVNUMBER": 264
+                  "PHVNUMBER": 260
                 }, 
                 {
                   "PHVRECORD": [
@@ -6972,7 +7064,7 @@
                       "POSITIONOFFSET": 12
                     }
                   ], 
-                  "PHVNUMBER": 265
+                  "PHVNUMBER": 261
                 }, 
                 {
                   "PHVRECORD": [
@@ -6987,7 +7079,7 @@
                       "POSITIONOFFSET": 50
                     }
                   ], 
-                  "PHVNUMBER": 266
+                  "PHVNUMBER": 262
                 }, 
                 {
                   "PHVRECORD": [
@@ -7022,7 +7114,7 @@
                       "POSITIONOFFSET": 59
                     }
                   ], 
-                  "PHVNUMBER": 267
+                  "PHVNUMBER": 263
                 }, 
                 {
                   "PHVRECORD": [
@@ -7077,7 +7169,7 @@
                       "POSITIONOFFSET": 41
                     }
                   ], 
-                  "PHVNUMBER": 268
+                  "PHVNUMBER": 264
                 }, 
                 {
                   "PHVRECORD": [
@@ -7102,7 +7194,7 @@
                       "POSITIONOFFSET": 45
                     }
                   ], 
-                  "PHVNUMBER": 269
+                  "PHVNUMBER": 265
                 }, 
                 {
                   "PHVRECORD": [
@@ -7117,7 +7209,7 @@
                       "POSITIONOFFSET": 19
                     }
                   ], 
-                  "PHVNUMBER": 270
+                  "PHVNUMBER": 266
                 }, 
                 {
                   "PHVRECORD": [
@@ -7132,7 +7224,7 @@
                       "POSITIONOFFSET": 63
                     }
                   ], 
-                  "PHVNUMBER": 271
+                  "PHVNUMBER": 267
                 }, 
                 {
                   "PHVRECORD": [
@@ -7172,7 +7264,7 @@
                       "POSITIONOFFSET": 37
                     }
                   ], 
-                  "PHVNUMBER": 296
+                  "PHVNUMBER": 292
                 }, 
                 {
                   "PHVRECORD": [
@@ -7187,7 +7279,7 @@
                       "POSITIONOFFSET": 4
                     }
                   ], 
-                  "PHVNUMBER": 297
+                  "PHVNUMBER": 293
                 }, 
                 {
                   "PHVRECORD": [
@@ -7212,7 +7304,7 @@
                       "POSITIONOFFSET": 56
                     }
                   ], 
-                  "PHVNUMBER": 298
+                  "PHVNUMBER": 294
                 }, 
                 {
                   "PHVRECORD": [
@@ -7237,7 +7329,7 @@
                       "POSITIONOFFSET": 56
                     }
                   ], 
-                  "PHVNUMBER": 299
+                  "PHVNUMBER": 295
                 }, 
                 {
                   "PHVRECORD": [
@@ -7252,7 +7344,7 @@
                       "POSITIONOFFSET": 19
                     }
                   ], 
-                  "PHVNUMBER": 300
+                  "PHVNUMBER": 296
                 }, 
                 {
                   "PHVRECORD": [
@@ -7267,7 +7359,7 @@
                       "POSITIONOFFSET": 63
                     }
                   ], 
-                  "PHVNUMBER": 301
+                  "PHVNUMBER": 297
                 }, 
                 {
                   "PHVRECORD": [
@@ -7282,7 +7374,7 @@
                       "POSITIONOFFSET": 54
                     }
                   ], 
-                  "PHVNUMBER": 332
+                  "PHVNUMBER": 326
                 }, 
                 {
                   "PHVRECORD": [
@@ -7297,7 +7389,7 @@
                       "POSITIONOFFSET": 43
                     }
                   ], 
-                  "PHVNUMBER": 333
+                  "PHVNUMBER": 327
                 }, 
                 {
                   "PHVRECORD": [
@@ -7322,7 +7414,7 @@
                       "POSITIONOFFSET": 5
                     }
                   ], 
-                  "PHVNUMBER": 334
+                  "PHVNUMBER": 328
                 }, 
                 {
                   "PHVRECORD": [
@@ -7335,9 +7427,114 @@
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
                       "POSITIONOFFSET": 32
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_dstPort", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 48
                     }
                   ], 
-                  "PHVNUMBER": 335
+                  "PHVNUMBER": 329
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 16, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 31, 
+                      "PHVNAME": "tcp_seqNo", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 69
+                    }
+                  ], 
+                  "PHVNUMBER": 330
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_seqNo", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 69
+                    }
+                  ], 
+                  "PHVNUMBER": 331
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 6, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "ethernet_dstAddr", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 8, 
+                      "POSITIONOFFSET": 19
+                    }, 
+                    {
+                      "FIELDWIDTH": 6, 
+                      "FIELDLSB": 40, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 47, 
+                      "PHVNAME": "ethernet_srcAddr", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 63
+                    }
+                  ], 
+                  "PHVNUMBER": 332
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "ethernet_etherType", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 39
+                    }
+                  ], 
+                  "PHVNUMBER": 333
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 8, 
+                      "PHVNAME": "packet_out_hdr_egress_port", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 7, 
+                      "POSITIONOFFSET": 0
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 8, 
+                      "PHVNAME": "packet_in_hdr_ingress_port", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 7, 
+                      "POSITIONOFFSET": 30
+                    }
+                  ], 
+                  "PHVNUMBER": 334
                 }, 
                 {
                   "PHVRECORD": [
@@ -7404,111 +7601,6 @@
                     }
                   ], 
                   "PHVNUMBER": 81
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 6, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "ethernet_dstAddr", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 8, 
-                      "POSITIONOFFSET": 19
-                    }, 
-                    {
-                      "FIELDWIDTH": 6, 
-                      "FIELDLSB": 40, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 47, 
-                      "PHVNAME": "ethernet_srcAddr", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 63
-                    }
-                  ], 
-                  "PHVNUMBER": 338
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "ethernet_etherType", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 39
-                    }
-                  ], 
-                  "PHVNUMBER": 339
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 8, 
-                      "PHVNAME": "packet_out_hdr_egress_port", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 7, 
-                      "POSITIONOFFSET": 0
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 8, 
-                      "PHVNAME": "packet_in_hdr_ingress_port", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 7, 
-                      "POSITIONOFFSET": 30
-                    }
-                  ], 
-                  "PHVNUMBER": 340
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 16, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_seqNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 69
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_dstPort", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 48
-                    }
-                  ], 
-                  "PHVNUMBER": 336
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_seqNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 69
-                    }
-                  ], 
-                  "PHVNUMBER": 337
                 }
               ], 
               "TOTALEGRESSPHVS": 26
@@ -7518,7 +7610,7 @@
         }, 
         {
           "TOTALPOVHEADERS": 13, 
-          "TOTALSTAGEPHVS": 59, 
+          "TOTALSTAGEPHVS": 56, 
           "TOTALPHVRECORDS": 95, 
           "Phvs": [
             {
@@ -7598,6 +7690,31 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 31, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_dstPort", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 24, 
+                      "POSITIONOFFSET": 33
+                    }, 
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 23, 
+                      "FIELDMSB": 31, 
+                      "PHVNAME": "tcp_seqNo", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 76
+                    }
+                  ], 
+                  "PHVNUMBER": 3
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 8, 
                       "PHVMSB": 31, 
@@ -7608,7 +7725,7 @@
                       "POSITIONOFFSET": 20
                     }
                   ], 
-                  "PHVNUMBER": 3
+                  "PHVNUMBER": 4
                 }, 
                 {
                   "PHVRECORD": [
@@ -7623,31 +7740,6 @@
                       "POSITIONOFFSET": 70
                     }
                   ], 
-                  "PHVNUMBER": 4
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 31, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_srcPort", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 16, 
-                      "POSITIONOFFSET": 66
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_dstPort", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 55
-                    }
-                  ], 
                   "PHVNUMBER": 5
                 }, 
                 {
@@ -7657,10 +7749,10 @@
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "ecmp_metadata_group_id", 
+                      "PHVNAME": "ethernet_etherType", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 36
+                      "POSITIONOFFSET": 5
                     }
                   ], 
                   "PHVNUMBER": 134
@@ -7693,17 +7785,17 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 16, 
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
                       "PHVMSB": 15, 
-                      "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_ackNo", 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "ecmp_metadata_selector", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 26
+                      "POSITIONOFFSET": 61
                     }
                   ], 
-                  "PHVNUMBER": 324
+                  "PHVNUMBER": 136
                 }, 
                 {
                   "PHVRECORD": [
@@ -7833,6 +7925,31 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_srcPort", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 8, 
+                      "POSITIONOFFSET": 38
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_dstPort", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 33
+                    }
+                  ], 
+                  "PHVNUMBER": 132
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
@@ -7853,21 +7970,6 @@
                       "POSITIONOFFSET": 70
                     }
                   ], 
-                  "PHVNUMBER": 132
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "ethernet_etherType", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 5
-                    }
-                  ], 
                   "PHVNUMBER": 133
                 }, 
                 {
@@ -7898,24 +8000,24 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 8, 
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 0, 
                       "PHVMSB": 7, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_srcPort", 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_seqNo", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
+                      "POSITIONOFFSET": 76
                     }, 
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 8, 
                       "PHVMSB": 7, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "udp_length_", 
+                      "PHVNAME": "udp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 17
+                      "POSITIONOFFSET": 66
                     }
                   ], 
                   "PHVNUMBER": 289
@@ -7925,67 +8027,12 @@
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 0, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "tcp_srcPort", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "udp_length_", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 17
-                    }
-                  ], 
-                  "PHVNUMBER": 290
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 8, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_dstPort", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 33
-                    }
-                  ], 
-                  "PHVNUMBER": 291
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "tcp_dstPort", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 33
-                    }
-                  ], 
-                  "PHVNUMBER": 292
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "ecmp_metadata_selector", 
+                      "PHVNAME": "ecmp_metadata_group_id", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 61
+                      "POSITIONOFFSET": 36
                     }
                   ], 
                   "PHVNUMBER": 135
@@ -8041,6 +8088,26 @@
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
                       "POSITIONOFFSET": 46
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 31, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_length_", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 16, 
+                      "POSITIONOFFSET": 17
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_checksum", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 68
                     }
                   ], 
                   "PHVNUMBER": 257
@@ -8088,6 +8155,31 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_srcPort", 
+                      "CONTAINERWIDTH": 8, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 38
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "udp_srcPort", 
+                      "CONTAINERWIDTH": 8, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 66
+                    }
+                  ], 
+                  "PHVNUMBER": 65
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 40, 
                       "PHVMSB": 7, 
@@ -8098,7 +8190,7 @@
                       "POSITIONOFFSET": 20
                     }
                   ], 
-                  "PHVNUMBER": 65
+                  "PHVNUMBER": 66
                 }, 
                 {
                   "PHVRECORD": [
@@ -8113,7 +8205,7 @@
                       "POSITIONOFFSET": 70
                     }
                   ], 
-                  "PHVNUMBER": 66
+                  "PHVNUMBER": 67
                 }, 
                 {
                   "PHVRECORD": [
@@ -8164,7 +8256,7 @@
                       ]
                     }
                   ], 
-                  "PHVNUMBER": 67
+                  "PHVNUMBER": 68
                 }, 
                 {
                   "PHVRECORD": [
@@ -8179,22 +8271,7 @@
                       "POSITIONOFFSET": 51
                     }
                   ], 
-                  "PHVNUMBER": 68
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_ackNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 26
-                    }
-                  ], 
-                  "PHVNUMBER": 325
+                  "PHVNUMBER": 69
                 }, 
                 {
                   "PHVRECORD": [
@@ -8228,20 +8305,20 @@
                       "FIELDLSB": 16, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_seqNo", 
+                      "PHVNAME": "tcp_ackNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 76
+                      "POSITIONOFFSET": 26
                     }, 
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "udp_checksum", 
+                      "PHVNAME": "udp_dstPort", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 68
+                      "POSITIONOFFSET": 55
                     }
                   ], 
                   "PHVNUMBER": 322
@@ -8253,16 +8330,16 @@
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_seqNo", 
+                      "PHVNAME": "tcp_ackNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 76
+                      "POSITIONOFFSET": 26
                     }
                   ], 
                   "PHVNUMBER": 323
                 }
               ], 
-              "TOTALINGRESSPHVS": 33
+              "TOTALINGRESSPHVS": 30
             }, 
             {
               "PHVDIRECTION": 1, 
@@ -8300,7 +8377,7 @@
                       "POSITIONOFFSET": 9
                     }
                   ], 
-                  "PHVNUMBER": 264
+                  "PHVNUMBER": 260
                 }, 
                 {
                   "PHVRECORD": [
@@ -8315,7 +8392,7 @@
                       "POSITIONOFFSET": 12
                     }
                   ], 
-                  "PHVNUMBER": 265
+                  "PHVNUMBER": 261
                 }, 
                 {
                   "PHVRECORD": [
@@ -8330,7 +8407,7 @@
                       "POSITIONOFFSET": 50
                     }
                   ], 
-                  "PHVNUMBER": 266
+                  "PHVNUMBER": 262
                 }, 
                 {
                   "PHVRECORD": [
@@ -8365,7 +8442,7 @@
                       "POSITIONOFFSET": 59
                     }
                   ], 
-                  "PHVNUMBER": 267
+                  "PHVNUMBER": 263
                 }, 
                 {
                   "PHVRECORD": [
@@ -8420,7 +8497,7 @@
                       "POSITIONOFFSET": 41
                     }
                   ], 
-                  "PHVNUMBER": 268
+                  "PHVNUMBER": 264
                 }, 
                 {
                   "PHVRECORD": [
@@ -8445,7 +8522,7 @@
                       "POSITIONOFFSET": 45
                     }
                   ], 
-                  "PHVNUMBER": 269
+                  "PHVNUMBER": 265
                 }, 
                 {
                   "PHVRECORD": [
@@ -8460,7 +8537,7 @@
                       "POSITIONOFFSET": 19
                     }
                   ], 
-                  "PHVNUMBER": 270
+                  "PHVNUMBER": 266
                 }, 
                 {
                   "PHVRECORD": [
@@ -8475,7 +8552,7 @@
                       "POSITIONOFFSET": 63
                     }
                   ], 
-                  "PHVNUMBER": 271
+                  "PHVNUMBER": 267
                 }, 
                 {
                   "PHVRECORD": [
@@ -8515,7 +8592,7 @@
                       "POSITIONOFFSET": 37
                     }
                   ], 
-                  "PHVNUMBER": 296
+                  "PHVNUMBER": 292
                 }, 
                 {
                   "PHVRECORD": [
@@ -8530,7 +8607,7 @@
                       "POSITIONOFFSET": 4
                     }
                   ], 
-                  "PHVNUMBER": 297
+                  "PHVNUMBER": 293
                 }, 
                 {
                   "PHVRECORD": [
@@ -8555,7 +8632,7 @@
                       "POSITIONOFFSET": 56
                     }
                   ], 
-                  "PHVNUMBER": 298
+                  "PHVNUMBER": 294
                 }, 
                 {
                   "PHVRECORD": [
@@ -8580,7 +8657,7 @@
                       "POSITIONOFFSET": 56
                     }
                   ], 
-                  "PHVNUMBER": 299
+                  "PHVNUMBER": 295
                 }, 
                 {
                   "PHVRECORD": [
@@ -8595,7 +8672,7 @@
                       "POSITIONOFFSET": 19
                     }
                   ], 
-                  "PHVNUMBER": 300
+                  "PHVNUMBER": 296
                 }, 
                 {
                   "PHVRECORD": [
@@ -8610,7 +8687,7 @@
                       "POSITIONOFFSET": 63
                     }
                   ], 
-                  "PHVNUMBER": 301
+                  "PHVNUMBER": 297
                 }, 
                 {
                   "PHVRECORD": [
@@ -8625,7 +8702,7 @@
                       "POSITIONOFFSET": 54
                     }
                   ], 
-                  "PHVNUMBER": 332
+                  "PHVNUMBER": 326
                 }, 
                 {
                   "PHVRECORD": [
@@ -8640,7 +8717,7 @@
                       "POSITIONOFFSET": 43
                     }
                   ], 
-                  "PHVNUMBER": 333
+                  "PHVNUMBER": 327
                 }, 
                 {
                   "PHVRECORD": [
@@ -8665,7 +8742,7 @@
                       "POSITIONOFFSET": 5
                     }
                   ], 
-                  "PHVNUMBER": 334
+                  "PHVNUMBER": 328
                 }, 
                 {
                   "PHVRECORD": [
@@ -8678,9 +8755,114 @@
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
                       "POSITIONOFFSET": 32
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_dstPort", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 48
                     }
                   ], 
-                  "PHVNUMBER": 335
+                  "PHVNUMBER": 329
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 16, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 31, 
+                      "PHVNAME": "tcp_seqNo", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 69
+                    }
+                  ], 
+                  "PHVNUMBER": 330
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_seqNo", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 69
+                    }
+                  ], 
+                  "PHVNUMBER": 331
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 6, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "ethernet_dstAddr", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 8, 
+                      "POSITIONOFFSET": 19
+                    }, 
+                    {
+                      "FIELDWIDTH": 6, 
+                      "FIELDLSB": 40, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 47, 
+                      "PHVNAME": "ethernet_srcAddr", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 63
+                    }
+                  ], 
+                  "PHVNUMBER": 332
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "ethernet_etherType", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 39
+                    }
+                  ], 
+                  "PHVNUMBER": 333
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 8, 
+                      "PHVNAME": "packet_out_hdr_egress_port", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 7, 
+                      "POSITIONOFFSET": 0
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 8, 
+                      "PHVNAME": "packet_in_hdr_ingress_port", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 7, 
+                      "POSITIONOFFSET": 30
+                    }
+                  ], 
+                  "PHVNUMBER": 334
                 }, 
                 {
                   "PHVRECORD": [
@@ -8747,111 +8929,6 @@
                     }
                   ], 
                   "PHVNUMBER": 81
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 6, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "ethernet_dstAddr", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 8, 
-                      "POSITIONOFFSET": 19
-                    }, 
-                    {
-                      "FIELDWIDTH": 6, 
-                      "FIELDLSB": 40, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 47, 
-                      "PHVNAME": "ethernet_srcAddr", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 63
-                    }
-                  ], 
-                  "PHVNUMBER": 338
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "ethernet_etherType", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 39
-                    }
-                  ], 
-                  "PHVNUMBER": 339
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 8, 
-                      "PHVNAME": "packet_out_hdr_egress_port", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 7, 
-                      "POSITIONOFFSET": 0
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 8, 
-                      "PHVNAME": "packet_in_hdr_ingress_port", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 7, 
-                      "POSITIONOFFSET": 30
-                    }
-                  ], 
-                  "PHVNUMBER": 340
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 16, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_seqNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 69
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_dstPort", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 48
-                    }
-                  ], 
-                  "PHVNUMBER": 336
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_seqNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 69
-                    }
-                  ], 
-                  "PHVNUMBER": 337
                 }
               ], 
               "TOTALEGRESSPHVS": 26
@@ -8861,7 +8938,7 @@
         }, 
         {
           "TOTALPOVHEADERS": 13, 
-          "TOTALSTAGEPHVS": 59, 
+          "TOTALSTAGEPHVS": 56, 
           "TOTALPHVRECORDS": 95, 
           "Phvs": [
             {
@@ -8941,6 +9018,31 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 31, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_dstPort", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 24, 
+                      "POSITIONOFFSET": 33
+                    }, 
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 23, 
+                      "FIELDMSB": 31, 
+                      "PHVNAME": "tcp_seqNo", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 76
+                    }
+                  ], 
+                  "PHVNUMBER": 3
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 8, 
                       "PHVMSB": 31, 
@@ -8951,7 +9053,7 @@
                       "POSITIONOFFSET": 20
                     }
                   ], 
-                  "PHVNUMBER": 3
+                  "PHVNUMBER": 4
                 }, 
                 {
                   "PHVRECORD": [
@@ -8966,31 +9068,6 @@
                       "POSITIONOFFSET": 70
                     }
                   ], 
-                  "PHVNUMBER": 4
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 31, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_srcPort", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 16, 
-                      "POSITIONOFFSET": 66
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_dstPort", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 55
-                    }
-                  ], 
                   "PHVNUMBER": 5
                 }, 
                 {
@@ -9000,10 +9077,10 @@
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "ecmp_metadata_group_id", 
+                      "PHVNAME": "ethernet_etherType", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 36
+                      "POSITIONOFFSET": 5
                     }
                   ], 
                   "PHVNUMBER": 134
@@ -9036,17 +9113,17 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 16, 
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
                       "PHVMSB": 15, 
-                      "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_ackNo", 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "ecmp_metadata_selector", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 26
+                      "POSITIONOFFSET": 61
                     }
                   ], 
-                  "PHVNUMBER": 324
+                  "PHVNUMBER": 136
                 }, 
                 {
                   "PHVRECORD": [
@@ -9176,6 +9253,31 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_srcPort", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 8, 
+                      "POSITIONOFFSET": 38
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_dstPort", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 33
+                    }
+                  ], 
+                  "PHVNUMBER": 132
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
@@ -9196,21 +9298,6 @@
                       "POSITIONOFFSET": 70
                     }
                   ], 
-                  "PHVNUMBER": 132
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "ethernet_etherType", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 5
-                    }
-                  ], 
                   "PHVNUMBER": 133
                 }, 
                 {
@@ -9241,24 +9328,24 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 8, 
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 0, 
                       "PHVMSB": 7, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_srcPort", 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_seqNo", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
+                      "POSITIONOFFSET": 76
                     }, 
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 8, 
                       "PHVMSB": 7, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "udp_length_", 
+                      "PHVNAME": "udp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 17
+                      "POSITIONOFFSET": 66
                     }
                   ], 
                   "PHVNUMBER": 289
@@ -9268,67 +9355,12 @@
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 0, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "tcp_srcPort", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "udp_length_", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 17
-                    }
-                  ], 
-                  "PHVNUMBER": 290
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 8, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_dstPort", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 33
-                    }
-                  ], 
-                  "PHVNUMBER": 291
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "tcp_dstPort", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 33
-                    }
-                  ], 
-                  "PHVNUMBER": 292
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "ecmp_metadata_selector", 
+                      "PHVNAME": "ecmp_metadata_group_id", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 61
+                      "POSITIONOFFSET": 36
                     }
                   ], 
                   "PHVNUMBER": 135
@@ -9384,6 +9416,26 @@
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
                       "POSITIONOFFSET": 46
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 31, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_length_", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 16, 
+                      "POSITIONOFFSET": 17
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_checksum", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 68
                     }
                   ], 
                   "PHVNUMBER": 257
@@ -9431,6 +9483,31 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_srcPort", 
+                      "CONTAINERWIDTH": 8, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 38
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "udp_srcPort", 
+                      "CONTAINERWIDTH": 8, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 66
+                    }
+                  ], 
+                  "PHVNUMBER": 65
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 40, 
                       "PHVMSB": 7, 
@@ -9441,7 +9518,7 @@
                       "POSITIONOFFSET": 20
                     }
                   ], 
-                  "PHVNUMBER": 65
+                  "PHVNUMBER": 66
                 }, 
                 {
                   "PHVRECORD": [
@@ -9456,7 +9533,7 @@
                       "POSITIONOFFSET": 70
                     }
                   ], 
-                  "PHVNUMBER": 66
+                  "PHVNUMBER": 67
                 }, 
                 {
                   "PHVRECORD": [
@@ -9507,7 +9584,7 @@
                       ]
                     }
                   ], 
-                  "PHVNUMBER": 67
+                  "PHVNUMBER": 68
                 }, 
                 {
                   "PHVRECORD": [
@@ -9522,22 +9599,7 @@
                       "POSITIONOFFSET": 51
                     }
                   ], 
-                  "PHVNUMBER": 68
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_ackNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 26
-                    }
-                  ], 
-                  "PHVNUMBER": 325
+                  "PHVNUMBER": 69
                 }, 
                 {
                   "PHVRECORD": [
@@ -9571,20 +9633,20 @@
                       "FIELDLSB": 16, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_seqNo", 
+                      "PHVNAME": "tcp_ackNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 76
+                      "POSITIONOFFSET": 26
                     }, 
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "udp_checksum", 
+                      "PHVNAME": "udp_dstPort", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 68
+                      "POSITIONOFFSET": 55
                     }
                   ], 
                   "PHVNUMBER": 322
@@ -9596,16 +9658,16 @@
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_seqNo", 
+                      "PHVNAME": "tcp_ackNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 76
+                      "POSITIONOFFSET": 26
                     }
                   ], 
                   "PHVNUMBER": 323
                 }
               ], 
-              "TOTALINGRESSPHVS": 33
+              "TOTALINGRESSPHVS": 30
             }, 
             {
               "PHVDIRECTION": 1, 
@@ -9643,7 +9705,7 @@
                       "POSITIONOFFSET": 9
                     }
                   ], 
-                  "PHVNUMBER": 264
+                  "PHVNUMBER": 260
                 }, 
                 {
                   "PHVRECORD": [
@@ -9658,7 +9720,7 @@
                       "POSITIONOFFSET": 12
                     }
                   ], 
-                  "PHVNUMBER": 265
+                  "PHVNUMBER": 261
                 }, 
                 {
                   "PHVRECORD": [
@@ -9673,7 +9735,7 @@
                       "POSITIONOFFSET": 50
                     }
                   ], 
-                  "PHVNUMBER": 266
+                  "PHVNUMBER": 262
                 }, 
                 {
                   "PHVRECORD": [
@@ -9708,7 +9770,7 @@
                       "POSITIONOFFSET": 59
                     }
                   ], 
-                  "PHVNUMBER": 267
+                  "PHVNUMBER": 263
                 }, 
                 {
                   "PHVRECORD": [
@@ -9763,7 +9825,7 @@
                       "POSITIONOFFSET": 41
                     }
                   ], 
-                  "PHVNUMBER": 268
+                  "PHVNUMBER": 264
                 }, 
                 {
                   "PHVRECORD": [
@@ -9788,7 +9850,7 @@
                       "POSITIONOFFSET": 45
                     }
                   ], 
-                  "PHVNUMBER": 269
+                  "PHVNUMBER": 265
                 }, 
                 {
                   "PHVRECORD": [
@@ -9803,7 +9865,7 @@
                       "POSITIONOFFSET": 19
                     }
                   ], 
-                  "PHVNUMBER": 270
+                  "PHVNUMBER": 266
                 }, 
                 {
                   "PHVRECORD": [
@@ -9818,7 +9880,7 @@
                       "POSITIONOFFSET": 63
                     }
                   ], 
-                  "PHVNUMBER": 271
+                  "PHVNUMBER": 267
                 }, 
                 {
                   "PHVRECORD": [
@@ -9858,7 +9920,7 @@
                       "POSITIONOFFSET": 37
                     }
                   ], 
-                  "PHVNUMBER": 296
+                  "PHVNUMBER": 292
                 }, 
                 {
                   "PHVRECORD": [
@@ -9873,7 +9935,7 @@
                       "POSITIONOFFSET": 4
                     }
                   ], 
-                  "PHVNUMBER": 297
+                  "PHVNUMBER": 293
                 }, 
                 {
                   "PHVRECORD": [
@@ -9898,7 +9960,7 @@
                       "POSITIONOFFSET": 56
                     }
                   ], 
-                  "PHVNUMBER": 298
+                  "PHVNUMBER": 294
                 }, 
                 {
                   "PHVRECORD": [
@@ -9923,7 +9985,7 @@
                       "POSITIONOFFSET": 56
                     }
                   ], 
-                  "PHVNUMBER": 299
+                  "PHVNUMBER": 295
                 }, 
                 {
                   "PHVRECORD": [
@@ -9938,7 +10000,7 @@
                       "POSITIONOFFSET": 19
                     }
                   ], 
-                  "PHVNUMBER": 300
+                  "PHVNUMBER": 296
                 }, 
                 {
                   "PHVRECORD": [
@@ -9953,7 +10015,7 @@
                       "POSITIONOFFSET": 63
                     }
                   ], 
-                  "PHVNUMBER": 301
+                  "PHVNUMBER": 297
                 }, 
                 {
                   "PHVRECORD": [
@@ -9968,7 +10030,7 @@
                       "POSITIONOFFSET": 54
                     }
                   ], 
-                  "PHVNUMBER": 332
+                  "PHVNUMBER": 326
                 }, 
                 {
                   "PHVRECORD": [
@@ -9983,7 +10045,7 @@
                       "POSITIONOFFSET": 43
                     }
                   ], 
-                  "PHVNUMBER": 333
+                  "PHVNUMBER": 327
                 }, 
                 {
                   "PHVRECORD": [
@@ -10008,7 +10070,7 @@
                       "POSITIONOFFSET": 5
                     }
                   ], 
-                  "PHVNUMBER": 334
+                  "PHVNUMBER": 328
                 }, 
                 {
                   "PHVRECORD": [
@@ -10021,9 +10083,114 @@
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
                       "POSITIONOFFSET": 32
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_dstPort", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 48
                     }
                   ], 
-                  "PHVNUMBER": 335
+                  "PHVNUMBER": 329
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 16, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 31, 
+                      "PHVNAME": "tcp_seqNo", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 69
+                    }
+                  ], 
+                  "PHVNUMBER": 330
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_seqNo", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 69
+                    }
+                  ], 
+                  "PHVNUMBER": 331
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 6, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "ethernet_dstAddr", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 8, 
+                      "POSITIONOFFSET": 19
+                    }, 
+                    {
+                      "FIELDWIDTH": 6, 
+                      "FIELDLSB": 40, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 47, 
+                      "PHVNAME": "ethernet_srcAddr", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 63
+                    }
+                  ], 
+                  "PHVNUMBER": 332
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "ethernet_etherType", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 39
+                    }
+                  ], 
+                  "PHVNUMBER": 333
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 8, 
+                      "PHVNAME": "packet_out_hdr_egress_port", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 7, 
+                      "POSITIONOFFSET": 0
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 8, 
+                      "PHVNAME": "packet_in_hdr_ingress_port", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 7, 
+                      "POSITIONOFFSET": 30
+                    }
+                  ], 
+                  "PHVNUMBER": 334
                 }, 
                 {
                   "PHVRECORD": [
@@ -10090,111 +10257,6 @@
                     }
                   ], 
                   "PHVNUMBER": 81
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 6, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "ethernet_dstAddr", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 8, 
-                      "POSITIONOFFSET": 19
-                    }, 
-                    {
-                      "FIELDWIDTH": 6, 
-                      "FIELDLSB": 40, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 47, 
-                      "PHVNAME": "ethernet_srcAddr", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 63
-                    }
-                  ], 
-                  "PHVNUMBER": 338
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "ethernet_etherType", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 39
-                    }
-                  ], 
-                  "PHVNUMBER": 339
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 8, 
-                      "PHVNAME": "packet_out_hdr_egress_port", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 7, 
-                      "POSITIONOFFSET": 0
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 8, 
-                      "PHVNAME": "packet_in_hdr_ingress_port", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 7, 
-                      "POSITIONOFFSET": 30
-                    }
-                  ], 
-                  "PHVNUMBER": 340
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 16, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_seqNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 69
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_dstPort", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 48
-                    }
-                  ], 
-                  "PHVNUMBER": 336
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_seqNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 69
-                    }
-                  ], 
-                  "PHVNUMBER": 337
                 }
               ], 
               "TOTALEGRESSPHVS": 26
@@ -10204,7 +10266,7 @@
         }, 
         {
           "TOTALPOVHEADERS": 13, 
-          "TOTALSTAGEPHVS": 59, 
+          "TOTALSTAGEPHVS": 56, 
           "TOTALPHVRECORDS": 95, 
           "Phvs": [
             {
@@ -10284,6 +10346,31 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 31, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_dstPort", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 24, 
+                      "POSITIONOFFSET": 33
+                    }, 
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 23, 
+                      "FIELDMSB": 31, 
+                      "PHVNAME": "tcp_seqNo", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 76
+                    }
+                  ], 
+                  "PHVNUMBER": 3
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 8, 
                       "PHVMSB": 31, 
@@ -10294,7 +10381,7 @@
                       "POSITIONOFFSET": 20
                     }
                   ], 
-                  "PHVNUMBER": 3
+                  "PHVNUMBER": 4
                 }, 
                 {
                   "PHVRECORD": [
@@ -10309,31 +10396,6 @@
                       "POSITIONOFFSET": 70
                     }
                   ], 
-                  "PHVNUMBER": 4
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 31, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_srcPort", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 16, 
-                      "POSITIONOFFSET": 66
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_dstPort", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 55
-                    }
-                  ], 
                   "PHVNUMBER": 5
                 }, 
                 {
@@ -10343,10 +10405,10 @@
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "ecmp_metadata_group_id", 
+                      "PHVNAME": "ethernet_etherType", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 36
+                      "POSITIONOFFSET": 5
                     }
                   ], 
                   "PHVNUMBER": 134
@@ -10379,17 +10441,17 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 16, 
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
                       "PHVMSB": 15, 
-                      "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_ackNo", 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "ecmp_metadata_selector", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 26
+                      "POSITIONOFFSET": 61
                     }
                   ], 
-                  "PHVNUMBER": 324
+                  "PHVNUMBER": 136
                 }, 
                 {
                   "PHVRECORD": [
@@ -10519,6 +10581,31 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_srcPort", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 8, 
+                      "POSITIONOFFSET": 38
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_dstPort", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 33
+                    }
+                  ], 
+                  "PHVNUMBER": 132
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
@@ -10539,21 +10626,6 @@
                       "POSITIONOFFSET": 70
                     }
                   ], 
-                  "PHVNUMBER": 132
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "ethernet_etherType", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 5
-                    }
-                  ], 
                   "PHVNUMBER": 133
                 }, 
                 {
@@ -10584,24 +10656,24 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 8, 
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 0, 
                       "PHVMSB": 7, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_srcPort", 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_seqNo", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
+                      "POSITIONOFFSET": 76
                     }, 
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 8, 
                       "PHVMSB": 7, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "udp_length_", 
+                      "PHVNAME": "udp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 17
+                      "POSITIONOFFSET": 66
                     }
                   ], 
                   "PHVNUMBER": 289
@@ -10611,67 +10683,12 @@
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 0, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "tcp_srcPort", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "udp_length_", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 17
-                    }
-                  ], 
-                  "PHVNUMBER": 290
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 8, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_dstPort", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 33
-                    }
-                  ], 
-                  "PHVNUMBER": 291
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "tcp_dstPort", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 33
-                    }
-                  ], 
-                  "PHVNUMBER": 292
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "ecmp_metadata_selector", 
+                      "PHVNAME": "ecmp_metadata_group_id", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 61
+                      "POSITIONOFFSET": 36
                     }
                   ], 
                   "PHVNUMBER": 135
@@ -10727,6 +10744,26 @@
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
                       "POSITIONOFFSET": 46
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 31, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_length_", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 16, 
+                      "POSITIONOFFSET": 17
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_checksum", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 68
                     }
                   ], 
                   "PHVNUMBER": 257
@@ -10774,6 +10811,31 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_srcPort", 
+                      "CONTAINERWIDTH": 8, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 38
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "udp_srcPort", 
+                      "CONTAINERWIDTH": 8, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 66
+                    }
+                  ], 
+                  "PHVNUMBER": 65
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 40, 
                       "PHVMSB": 7, 
@@ -10784,7 +10846,7 @@
                       "POSITIONOFFSET": 20
                     }
                   ], 
-                  "PHVNUMBER": 65
+                  "PHVNUMBER": 66
                 }, 
                 {
                   "PHVRECORD": [
@@ -10799,7 +10861,7 @@
                       "POSITIONOFFSET": 70
                     }
                   ], 
-                  "PHVNUMBER": 66
+                  "PHVNUMBER": 67
                 }, 
                 {
                   "PHVRECORD": [
@@ -10850,7 +10912,7 @@
                       ]
                     }
                   ], 
-                  "PHVNUMBER": 67
+                  "PHVNUMBER": 68
                 }, 
                 {
                   "PHVRECORD": [
@@ -10865,22 +10927,7 @@
                       "POSITIONOFFSET": 51
                     }
                   ], 
-                  "PHVNUMBER": 68
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_ackNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 26
-                    }
-                  ], 
-                  "PHVNUMBER": 325
+                  "PHVNUMBER": 69
                 }, 
                 {
                   "PHVRECORD": [
@@ -10914,20 +10961,20 @@
                       "FIELDLSB": 16, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_seqNo", 
+                      "PHVNAME": "tcp_ackNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 76
+                      "POSITIONOFFSET": 26
                     }, 
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "udp_checksum", 
+                      "PHVNAME": "udp_dstPort", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 68
+                      "POSITIONOFFSET": 55
                     }
                   ], 
                   "PHVNUMBER": 322
@@ -10939,16 +10986,16 @@
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_seqNo", 
+                      "PHVNAME": "tcp_ackNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 76
+                      "POSITIONOFFSET": 26
                     }
                   ], 
                   "PHVNUMBER": 323
                 }
               ], 
-              "TOTALINGRESSPHVS": 33
+              "TOTALINGRESSPHVS": 30
             }, 
             {
               "PHVDIRECTION": 1, 
@@ -10986,7 +11033,7 @@
                       "POSITIONOFFSET": 9
                     }
                   ], 
-                  "PHVNUMBER": 264
+                  "PHVNUMBER": 260
                 }, 
                 {
                   "PHVRECORD": [
@@ -11001,7 +11048,7 @@
                       "POSITIONOFFSET": 12
                     }
                   ], 
-                  "PHVNUMBER": 265
+                  "PHVNUMBER": 261
                 }, 
                 {
                   "PHVRECORD": [
@@ -11016,7 +11063,7 @@
                       "POSITIONOFFSET": 50
                     }
                   ], 
-                  "PHVNUMBER": 266
+                  "PHVNUMBER": 262
                 }, 
                 {
                   "PHVRECORD": [
@@ -11051,7 +11098,7 @@
                       "POSITIONOFFSET": 59
                     }
                   ], 
-                  "PHVNUMBER": 267
+                  "PHVNUMBER": 263
                 }, 
                 {
                   "PHVRECORD": [
@@ -11106,7 +11153,7 @@
                       "POSITIONOFFSET": 41
                     }
                   ], 
-                  "PHVNUMBER": 268
+                  "PHVNUMBER": 264
                 }, 
                 {
                   "PHVRECORD": [
@@ -11131,7 +11178,7 @@
                       "POSITIONOFFSET": 45
                     }
                   ], 
-                  "PHVNUMBER": 269
+                  "PHVNUMBER": 265
                 }, 
                 {
                   "PHVRECORD": [
@@ -11146,7 +11193,7 @@
                       "POSITIONOFFSET": 19
                     }
                   ], 
-                  "PHVNUMBER": 270
+                  "PHVNUMBER": 266
                 }, 
                 {
                   "PHVRECORD": [
@@ -11161,7 +11208,7 @@
                       "POSITIONOFFSET": 63
                     }
                   ], 
-                  "PHVNUMBER": 271
+                  "PHVNUMBER": 267
                 }, 
                 {
                   "PHVRECORD": [
@@ -11201,7 +11248,7 @@
                       "POSITIONOFFSET": 37
                     }
                   ], 
-                  "PHVNUMBER": 296
+                  "PHVNUMBER": 292
                 }, 
                 {
                   "PHVRECORD": [
@@ -11216,7 +11263,7 @@
                       "POSITIONOFFSET": 4
                     }
                   ], 
-                  "PHVNUMBER": 297
+                  "PHVNUMBER": 293
                 }, 
                 {
                   "PHVRECORD": [
@@ -11241,7 +11288,7 @@
                       "POSITIONOFFSET": 56
                     }
                   ], 
-                  "PHVNUMBER": 298
+                  "PHVNUMBER": 294
                 }, 
                 {
                   "PHVRECORD": [
@@ -11266,7 +11313,7 @@
                       "POSITIONOFFSET": 56
                     }
                   ], 
-                  "PHVNUMBER": 299
+                  "PHVNUMBER": 295
                 }, 
                 {
                   "PHVRECORD": [
@@ -11281,7 +11328,7 @@
                       "POSITIONOFFSET": 19
                     }
                   ], 
-                  "PHVNUMBER": 300
+                  "PHVNUMBER": 296
                 }, 
                 {
                   "PHVRECORD": [
@@ -11296,7 +11343,7 @@
                       "POSITIONOFFSET": 63
                     }
                   ], 
-                  "PHVNUMBER": 301
+                  "PHVNUMBER": 297
                 }, 
                 {
                   "PHVRECORD": [
@@ -11311,7 +11358,7 @@
                       "POSITIONOFFSET": 54
                     }
                   ], 
-                  "PHVNUMBER": 332
+                  "PHVNUMBER": 326
                 }, 
                 {
                   "PHVRECORD": [
@@ -11326,7 +11373,7 @@
                       "POSITIONOFFSET": 43
                     }
                   ], 
-                  "PHVNUMBER": 333
+                  "PHVNUMBER": 327
                 }, 
                 {
                   "PHVRECORD": [
@@ -11351,7 +11398,7 @@
                       "POSITIONOFFSET": 5
                     }
                   ], 
-                  "PHVNUMBER": 334
+                  "PHVNUMBER": 328
                 }, 
                 {
                   "PHVRECORD": [
@@ -11364,9 +11411,114 @@
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
                       "POSITIONOFFSET": 32
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_dstPort", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 48
                     }
                   ], 
-                  "PHVNUMBER": 335
+                  "PHVNUMBER": 329
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 16, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 31, 
+                      "PHVNAME": "tcp_seqNo", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 69
+                    }
+                  ], 
+                  "PHVNUMBER": 330
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_seqNo", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 69
+                    }
+                  ], 
+                  "PHVNUMBER": 331
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 6, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "ethernet_dstAddr", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 8, 
+                      "POSITIONOFFSET": 19
+                    }, 
+                    {
+                      "FIELDWIDTH": 6, 
+                      "FIELDLSB": 40, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 47, 
+                      "PHVNAME": "ethernet_srcAddr", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 63
+                    }
+                  ], 
+                  "PHVNUMBER": 332
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "ethernet_etherType", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 39
+                    }
+                  ], 
+                  "PHVNUMBER": 333
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 8, 
+                      "PHVNAME": "packet_out_hdr_egress_port", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 7, 
+                      "POSITIONOFFSET": 0
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 8, 
+                      "PHVNAME": "packet_in_hdr_ingress_port", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 7, 
+                      "POSITIONOFFSET": 30
+                    }
+                  ], 
+                  "PHVNUMBER": 334
                 }, 
                 {
                   "PHVRECORD": [
@@ -11433,111 +11585,6 @@
                     }
                   ], 
                   "PHVNUMBER": 81
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 6, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "ethernet_dstAddr", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 8, 
-                      "POSITIONOFFSET": 19
-                    }, 
-                    {
-                      "FIELDWIDTH": 6, 
-                      "FIELDLSB": 40, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 47, 
-                      "PHVNAME": "ethernet_srcAddr", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 63
-                    }
-                  ], 
-                  "PHVNUMBER": 338
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "ethernet_etherType", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 39
-                    }
-                  ], 
-                  "PHVNUMBER": 339
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 8, 
-                      "PHVNAME": "packet_out_hdr_egress_port", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 7, 
-                      "POSITIONOFFSET": 0
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 8, 
-                      "PHVNAME": "packet_in_hdr_ingress_port", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 7, 
-                      "POSITIONOFFSET": 30
-                    }
-                  ], 
-                  "PHVNUMBER": 340
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 16, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_seqNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 69
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_dstPort", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 48
-                    }
-                  ], 
-                  "PHVNUMBER": 336
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_seqNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 69
-                    }
-                  ], 
-                  "PHVNUMBER": 337
                 }
               ], 
               "TOTALEGRESSPHVS": 26
@@ -11547,7 +11594,7 @@
         }, 
         {
           "TOTALPOVHEADERS": 13, 
-          "TOTALSTAGEPHVS": 59, 
+          "TOTALSTAGEPHVS": 56, 
           "TOTALPHVRECORDS": 95, 
           "Phvs": [
             {
@@ -11627,6 +11674,31 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 31, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_dstPort", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 24, 
+                      "POSITIONOFFSET": 33
+                    }, 
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 23, 
+                      "FIELDMSB": 31, 
+                      "PHVNAME": "tcp_seqNo", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 76
+                    }
+                  ], 
+                  "PHVNUMBER": 3
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 8, 
                       "PHVMSB": 31, 
@@ -11637,7 +11709,7 @@
                       "POSITIONOFFSET": 20
                     }
                   ], 
-                  "PHVNUMBER": 3
+                  "PHVNUMBER": 4
                 }, 
                 {
                   "PHVRECORD": [
@@ -11652,31 +11724,6 @@
                       "POSITIONOFFSET": 70
                     }
                   ], 
-                  "PHVNUMBER": 4
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 31, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_srcPort", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 16, 
-                      "POSITIONOFFSET": 66
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_dstPort", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 55
-                    }
-                  ], 
                   "PHVNUMBER": 5
                 }, 
                 {
@@ -11686,10 +11733,10 @@
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "ecmp_metadata_group_id", 
+                      "PHVNAME": "ethernet_etherType", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 36
+                      "POSITIONOFFSET": 5
                     }
                   ], 
                   "PHVNUMBER": 134
@@ -11722,17 +11769,17 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 16, 
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
                       "PHVMSB": 15, 
-                      "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_ackNo", 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "ecmp_metadata_selector", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 26
+                      "POSITIONOFFSET": 61
                     }
                   ], 
-                  "PHVNUMBER": 324
+                  "PHVNUMBER": 136
                 }, 
                 {
                   "PHVRECORD": [
@@ -11862,6 +11909,31 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_srcPort", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 8, 
+                      "POSITIONOFFSET": 38
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_dstPort", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 33
+                    }
+                  ], 
+                  "PHVNUMBER": 132
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
@@ -11882,21 +11954,6 @@
                       "POSITIONOFFSET": 70
                     }
                   ], 
-                  "PHVNUMBER": 132
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "ethernet_etherType", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 5
-                    }
-                  ], 
                   "PHVNUMBER": 133
                 }, 
                 {
@@ -11927,24 +11984,24 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 8, 
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 0, 
                       "PHVMSB": 7, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_srcPort", 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_seqNo", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
+                      "POSITIONOFFSET": 76
                     }, 
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 8, 
                       "PHVMSB": 7, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "udp_length_", 
+                      "PHVNAME": "udp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 17
+                      "POSITIONOFFSET": 66
                     }
                   ], 
                   "PHVNUMBER": 289
@@ -11954,67 +12011,12 @@
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 0, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "tcp_srcPort", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "udp_length_", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 17
-                    }
-                  ], 
-                  "PHVNUMBER": 290
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 8, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_dstPort", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 33
-                    }
-                  ], 
-                  "PHVNUMBER": 291
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "tcp_dstPort", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 33
-                    }
-                  ], 
-                  "PHVNUMBER": 292
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "ecmp_metadata_selector", 
+                      "PHVNAME": "ecmp_metadata_group_id", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 61
+                      "POSITIONOFFSET": 36
                     }
                   ], 
                   "PHVNUMBER": 135
@@ -12070,6 +12072,26 @@
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
                       "POSITIONOFFSET": 46
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 31, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_length_", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 16, 
+                      "POSITIONOFFSET": 17
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_checksum", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 68
                     }
                   ], 
                   "PHVNUMBER": 257
@@ -12117,6 +12139,31 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_srcPort", 
+                      "CONTAINERWIDTH": 8, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 38
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "udp_srcPort", 
+                      "CONTAINERWIDTH": 8, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 66
+                    }
+                  ], 
+                  "PHVNUMBER": 65
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 40, 
                       "PHVMSB": 7, 
@@ -12127,7 +12174,7 @@
                       "POSITIONOFFSET": 20
                     }
                   ], 
-                  "PHVNUMBER": 65
+                  "PHVNUMBER": 66
                 }, 
                 {
                   "PHVRECORD": [
@@ -12142,7 +12189,7 @@
                       "POSITIONOFFSET": 70
                     }
                   ], 
-                  "PHVNUMBER": 66
+                  "PHVNUMBER": 67
                 }, 
                 {
                   "PHVRECORD": [
@@ -12193,7 +12240,7 @@
                       ]
                     }
                   ], 
-                  "PHVNUMBER": 67
+                  "PHVNUMBER": 68
                 }, 
                 {
                   "PHVRECORD": [
@@ -12208,22 +12255,7 @@
                       "POSITIONOFFSET": 51
                     }
                   ], 
-                  "PHVNUMBER": 68
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_ackNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 26
-                    }
-                  ], 
-                  "PHVNUMBER": 325
+                  "PHVNUMBER": 69
                 }, 
                 {
                   "PHVRECORD": [
@@ -12257,20 +12289,20 @@
                       "FIELDLSB": 16, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_seqNo", 
+                      "PHVNAME": "tcp_ackNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 76
+                      "POSITIONOFFSET": 26
                     }, 
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "udp_checksum", 
+                      "PHVNAME": "udp_dstPort", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 68
+                      "POSITIONOFFSET": 55
                     }
                   ], 
                   "PHVNUMBER": 322
@@ -12282,16 +12314,16 @@
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_seqNo", 
+                      "PHVNAME": "tcp_ackNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 76
+                      "POSITIONOFFSET": 26
                     }
                   ], 
                   "PHVNUMBER": 323
                 }
               ], 
-              "TOTALINGRESSPHVS": 33
+              "TOTALINGRESSPHVS": 30
             }, 
             {
               "PHVDIRECTION": 1, 
@@ -12329,7 +12361,7 @@
                       "POSITIONOFFSET": 9
                     }
                   ], 
-                  "PHVNUMBER": 264
+                  "PHVNUMBER": 260
                 }, 
                 {
                   "PHVRECORD": [
@@ -12344,7 +12376,7 @@
                       "POSITIONOFFSET": 12
                     }
                   ], 
-                  "PHVNUMBER": 265
+                  "PHVNUMBER": 261
                 }, 
                 {
                   "PHVRECORD": [
@@ -12359,7 +12391,7 @@
                       "POSITIONOFFSET": 50
                     }
                   ], 
-                  "PHVNUMBER": 266
+                  "PHVNUMBER": 262
                 }, 
                 {
                   "PHVRECORD": [
@@ -12394,7 +12426,7 @@
                       "POSITIONOFFSET": 59
                     }
                   ], 
-                  "PHVNUMBER": 267
+                  "PHVNUMBER": 263
                 }, 
                 {
                   "PHVRECORD": [
@@ -12449,7 +12481,7 @@
                       "POSITIONOFFSET": 41
                     }
                   ], 
-                  "PHVNUMBER": 268
+                  "PHVNUMBER": 264
                 }, 
                 {
                   "PHVRECORD": [
@@ -12474,7 +12506,7 @@
                       "POSITIONOFFSET": 45
                     }
                   ], 
-                  "PHVNUMBER": 269
+                  "PHVNUMBER": 265
                 }, 
                 {
                   "PHVRECORD": [
@@ -12489,7 +12521,7 @@
                       "POSITIONOFFSET": 19
                     }
                   ], 
-                  "PHVNUMBER": 270
+                  "PHVNUMBER": 266
                 }, 
                 {
                   "PHVRECORD": [
@@ -12504,7 +12536,7 @@
                       "POSITIONOFFSET": 63
                     }
                   ], 
-                  "PHVNUMBER": 271
+                  "PHVNUMBER": 267
                 }, 
                 {
                   "PHVRECORD": [
@@ -12544,7 +12576,7 @@
                       "POSITIONOFFSET": 37
                     }
                   ], 
-                  "PHVNUMBER": 296
+                  "PHVNUMBER": 292
                 }, 
                 {
                   "PHVRECORD": [
@@ -12559,7 +12591,7 @@
                       "POSITIONOFFSET": 4
                     }
                   ], 
-                  "PHVNUMBER": 297
+                  "PHVNUMBER": 293
                 }, 
                 {
                   "PHVRECORD": [
@@ -12584,7 +12616,7 @@
                       "POSITIONOFFSET": 56
                     }
                   ], 
-                  "PHVNUMBER": 298
+                  "PHVNUMBER": 294
                 }, 
                 {
                   "PHVRECORD": [
@@ -12609,7 +12641,7 @@
                       "POSITIONOFFSET": 56
                     }
                   ], 
-                  "PHVNUMBER": 299
+                  "PHVNUMBER": 295
                 }, 
                 {
                   "PHVRECORD": [
@@ -12624,7 +12656,7 @@
                       "POSITIONOFFSET": 19
                     }
                   ], 
-                  "PHVNUMBER": 300
+                  "PHVNUMBER": 296
                 }, 
                 {
                   "PHVRECORD": [
@@ -12639,7 +12671,7 @@
                       "POSITIONOFFSET": 63
                     }
                   ], 
-                  "PHVNUMBER": 301
+                  "PHVNUMBER": 297
                 }, 
                 {
                   "PHVRECORD": [
@@ -12654,7 +12686,7 @@
                       "POSITIONOFFSET": 54
                     }
                   ], 
-                  "PHVNUMBER": 332
+                  "PHVNUMBER": 326
                 }, 
                 {
                   "PHVRECORD": [
@@ -12669,7 +12701,7 @@
                       "POSITIONOFFSET": 43
                     }
                   ], 
-                  "PHVNUMBER": 333
+                  "PHVNUMBER": 327
                 }, 
                 {
                   "PHVRECORD": [
@@ -12694,7 +12726,7 @@
                       "POSITIONOFFSET": 5
                     }
                   ], 
-                  "PHVNUMBER": 334
+                  "PHVNUMBER": 328
                 }, 
                 {
                   "PHVRECORD": [
@@ -12707,9 +12739,114 @@
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
                       "POSITIONOFFSET": 32
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_dstPort", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 48
                     }
                   ], 
-                  "PHVNUMBER": 335
+                  "PHVNUMBER": 329
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 16, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 31, 
+                      "PHVNAME": "tcp_seqNo", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 69
+                    }
+                  ], 
+                  "PHVNUMBER": 330
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_seqNo", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 69
+                    }
+                  ], 
+                  "PHVNUMBER": 331
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 6, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "ethernet_dstAddr", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 8, 
+                      "POSITIONOFFSET": 19
+                    }, 
+                    {
+                      "FIELDWIDTH": 6, 
+                      "FIELDLSB": 40, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 47, 
+                      "PHVNAME": "ethernet_srcAddr", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 63
+                    }
+                  ], 
+                  "PHVNUMBER": 332
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "ethernet_etherType", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 39
+                    }
+                  ], 
+                  "PHVNUMBER": 333
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 8, 
+                      "PHVNAME": "packet_out_hdr_egress_port", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 7, 
+                      "POSITIONOFFSET": 0
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 8, 
+                      "PHVNAME": "packet_in_hdr_ingress_port", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 7, 
+                      "POSITIONOFFSET": 30
+                    }
+                  ], 
+                  "PHVNUMBER": 334
                 }, 
                 {
                   "PHVRECORD": [
@@ -12776,111 +12913,6 @@
                     }
                   ], 
                   "PHVNUMBER": 81
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 6, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "ethernet_dstAddr", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 8, 
-                      "POSITIONOFFSET": 19
-                    }, 
-                    {
-                      "FIELDWIDTH": 6, 
-                      "FIELDLSB": 40, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 47, 
-                      "PHVNAME": "ethernet_srcAddr", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 63
-                    }
-                  ], 
-                  "PHVNUMBER": 338
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "ethernet_etherType", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 39
-                    }
-                  ], 
-                  "PHVNUMBER": 339
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 8, 
-                      "PHVNAME": "packet_out_hdr_egress_port", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 7, 
-                      "POSITIONOFFSET": 0
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 8, 
-                      "PHVNAME": "packet_in_hdr_ingress_port", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 7, 
-                      "POSITIONOFFSET": 30
-                    }
-                  ], 
-                  "PHVNUMBER": 340
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 16, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_seqNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 69
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_dstPort", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 48
-                    }
-                  ], 
-                  "PHVNUMBER": 336
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_seqNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 69
-                    }
-                  ], 
-                  "PHVNUMBER": 337
                 }
               ], 
               "TOTALEGRESSPHVS": 26
@@ -12890,7 +12922,7 @@
         }, 
         {
           "TOTALPOVHEADERS": 13, 
-          "TOTALSTAGEPHVS": 59, 
+          "TOTALSTAGEPHVS": 56, 
           "TOTALPHVRECORDS": 95, 
           "Phvs": [
             {
@@ -12970,6 +13002,31 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 31, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_dstPort", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 24, 
+                      "POSITIONOFFSET": 33
+                    }, 
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 23, 
+                      "FIELDMSB": 31, 
+                      "PHVNAME": "tcp_seqNo", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 76
+                    }
+                  ], 
+                  "PHVNUMBER": 3
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 8, 
                       "PHVMSB": 31, 
@@ -12980,7 +13037,7 @@
                       "POSITIONOFFSET": 20
                     }
                   ], 
-                  "PHVNUMBER": 3
+                  "PHVNUMBER": 4
                 }, 
                 {
                   "PHVRECORD": [
@@ -12995,31 +13052,6 @@
                       "POSITIONOFFSET": 70
                     }
                   ], 
-                  "PHVNUMBER": 4
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 31, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_srcPort", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 16, 
-                      "POSITIONOFFSET": 66
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_dstPort", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 55
-                    }
-                  ], 
                   "PHVNUMBER": 5
                 }, 
                 {
@@ -13029,10 +13061,10 @@
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "ecmp_metadata_group_id", 
+                      "PHVNAME": "ethernet_etherType", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 36
+                      "POSITIONOFFSET": 5
                     }
                   ], 
                   "PHVNUMBER": 134
@@ -13065,17 +13097,17 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 16, 
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
                       "PHVMSB": 15, 
-                      "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_ackNo", 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "ecmp_metadata_selector", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 26
+                      "POSITIONOFFSET": 61
                     }
                   ], 
-                  "PHVNUMBER": 324
+                  "PHVNUMBER": 136
                 }, 
                 {
                   "PHVRECORD": [
@@ -13205,6 +13237,31 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_srcPort", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 8, 
+                      "POSITIONOFFSET": 38
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_dstPort", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 33
+                    }
+                  ], 
+                  "PHVNUMBER": 132
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
@@ -13225,21 +13282,6 @@
                       "POSITIONOFFSET": 70
                     }
                   ], 
-                  "PHVNUMBER": 132
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "ethernet_etherType", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 5
-                    }
-                  ], 
                   "PHVNUMBER": 133
                 }, 
                 {
@@ -13270,24 +13312,24 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 8, 
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 0, 
                       "PHVMSB": 7, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_srcPort", 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_seqNo", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
+                      "POSITIONOFFSET": 76
                     }, 
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 8, 
                       "PHVMSB": 7, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "udp_length_", 
+                      "PHVNAME": "udp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 17
+                      "POSITIONOFFSET": 66
                     }
                   ], 
                   "PHVNUMBER": 289
@@ -13297,67 +13339,12 @@
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 0, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "tcp_srcPort", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "udp_length_", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 17
-                    }
-                  ], 
-                  "PHVNUMBER": 290
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 8, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_dstPort", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 33
-                    }
-                  ], 
-                  "PHVNUMBER": 291
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "tcp_dstPort", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 33
-                    }
-                  ], 
-                  "PHVNUMBER": 292
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "ecmp_metadata_selector", 
+                      "PHVNAME": "ecmp_metadata_group_id", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 61
+                      "POSITIONOFFSET": 36
                     }
                   ], 
                   "PHVNUMBER": 135
@@ -13413,6 +13400,26 @@
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
                       "POSITIONOFFSET": 46
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 31, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_length_", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 16, 
+                      "POSITIONOFFSET": 17
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_checksum", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 68
                     }
                   ], 
                   "PHVNUMBER": 257
@@ -13460,6 +13467,31 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_srcPort", 
+                      "CONTAINERWIDTH": 8, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 38
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "udp_srcPort", 
+                      "CONTAINERWIDTH": 8, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 66
+                    }
+                  ], 
+                  "PHVNUMBER": 65
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 40, 
                       "PHVMSB": 7, 
@@ -13470,7 +13502,7 @@
                       "POSITIONOFFSET": 20
                     }
                   ], 
-                  "PHVNUMBER": 65
+                  "PHVNUMBER": 66
                 }, 
                 {
                   "PHVRECORD": [
@@ -13485,7 +13517,7 @@
                       "POSITIONOFFSET": 70
                     }
                   ], 
-                  "PHVNUMBER": 66
+                  "PHVNUMBER": 67
                 }, 
                 {
                   "PHVRECORD": [
@@ -13536,7 +13568,7 @@
                       ]
                     }
                   ], 
-                  "PHVNUMBER": 67
+                  "PHVNUMBER": 68
                 }, 
                 {
                   "PHVRECORD": [
@@ -13551,22 +13583,7 @@
                       "POSITIONOFFSET": 51
                     }
                   ], 
-                  "PHVNUMBER": 68
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_ackNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 26
-                    }
-                  ], 
-                  "PHVNUMBER": 325
+                  "PHVNUMBER": 69
                 }, 
                 {
                   "PHVRECORD": [
@@ -13600,20 +13617,20 @@
                       "FIELDLSB": 16, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_seqNo", 
+                      "PHVNAME": "tcp_ackNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 76
+                      "POSITIONOFFSET": 26
                     }, 
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "udp_checksum", 
+                      "PHVNAME": "udp_dstPort", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 68
+                      "POSITIONOFFSET": 55
                     }
                   ], 
                   "PHVNUMBER": 322
@@ -13625,16 +13642,16 @@
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_seqNo", 
+                      "PHVNAME": "tcp_ackNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 76
+                      "POSITIONOFFSET": 26
                     }
                   ], 
                   "PHVNUMBER": 323
                 }
               ], 
-              "TOTALINGRESSPHVS": 33
+              "TOTALINGRESSPHVS": 30
             }, 
             {
               "PHVDIRECTION": 1, 
@@ -13672,7 +13689,7 @@
                       "POSITIONOFFSET": 9
                     }
                   ], 
-                  "PHVNUMBER": 264
+                  "PHVNUMBER": 260
                 }, 
                 {
                   "PHVRECORD": [
@@ -13687,7 +13704,7 @@
                       "POSITIONOFFSET": 12
                     }
                   ], 
-                  "PHVNUMBER": 265
+                  "PHVNUMBER": 261
                 }, 
                 {
                   "PHVRECORD": [
@@ -13702,7 +13719,7 @@
                       "POSITIONOFFSET": 50
                     }
                   ], 
-                  "PHVNUMBER": 266
+                  "PHVNUMBER": 262
                 }, 
                 {
                   "PHVRECORD": [
@@ -13737,7 +13754,7 @@
                       "POSITIONOFFSET": 59
                     }
                   ], 
-                  "PHVNUMBER": 267
+                  "PHVNUMBER": 263
                 }, 
                 {
                   "PHVRECORD": [
@@ -13792,7 +13809,7 @@
                       "POSITIONOFFSET": 41
                     }
                   ], 
-                  "PHVNUMBER": 268
+                  "PHVNUMBER": 264
                 }, 
                 {
                   "PHVRECORD": [
@@ -13817,7 +13834,7 @@
                       "POSITIONOFFSET": 45
                     }
                   ], 
-                  "PHVNUMBER": 269
+                  "PHVNUMBER": 265
                 }, 
                 {
                   "PHVRECORD": [
@@ -13832,7 +13849,7 @@
                       "POSITIONOFFSET": 19
                     }
                   ], 
-                  "PHVNUMBER": 270
+                  "PHVNUMBER": 266
                 }, 
                 {
                   "PHVRECORD": [
@@ -13847,7 +13864,7 @@
                       "POSITIONOFFSET": 63
                     }
                   ], 
-                  "PHVNUMBER": 271
+                  "PHVNUMBER": 267
                 }, 
                 {
                   "PHVRECORD": [
@@ -13887,7 +13904,7 @@
                       "POSITIONOFFSET": 37
                     }
                   ], 
-                  "PHVNUMBER": 296
+                  "PHVNUMBER": 292
                 }, 
                 {
                   "PHVRECORD": [
@@ -13902,7 +13919,7 @@
                       "POSITIONOFFSET": 4
                     }
                   ], 
-                  "PHVNUMBER": 297
+                  "PHVNUMBER": 293
                 }, 
                 {
                   "PHVRECORD": [
@@ -13927,7 +13944,7 @@
                       "POSITIONOFFSET": 56
                     }
                   ], 
-                  "PHVNUMBER": 298
+                  "PHVNUMBER": 294
                 }, 
                 {
                   "PHVRECORD": [
@@ -13952,7 +13969,7 @@
                       "POSITIONOFFSET": 56
                     }
                   ], 
-                  "PHVNUMBER": 299
+                  "PHVNUMBER": 295
                 }, 
                 {
                   "PHVRECORD": [
@@ -13967,7 +13984,7 @@
                       "POSITIONOFFSET": 19
                     }
                   ], 
-                  "PHVNUMBER": 300
+                  "PHVNUMBER": 296
                 }, 
                 {
                   "PHVRECORD": [
@@ -13982,7 +13999,7 @@
                       "POSITIONOFFSET": 63
                     }
                   ], 
-                  "PHVNUMBER": 301
+                  "PHVNUMBER": 297
                 }, 
                 {
                   "PHVRECORD": [
@@ -13997,7 +14014,7 @@
                       "POSITIONOFFSET": 54
                     }
                   ], 
-                  "PHVNUMBER": 332
+                  "PHVNUMBER": 326
                 }, 
                 {
                   "PHVRECORD": [
@@ -14012,7 +14029,7 @@
                       "POSITIONOFFSET": 43
                     }
                   ], 
-                  "PHVNUMBER": 333
+                  "PHVNUMBER": 327
                 }, 
                 {
                   "PHVRECORD": [
@@ -14037,7 +14054,7 @@
                       "POSITIONOFFSET": 5
                     }
                   ], 
-                  "PHVNUMBER": 334
+                  "PHVNUMBER": 328
                 }, 
                 {
                   "PHVRECORD": [
@@ -14050,9 +14067,114 @@
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
                       "POSITIONOFFSET": 32
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_dstPort", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 48
                     }
                   ], 
-                  "PHVNUMBER": 335
+                  "PHVNUMBER": 329
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 16, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 31, 
+                      "PHVNAME": "tcp_seqNo", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 69
+                    }
+                  ], 
+                  "PHVNUMBER": 330
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_seqNo", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 69
+                    }
+                  ], 
+                  "PHVNUMBER": 331
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 6, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "ethernet_dstAddr", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 8, 
+                      "POSITIONOFFSET": 19
+                    }, 
+                    {
+                      "FIELDWIDTH": 6, 
+                      "FIELDLSB": 40, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 47, 
+                      "PHVNAME": "ethernet_srcAddr", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 63
+                    }
+                  ], 
+                  "PHVNUMBER": 332
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "ethernet_etherType", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 39
+                    }
+                  ], 
+                  "PHVNUMBER": 333
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 8, 
+                      "PHVNAME": "packet_out_hdr_egress_port", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 7, 
+                      "POSITIONOFFSET": 0
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 8, 
+                      "PHVNAME": "packet_in_hdr_ingress_port", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 7, 
+                      "POSITIONOFFSET": 30
+                    }
+                  ], 
+                  "PHVNUMBER": 334
                 }, 
                 {
                   "PHVRECORD": [
@@ -14119,111 +14241,6 @@
                     }
                   ], 
                   "PHVNUMBER": 81
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 6, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "ethernet_dstAddr", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 8, 
-                      "POSITIONOFFSET": 19
-                    }, 
-                    {
-                      "FIELDWIDTH": 6, 
-                      "FIELDLSB": 40, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 47, 
-                      "PHVNAME": "ethernet_srcAddr", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 63
-                    }
-                  ], 
-                  "PHVNUMBER": 338
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "ethernet_etherType", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 39
-                    }
-                  ], 
-                  "PHVNUMBER": 339
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 8, 
-                      "PHVNAME": "packet_out_hdr_egress_port", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 7, 
-                      "POSITIONOFFSET": 0
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 8, 
-                      "PHVNAME": "packet_in_hdr_ingress_port", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 7, 
-                      "POSITIONOFFSET": 30
-                    }
-                  ], 
-                  "PHVNUMBER": 340
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 16, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_seqNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 69
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_dstPort", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 48
-                    }
-                  ], 
-                  "PHVNUMBER": 336
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_seqNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 69
-                    }
-                  ], 
-                  "PHVNUMBER": 337
                 }
               ], 
               "TOTALEGRESSPHVS": 26
@@ -14233,7 +14250,7 @@
         }, 
         {
           "TOTALPOVHEADERS": 13, 
-          "TOTALSTAGEPHVS": 59, 
+          "TOTALSTAGEPHVS": 56, 
           "TOTALPHVRECORDS": 95, 
           "Phvs": [
             {
@@ -14313,6 +14330,31 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 31, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_dstPort", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 24, 
+                      "POSITIONOFFSET": 33
+                    }, 
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 23, 
+                      "FIELDMSB": 31, 
+                      "PHVNAME": "tcp_seqNo", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 76
+                    }
+                  ], 
+                  "PHVNUMBER": 3
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 8, 
                       "PHVMSB": 31, 
@@ -14323,7 +14365,7 @@
                       "POSITIONOFFSET": 20
                     }
                   ], 
-                  "PHVNUMBER": 3
+                  "PHVNUMBER": 4
                 }, 
                 {
                   "PHVRECORD": [
@@ -14338,31 +14380,6 @@
                       "POSITIONOFFSET": 70
                     }
                   ], 
-                  "PHVNUMBER": 4
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 31, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_srcPort", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 16, 
-                      "POSITIONOFFSET": 66
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_dstPort", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 55
-                    }
-                  ], 
                   "PHVNUMBER": 5
                 }, 
                 {
@@ -14372,10 +14389,10 @@
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "ecmp_metadata_group_id", 
+                      "PHVNAME": "ethernet_etherType", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 36
+                      "POSITIONOFFSET": 5
                     }
                   ], 
                   "PHVNUMBER": 134
@@ -14408,17 +14425,17 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 16, 
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
                       "PHVMSB": 15, 
-                      "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_ackNo", 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "ecmp_metadata_selector", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 26
+                      "POSITIONOFFSET": 61
                     }
                   ], 
-                  "PHVNUMBER": 324
+                  "PHVNUMBER": 136
                 }, 
                 {
                   "PHVRECORD": [
@@ -14548,6 +14565,31 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_srcPort", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 8, 
+                      "POSITIONOFFSET": 38
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_dstPort", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 33
+                    }
+                  ], 
+                  "PHVNUMBER": 132
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
@@ -14568,21 +14610,6 @@
                       "POSITIONOFFSET": 70
                     }
                   ], 
-                  "PHVNUMBER": 132
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "ethernet_etherType", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 5
-                    }
-                  ], 
                   "PHVNUMBER": 133
                 }, 
                 {
@@ -14613,24 +14640,24 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 8, 
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 0, 
                       "PHVMSB": 7, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_srcPort", 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_seqNo", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
+                      "POSITIONOFFSET": 76
                     }, 
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 8, 
                       "PHVMSB": 7, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "udp_length_", 
+                      "PHVNAME": "udp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 17
+                      "POSITIONOFFSET": 66
                     }
                   ], 
                   "PHVNUMBER": 289
@@ -14640,67 +14667,12 @@
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 0, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "tcp_srcPort", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "udp_length_", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 17
-                    }
-                  ], 
-                  "PHVNUMBER": 290
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 8, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_dstPort", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 33
-                    }
-                  ], 
-                  "PHVNUMBER": 291
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "tcp_dstPort", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 33
-                    }
-                  ], 
-                  "PHVNUMBER": 292
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "ecmp_metadata_selector", 
+                      "PHVNAME": "ecmp_metadata_group_id", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 61
+                      "POSITIONOFFSET": 36
                     }
                   ], 
                   "PHVNUMBER": 135
@@ -14756,6 +14728,26 @@
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
                       "POSITIONOFFSET": 46
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 31, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_length_", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 16, 
+                      "POSITIONOFFSET": 17
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_checksum", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 68
                     }
                   ], 
                   "PHVNUMBER": 257
@@ -14803,6 +14795,31 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_srcPort", 
+                      "CONTAINERWIDTH": 8, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 38
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "udp_srcPort", 
+                      "CONTAINERWIDTH": 8, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 66
+                    }
+                  ], 
+                  "PHVNUMBER": 65
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 40, 
                       "PHVMSB": 7, 
@@ -14813,7 +14830,7 @@
                       "POSITIONOFFSET": 20
                     }
                   ], 
-                  "PHVNUMBER": 65
+                  "PHVNUMBER": 66
                 }, 
                 {
                   "PHVRECORD": [
@@ -14828,7 +14845,7 @@
                       "POSITIONOFFSET": 70
                     }
                   ], 
-                  "PHVNUMBER": 66
+                  "PHVNUMBER": 67
                 }, 
                 {
                   "PHVRECORD": [
@@ -14879,7 +14896,7 @@
                       ]
                     }
                   ], 
-                  "PHVNUMBER": 67
+                  "PHVNUMBER": 68
                 }, 
                 {
                   "PHVRECORD": [
@@ -14894,22 +14911,7 @@
                       "POSITIONOFFSET": 51
                     }
                   ], 
-                  "PHVNUMBER": 68
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_ackNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 26
-                    }
-                  ], 
-                  "PHVNUMBER": 325
+                  "PHVNUMBER": 69
                 }, 
                 {
                   "PHVRECORD": [
@@ -14943,20 +14945,20 @@
                       "FIELDLSB": 16, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_seqNo", 
+                      "PHVNAME": "tcp_ackNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 76
+                      "POSITIONOFFSET": 26
                     }, 
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "udp_checksum", 
+                      "PHVNAME": "udp_dstPort", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 68
+                      "POSITIONOFFSET": 55
                     }
                   ], 
                   "PHVNUMBER": 322
@@ -14968,16 +14970,16 @@
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_seqNo", 
+                      "PHVNAME": "tcp_ackNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 76
+                      "POSITIONOFFSET": 26
                     }
                   ], 
                   "PHVNUMBER": 323
                 }
               ], 
-              "TOTALINGRESSPHVS": 33
+              "TOTALINGRESSPHVS": 30
             }, 
             {
               "PHVDIRECTION": 1, 
@@ -15015,7 +15017,7 @@
                       "POSITIONOFFSET": 9
                     }
                   ], 
-                  "PHVNUMBER": 264
+                  "PHVNUMBER": 260
                 }, 
                 {
                   "PHVRECORD": [
@@ -15030,7 +15032,7 @@
                       "POSITIONOFFSET": 12
                     }
                   ], 
-                  "PHVNUMBER": 265
+                  "PHVNUMBER": 261
                 }, 
                 {
                   "PHVRECORD": [
@@ -15045,7 +15047,7 @@
                       "POSITIONOFFSET": 50
                     }
                   ], 
-                  "PHVNUMBER": 266
+                  "PHVNUMBER": 262
                 }, 
                 {
                   "PHVRECORD": [
@@ -15080,7 +15082,7 @@
                       "POSITIONOFFSET": 59
                     }
                   ], 
-                  "PHVNUMBER": 267
+                  "PHVNUMBER": 263
                 }, 
                 {
                   "PHVRECORD": [
@@ -15135,7 +15137,7 @@
                       "POSITIONOFFSET": 41
                     }
                   ], 
-                  "PHVNUMBER": 268
+                  "PHVNUMBER": 264
                 }, 
                 {
                   "PHVRECORD": [
@@ -15160,7 +15162,7 @@
                       "POSITIONOFFSET": 45
                     }
                   ], 
-                  "PHVNUMBER": 269
+                  "PHVNUMBER": 265
                 }, 
                 {
                   "PHVRECORD": [
@@ -15175,7 +15177,7 @@
                       "POSITIONOFFSET": 19
                     }
                   ], 
-                  "PHVNUMBER": 270
+                  "PHVNUMBER": 266
                 }, 
                 {
                   "PHVRECORD": [
@@ -15190,7 +15192,7 @@
                       "POSITIONOFFSET": 63
                     }
                   ], 
-                  "PHVNUMBER": 271
+                  "PHVNUMBER": 267
                 }, 
                 {
                   "PHVRECORD": [
@@ -15230,7 +15232,7 @@
                       "POSITIONOFFSET": 37
                     }
                   ], 
-                  "PHVNUMBER": 296
+                  "PHVNUMBER": 292
                 }, 
                 {
                   "PHVRECORD": [
@@ -15245,7 +15247,7 @@
                       "POSITIONOFFSET": 4
                     }
                   ], 
-                  "PHVNUMBER": 297
+                  "PHVNUMBER": 293
                 }, 
                 {
                   "PHVRECORD": [
@@ -15270,7 +15272,7 @@
                       "POSITIONOFFSET": 56
                     }
                   ], 
-                  "PHVNUMBER": 298
+                  "PHVNUMBER": 294
                 }, 
                 {
                   "PHVRECORD": [
@@ -15295,7 +15297,7 @@
                       "POSITIONOFFSET": 56
                     }
                   ], 
-                  "PHVNUMBER": 299
+                  "PHVNUMBER": 295
                 }, 
                 {
                   "PHVRECORD": [
@@ -15310,7 +15312,7 @@
                       "POSITIONOFFSET": 19
                     }
                   ], 
-                  "PHVNUMBER": 300
+                  "PHVNUMBER": 296
                 }, 
                 {
                   "PHVRECORD": [
@@ -15325,7 +15327,7 @@
                       "POSITIONOFFSET": 63
                     }
                   ], 
-                  "PHVNUMBER": 301
+                  "PHVNUMBER": 297
                 }, 
                 {
                   "PHVRECORD": [
@@ -15340,7 +15342,7 @@
                       "POSITIONOFFSET": 54
                     }
                   ], 
-                  "PHVNUMBER": 332
+                  "PHVNUMBER": 326
                 }, 
                 {
                   "PHVRECORD": [
@@ -15355,7 +15357,7 @@
                       "POSITIONOFFSET": 43
                     }
                   ], 
-                  "PHVNUMBER": 333
+                  "PHVNUMBER": 327
                 }, 
                 {
                   "PHVRECORD": [
@@ -15380,7 +15382,7 @@
                       "POSITIONOFFSET": 5
                     }
                   ], 
-                  "PHVNUMBER": 334
+                  "PHVNUMBER": 328
                 }, 
                 {
                   "PHVRECORD": [
@@ -15393,9 +15395,114 @@
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
                       "POSITIONOFFSET": 32
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_dstPort", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 48
                     }
                   ], 
-                  "PHVNUMBER": 335
+                  "PHVNUMBER": 329
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 16, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 31, 
+                      "PHVNAME": "tcp_seqNo", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 69
+                    }
+                  ], 
+                  "PHVNUMBER": 330
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_seqNo", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 69
+                    }
+                  ], 
+                  "PHVNUMBER": 331
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 6, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "ethernet_dstAddr", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 8, 
+                      "POSITIONOFFSET": 19
+                    }, 
+                    {
+                      "FIELDWIDTH": 6, 
+                      "FIELDLSB": 40, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 47, 
+                      "PHVNAME": "ethernet_srcAddr", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 63
+                    }
+                  ], 
+                  "PHVNUMBER": 332
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "ethernet_etherType", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 39
+                    }
+                  ], 
+                  "PHVNUMBER": 333
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 8, 
+                      "PHVNAME": "packet_out_hdr_egress_port", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 7, 
+                      "POSITIONOFFSET": 0
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 8, 
+                      "PHVNAME": "packet_in_hdr_ingress_port", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 7, 
+                      "POSITIONOFFSET": 30
+                    }
+                  ], 
+                  "PHVNUMBER": 334
                 }, 
                 {
                   "PHVRECORD": [
@@ -15462,111 +15569,6 @@
                     }
                   ], 
                   "PHVNUMBER": 81
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 6, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "ethernet_dstAddr", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 8, 
-                      "POSITIONOFFSET": 19
-                    }, 
-                    {
-                      "FIELDWIDTH": 6, 
-                      "FIELDLSB": 40, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 47, 
-                      "PHVNAME": "ethernet_srcAddr", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 63
-                    }
-                  ], 
-                  "PHVNUMBER": 338
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "ethernet_etherType", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 39
-                    }
-                  ], 
-                  "PHVNUMBER": 339
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 8, 
-                      "PHVNAME": "packet_out_hdr_egress_port", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 7, 
-                      "POSITIONOFFSET": 0
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 8, 
-                      "PHVNAME": "packet_in_hdr_ingress_port", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 7, 
-                      "POSITIONOFFSET": 30
-                    }
-                  ], 
-                  "PHVNUMBER": 340
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 16, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_seqNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 69
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_dstPort", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 48
-                    }
-                  ], 
-                  "PHVNUMBER": 336
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_seqNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 69
-                    }
-                  ], 
-                  "PHVNUMBER": 337
                 }
               ], 
               "TOTALEGRESSPHVS": 26
@@ -15576,7 +15578,7 @@
         }, 
         {
           "TOTALPOVHEADERS": 13, 
-          "TOTALSTAGEPHVS": 59, 
+          "TOTALSTAGEPHVS": 56, 
           "TOTALPHVRECORDS": 95, 
           "Phvs": [
             {
@@ -15656,6 +15658,31 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 31, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_dstPort", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 24, 
+                      "POSITIONOFFSET": 33
+                    }, 
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 23, 
+                      "FIELDMSB": 31, 
+                      "PHVNAME": "tcp_seqNo", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 76
+                    }
+                  ], 
+                  "PHVNUMBER": 3
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 8, 
                       "PHVMSB": 31, 
@@ -15666,7 +15693,7 @@
                       "POSITIONOFFSET": 20
                     }
                   ], 
-                  "PHVNUMBER": 3
+                  "PHVNUMBER": 4
                 }, 
                 {
                   "PHVRECORD": [
@@ -15681,31 +15708,6 @@
                       "POSITIONOFFSET": 70
                     }
                   ], 
-                  "PHVNUMBER": 4
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 31, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_srcPort", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 16, 
-                      "POSITIONOFFSET": 66
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_dstPort", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 55
-                    }
-                  ], 
                   "PHVNUMBER": 5
                 }, 
                 {
@@ -15715,10 +15717,10 @@
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "ecmp_metadata_group_id", 
+                      "PHVNAME": "ethernet_etherType", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 36
+                      "POSITIONOFFSET": 5
                     }
                   ], 
                   "PHVNUMBER": 134
@@ -15751,17 +15753,17 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 16, 
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
                       "PHVMSB": 15, 
-                      "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_ackNo", 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "ecmp_metadata_selector", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 26
+                      "POSITIONOFFSET": 61
                     }
                   ], 
-                  "PHVNUMBER": 324
+                  "PHVNUMBER": 136
                 }, 
                 {
                   "PHVRECORD": [
@@ -15891,6 +15893,31 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_srcPort", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 8, 
+                      "POSITIONOFFSET": 38
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_dstPort", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 33
+                    }
+                  ], 
+                  "PHVNUMBER": 132
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
@@ -15911,21 +15938,6 @@
                       "POSITIONOFFSET": 70
                     }
                   ], 
-                  "PHVNUMBER": 132
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "ethernet_etherType", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 5
-                    }
-                  ], 
                   "PHVNUMBER": 133
                 }, 
                 {
@@ -15956,24 +15968,24 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 8, 
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 0, 
                       "PHVMSB": 7, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_srcPort", 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_seqNo", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
+                      "POSITIONOFFSET": 76
                     }, 
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 8, 
                       "PHVMSB": 7, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "udp_length_", 
+                      "PHVNAME": "udp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 17
+                      "POSITIONOFFSET": 66
                     }
                   ], 
                   "PHVNUMBER": 289
@@ -15983,67 +15995,12 @@
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 0, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "tcp_srcPort", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "udp_length_", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 17
-                    }
-                  ], 
-                  "PHVNUMBER": 290
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 8, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_dstPort", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 33
-                    }
-                  ], 
-                  "PHVNUMBER": 291
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "tcp_dstPort", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 33
-                    }
-                  ], 
-                  "PHVNUMBER": 292
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "ecmp_metadata_selector", 
+                      "PHVNAME": "ecmp_metadata_group_id", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 61
+                      "POSITIONOFFSET": 36
                     }
                   ], 
                   "PHVNUMBER": 135
@@ -16099,6 +16056,26 @@
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
                       "POSITIONOFFSET": 46
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 31, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_length_", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 16, 
+                      "POSITIONOFFSET": 17
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_checksum", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 68
                     }
                   ], 
                   "PHVNUMBER": 257
@@ -16146,6 +16123,31 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_srcPort", 
+                      "CONTAINERWIDTH": 8, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 38
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "udp_srcPort", 
+                      "CONTAINERWIDTH": 8, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 66
+                    }
+                  ], 
+                  "PHVNUMBER": 65
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 40, 
                       "PHVMSB": 7, 
@@ -16156,7 +16158,7 @@
                       "POSITIONOFFSET": 20
                     }
                   ], 
-                  "PHVNUMBER": 65
+                  "PHVNUMBER": 66
                 }, 
                 {
                   "PHVRECORD": [
@@ -16171,7 +16173,7 @@
                       "POSITIONOFFSET": 70
                     }
                   ], 
-                  "PHVNUMBER": 66
+                  "PHVNUMBER": 67
                 }, 
                 {
                   "PHVRECORD": [
@@ -16222,7 +16224,7 @@
                       ]
                     }
                   ], 
-                  "PHVNUMBER": 67
+                  "PHVNUMBER": 68
                 }, 
                 {
                   "PHVRECORD": [
@@ -16237,22 +16239,7 @@
                       "POSITIONOFFSET": 51
                     }
                   ], 
-                  "PHVNUMBER": 68
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_ackNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 26
-                    }
-                  ], 
-                  "PHVNUMBER": 325
+                  "PHVNUMBER": 69
                 }, 
                 {
                   "PHVRECORD": [
@@ -16286,20 +16273,20 @@
                       "FIELDLSB": 16, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_seqNo", 
+                      "PHVNAME": "tcp_ackNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 76
+                      "POSITIONOFFSET": 26
                     }, 
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "udp_checksum", 
+                      "PHVNAME": "udp_dstPort", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 68
+                      "POSITIONOFFSET": 55
                     }
                   ], 
                   "PHVNUMBER": 322
@@ -16311,16 +16298,16 @@
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_seqNo", 
+                      "PHVNAME": "tcp_ackNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 76
+                      "POSITIONOFFSET": 26
                     }
                   ], 
                   "PHVNUMBER": 323
                 }
               ], 
-              "TOTALINGRESSPHVS": 33
+              "TOTALINGRESSPHVS": 30
             }, 
             {
               "PHVDIRECTION": 1, 
@@ -16358,7 +16345,7 @@
                       "POSITIONOFFSET": 9
                     }
                   ], 
-                  "PHVNUMBER": 264
+                  "PHVNUMBER": 260
                 }, 
                 {
                   "PHVRECORD": [
@@ -16373,7 +16360,7 @@
                       "POSITIONOFFSET": 12
                     }
                   ], 
-                  "PHVNUMBER": 265
+                  "PHVNUMBER": 261
                 }, 
                 {
                   "PHVRECORD": [
@@ -16388,7 +16375,7 @@
                       "POSITIONOFFSET": 50
                     }
                   ], 
-                  "PHVNUMBER": 266
+                  "PHVNUMBER": 262
                 }, 
                 {
                   "PHVRECORD": [
@@ -16423,7 +16410,7 @@
                       "POSITIONOFFSET": 59
                     }
                   ], 
-                  "PHVNUMBER": 267
+                  "PHVNUMBER": 263
                 }, 
                 {
                   "PHVRECORD": [
@@ -16478,7 +16465,7 @@
                       "POSITIONOFFSET": 41
                     }
                   ], 
-                  "PHVNUMBER": 268
+                  "PHVNUMBER": 264
                 }, 
                 {
                   "PHVRECORD": [
@@ -16503,7 +16490,7 @@
                       "POSITIONOFFSET": 45
                     }
                   ], 
-                  "PHVNUMBER": 269
+                  "PHVNUMBER": 265
                 }, 
                 {
                   "PHVRECORD": [
@@ -16518,7 +16505,7 @@
                       "POSITIONOFFSET": 19
                     }
                   ], 
-                  "PHVNUMBER": 270
+                  "PHVNUMBER": 266
                 }, 
                 {
                   "PHVRECORD": [
@@ -16533,7 +16520,7 @@
                       "POSITIONOFFSET": 63
                     }
                   ], 
-                  "PHVNUMBER": 271
+                  "PHVNUMBER": 267
                 }, 
                 {
                   "PHVRECORD": [
@@ -16573,7 +16560,7 @@
                       "POSITIONOFFSET": 37
                     }
                   ], 
-                  "PHVNUMBER": 296
+                  "PHVNUMBER": 292
                 }, 
                 {
                   "PHVRECORD": [
@@ -16588,7 +16575,7 @@
                       "POSITIONOFFSET": 4
                     }
                   ], 
-                  "PHVNUMBER": 297
+                  "PHVNUMBER": 293
                 }, 
                 {
                   "PHVRECORD": [
@@ -16613,7 +16600,7 @@
                       "POSITIONOFFSET": 56
                     }
                   ], 
-                  "PHVNUMBER": 298
+                  "PHVNUMBER": 294
                 }, 
                 {
                   "PHVRECORD": [
@@ -16638,7 +16625,7 @@
                       "POSITIONOFFSET": 56
                     }
                   ], 
-                  "PHVNUMBER": 299
+                  "PHVNUMBER": 295
                 }, 
                 {
                   "PHVRECORD": [
@@ -16653,7 +16640,7 @@
                       "POSITIONOFFSET": 19
                     }
                   ], 
-                  "PHVNUMBER": 300
+                  "PHVNUMBER": 296
                 }, 
                 {
                   "PHVRECORD": [
@@ -16668,7 +16655,7 @@
                       "POSITIONOFFSET": 63
                     }
                   ], 
-                  "PHVNUMBER": 301
+                  "PHVNUMBER": 297
                 }, 
                 {
                   "PHVRECORD": [
@@ -16683,7 +16670,7 @@
                       "POSITIONOFFSET": 54
                     }
                   ], 
-                  "PHVNUMBER": 332
+                  "PHVNUMBER": 326
                 }, 
                 {
                   "PHVRECORD": [
@@ -16698,7 +16685,7 @@
                       "POSITIONOFFSET": 43
                     }
                   ], 
-                  "PHVNUMBER": 333
+                  "PHVNUMBER": 327
                 }, 
                 {
                   "PHVRECORD": [
@@ -16723,7 +16710,7 @@
                       "POSITIONOFFSET": 5
                     }
                   ], 
-                  "PHVNUMBER": 334
+                  "PHVNUMBER": 328
                 }, 
                 {
                   "PHVRECORD": [
@@ -16736,9 +16723,114 @@
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
                       "POSITIONOFFSET": 32
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_dstPort", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 48
                     }
                   ], 
-                  "PHVNUMBER": 335
+                  "PHVNUMBER": 329
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 16, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 31, 
+                      "PHVNAME": "tcp_seqNo", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 69
+                    }
+                  ], 
+                  "PHVNUMBER": 330
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_seqNo", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 69
+                    }
+                  ], 
+                  "PHVNUMBER": 331
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 6, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "ethernet_dstAddr", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 8, 
+                      "POSITIONOFFSET": 19
+                    }, 
+                    {
+                      "FIELDWIDTH": 6, 
+                      "FIELDLSB": 40, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 47, 
+                      "PHVNAME": "ethernet_srcAddr", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 63
+                    }
+                  ], 
+                  "PHVNUMBER": 332
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "ethernet_etherType", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 39
+                    }
+                  ], 
+                  "PHVNUMBER": 333
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 8, 
+                      "PHVNAME": "packet_out_hdr_egress_port", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 7, 
+                      "POSITIONOFFSET": 0
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 8, 
+                      "PHVNAME": "packet_in_hdr_ingress_port", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 7, 
+                      "POSITIONOFFSET": 30
+                    }
+                  ], 
+                  "PHVNUMBER": 334
                 }, 
                 {
                   "PHVRECORD": [
@@ -16805,111 +16897,6 @@
                     }
                   ], 
                   "PHVNUMBER": 81
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 6, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "ethernet_dstAddr", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 8, 
-                      "POSITIONOFFSET": 19
-                    }, 
-                    {
-                      "FIELDWIDTH": 6, 
-                      "FIELDLSB": 40, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 47, 
-                      "PHVNAME": "ethernet_srcAddr", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 63
-                    }
-                  ], 
-                  "PHVNUMBER": 338
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "ethernet_etherType", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 39
-                    }
-                  ], 
-                  "PHVNUMBER": 339
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 8, 
-                      "PHVNAME": "packet_out_hdr_egress_port", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 7, 
-                      "POSITIONOFFSET": 0
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 8, 
-                      "PHVNAME": "packet_in_hdr_ingress_port", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 7, 
-                      "POSITIONOFFSET": 30
-                    }
-                  ], 
-                  "PHVNUMBER": 340
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 16, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_seqNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 69
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_dstPort", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 48
-                    }
-                  ], 
-                  "PHVNUMBER": 336
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_seqNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 69
-                    }
-                  ], 
-                  "PHVNUMBER": 337
                 }
               ], 
               "TOTALEGRESSPHVS": 26
@@ -16919,7 +16906,7 @@
         }, 
         {
           "TOTALPOVHEADERS": 13, 
-          "TOTALSTAGEPHVS": 59, 
+          "TOTALSTAGEPHVS": 56, 
           "TOTALPHVRECORDS": 95, 
           "Phvs": [
             {
@@ -16999,6 +16986,31 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 31, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_dstPort", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 24, 
+                      "POSITIONOFFSET": 33
+                    }, 
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 23, 
+                      "FIELDMSB": 31, 
+                      "PHVNAME": "tcp_seqNo", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 76
+                    }
+                  ], 
+                  "PHVNUMBER": 3
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 8, 
                       "PHVMSB": 31, 
@@ -17009,7 +17021,7 @@
                       "POSITIONOFFSET": 20
                     }
                   ], 
-                  "PHVNUMBER": 3
+                  "PHVNUMBER": 4
                 }, 
                 {
                   "PHVRECORD": [
@@ -17024,31 +17036,6 @@
                       "POSITIONOFFSET": 70
                     }
                   ], 
-                  "PHVNUMBER": 4
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 31, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_srcPort", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 16, 
-                      "POSITIONOFFSET": 66
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_dstPort", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 55
-                    }
-                  ], 
                   "PHVNUMBER": 5
                 }, 
                 {
@@ -17058,10 +17045,10 @@
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "ecmp_metadata_group_id", 
+                      "PHVNAME": "ethernet_etherType", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 36
+                      "POSITIONOFFSET": 5
                     }
                   ], 
                   "PHVNUMBER": 134
@@ -17094,17 +17081,17 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 16, 
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
                       "PHVMSB": 15, 
-                      "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_ackNo", 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "ecmp_metadata_selector", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 26
+                      "POSITIONOFFSET": 61
                     }
                   ], 
-                  "PHVNUMBER": 324
+                  "PHVNUMBER": 136
                 }, 
                 {
                   "PHVRECORD": [
@@ -17234,6 +17221,31 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_srcPort", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 8, 
+                      "POSITIONOFFSET": 38
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_dstPort", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 33
+                    }
+                  ], 
+                  "PHVNUMBER": 132
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
@@ -17254,21 +17266,6 @@
                       "POSITIONOFFSET": 70
                     }
                   ], 
-                  "PHVNUMBER": 132
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "ethernet_etherType", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 5
-                    }
-                  ], 
                   "PHVNUMBER": 133
                 }, 
                 {
@@ -17299,24 +17296,24 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 8, 
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 0, 
                       "PHVMSB": 7, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_srcPort", 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_seqNo", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
+                      "POSITIONOFFSET": 76
                     }, 
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 8, 
                       "PHVMSB": 7, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "udp_length_", 
+                      "PHVNAME": "udp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 17
+                      "POSITIONOFFSET": 66
                     }
                   ], 
                   "PHVNUMBER": 289
@@ -17326,67 +17323,12 @@
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 0, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "tcp_srcPort", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "udp_length_", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 17
-                    }
-                  ], 
-                  "PHVNUMBER": 290
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 8, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_dstPort", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 33
-                    }
-                  ], 
-                  "PHVNUMBER": 291
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "tcp_dstPort", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 33
-                    }
-                  ], 
-                  "PHVNUMBER": 292
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "ecmp_metadata_selector", 
+                      "PHVNAME": "ecmp_metadata_group_id", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 61
+                      "POSITIONOFFSET": 36
                     }
                   ], 
                   "PHVNUMBER": 135
@@ -17442,6 +17384,26 @@
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
                       "POSITIONOFFSET": 46
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 31, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_length_", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 16, 
+                      "POSITIONOFFSET": 17
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_checksum", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 68
                     }
                   ], 
                   "PHVNUMBER": 257
@@ -17489,6 +17451,31 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_srcPort", 
+                      "CONTAINERWIDTH": 8, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 38
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "udp_srcPort", 
+                      "CONTAINERWIDTH": 8, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 66
+                    }
+                  ], 
+                  "PHVNUMBER": 65
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 40, 
                       "PHVMSB": 7, 
@@ -17499,7 +17486,7 @@
                       "POSITIONOFFSET": 20
                     }
                   ], 
-                  "PHVNUMBER": 65
+                  "PHVNUMBER": 66
                 }, 
                 {
                   "PHVRECORD": [
@@ -17514,7 +17501,7 @@
                       "POSITIONOFFSET": 70
                     }
                   ], 
-                  "PHVNUMBER": 66
+                  "PHVNUMBER": 67
                 }, 
                 {
                   "PHVRECORD": [
@@ -17565,7 +17552,7 @@
                       ]
                     }
                   ], 
-                  "PHVNUMBER": 67
+                  "PHVNUMBER": 68
                 }, 
                 {
                   "PHVRECORD": [
@@ -17580,22 +17567,7 @@
                       "POSITIONOFFSET": 51
                     }
                   ], 
-                  "PHVNUMBER": 68
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_ackNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 26
-                    }
-                  ], 
-                  "PHVNUMBER": 325
+                  "PHVNUMBER": 69
                 }, 
                 {
                   "PHVRECORD": [
@@ -17629,20 +17601,20 @@
                       "FIELDLSB": 16, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_seqNo", 
+                      "PHVNAME": "tcp_ackNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 76
+                      "POSITIONOFFSET": 26
                     }, 
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "udp_checksum", 
+                      "PHVNAME": "udp_dstPort", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 68
+                      "POSITIONOFFSET": 55
                     }
                   ], 
                   "PHVNUMBER": 322
@@ -17654,16 +17626,16 @@
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_seqNo", 
+                      "PHVNAME": "tcp_ackNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 76
+                      "POSITIONOFFSET": 26
                     }
                   ], 
                   "PHVNUMBER": 323
                 }
               ], 
-              "TOTALINGRESSPHVS": 33
+              "TOTALINGRESSPHVS": 30
             }, 
             {
               "PHVDIRECTION": 1, 
@@ -17701,7 +17673,7 @@
                       "POSITIONOFFSET": 9
                     }
                   ], 
-                  "PHVNUMBER": 264
+                  "PHVNUMBER": 260
                 }, 
                 {
                   "PHVRECORD": [
@@ -17716,7 +17688,7 @@
                       "POSITIONOFFSET": 12
                     }
                   ], 
-                  "PHVNUMBER": 265
+                  "PHVNUMBER": 261
                 }, 
                 {
                   "PHVRECORD": [
@@ -17731,7 +17703,7 @@
                       "POSITIONOFFSET": 50
                     }
                   ], 
-                  "PHVNUMBER": 266
+                  "PHVNUMBER": 262
                 }, 
                 {
                   "PHVRECORD": [
@@ -17766,7 +17738,7 @@
                       "POSITIONOFFSET": 59
                     }
                   ], 
-                  "PHVNUMBER": 267
+                  "PHVNUMBER": 263
                 }, 
                 {
                   "PHVRECORD": [
@@ -17821,7 +17793,7 @@
                       "POSITIONOFFSET": 41
                     }
                   ], 
-                  "PHVNUMBER": 268
+                  "PHVNUMBER": 264
                 }, 
                 {
                   "PHVRECORD": [
@@ -17846,7 +17818,7 @@
                       "POSITIONOFFSET": 45
                     }
                   ], 
-                  "PHVNUMBER": 269
+                  "PHVNUMBER": 265
                 }, 
                 {
                   "PHVRECORD": [
@@ -17861,7 +17833,7 @@
                       "POSITIONOFFSET": 19
                     }
                   ], 
-                  "PHVNUMBER": 270
+                  "PHVNUMBER": 266
                 }, 
                 {
                   "PHVRECORD": [
@@ -17876,7 +17848,7 @@
                       "POSITIONOFFSET": 63
                     }
                   ], 
-                  "PHVNUMBER": 271
+                  "PHVNUMBER": 267
                 }, 
                 {
                   "PHVRECORD": [
@@ -17916,7 +17888,7 @@
                       "POSITIONOFFSET": 37
                     }
                   ], 
-                  "PHVNUMBER": 296
+                  "PHVNUMBER": 292
                 }, 
                 {
                   "PHVRECORD": [
@@ -17931,7 +17903,7 @@
                       "POSITIONOFFSET": 4
                     }
                   ], 
-                  "PHVNUMBER": 297
+                  "PHVNUMBER": 293
                 }, 
                 {
                   "PHVRECORD": [
@@ -17956,7 +17928,7 @@
                       "POSITIONOFFSET": 56
                     }
                   ], 
-                  "PHVNUMBER": 298
+                  "PHVNUMBER": 294
                 }, 
                 {
                   "PHVRECORD": [
@@ -17981,7 +17953,7 @@
                       "POSITIONOFFSET": 56
                     }
                   ], 
-                  "PHVNUMBER": 299
+                  "PHVNUMBER": 295
                 }, 
                 {
                   "PHVRECORD": [
@@ -17996,7 +17968,7 @@
                       "POSITIONOFFSET": 19
                     }
                   ], 
-                  "PHVNUMBER": 300
+                  "PHVNUMBER": 296
                 }, 
                 {
                   "PHVRECORD": [
@@ -18011,7 +17983,7 @@
                       "POSITIONOFFSET": 63
                     }
                   ], 
-                  "PHVNUMBER": 301
+                  "PHVNUMBER": 297
                 }, 
                 {
                   "PHVRECORD": [
@@ -18026,7 +17998,7 @@
                       "POSITIONOFFSET": 54
                     }
                   ], 
-                  "PHVNUMBER": 332
+                  "PHVNUMBER": 326
                 }, 
                 {
                   "PHVRECORD": [
@@ -18041,7 +18013,7 @@
                       "POSITIONOFFSET": 43
                     }
                   ], 
-                  "PHVNUMBER": 333
+                  "PHVNUMBER": 327
                 }, 
                 {
                   "PHVRECORD": [
@@ -18066,7 +18038,7 @@
                       "POSITIONOFFSET": 5
                     }
                   ], 
-                  "PHVNUMBER": 334
+                  "PHVNUMBER": 328
                 }, 
                 {
                   "PHVRECORD": [
@@ -18079,9 +18051,114 @@
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
                       "POSITIONOFFSET": 32
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_dstPort", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 48
                     }
                   ], 
-                  "PHVNUMBER": 335
+                  "PHVNUMBER": 329
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 16, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 31, 
+                      "PHVNAME": "tcp_seqNo", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 69
+                    }
+                  ], 
+                  "PHVNUMBER": 330
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_seqNo", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 69
+                    }
+                  ], 
+                  "PHVNUMBER": 331
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 6, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "ethernet_dstAddr", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 8, 
+                      "POSITIONOFFSET": 19
+                    }, 
+                    {
+                      "FIELDWIDTH": 6, 
+                      "FIELDLSB": 40, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 47, 
+                      "PHVNAME": "ethernet_srcAddr", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 63
+                    }
+                  ], 
+                  "PHVNUMBER": 332
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "ethernet_etherType", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 39
+                    }
+                  ], 
+                  "PHVNUMBER": 333
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 8, 
+                      "PHVNAME": "packet_out_hdr_egress_port", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 7, 
+                      "POSITIONOFFSET": 0
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 8, 
+                      "PHVNAME": "packet_in_hdr_ingress_port", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 7, 
+                      "POSITIONOFFSET": 30
+                    }
+                  ], 
+                  "PHVNUMBER": 334
                 }, 
                 {
                   "PHVRECORD": [
@@ -18148,111 +18225,6 @@
                     }
                   ], 
                   "PHVNUMBER": 81
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 6, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "ethernet_dstAddr", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 8, 
-                      "POSITIONOFFSET": 19
-                    }, 
-                    {
-                      "FIELDWIDTH": 6, 
-                      "FIELDLSB": 40, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 47, 
-                      "PHVNAME": "ethernet_srcAddr", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 63
-                    }
-                  ], 
-                  "PHVNUMBER": 338
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "ethernet_etherType", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 39
-                    }
-                  ], 
-                  "PHVNUMBER": 339
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 8, 
-                      "PHVNAME": "packet_out_hdr_egress_port", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 7, 
-                      "POSITIONOFFSET": 0
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 8, 
-                      "PHVNAME": "packet_in_hdr_ingress_port", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 7, 
-                      "POSITIONOFFSET": 30
-                    }
-                  ], 
-                  "PHVNUMBER": 340
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 16, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_seqNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 69
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_dstPort", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 48
-                    }
-                  ], 
-                  "PHVNUMBER": 336
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_seqNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 69
-                    }
-                  ], 
-                  "PHVNUMBER": 337
                 }
               ], 
               "TOTALEGRESSPHVS": 26
@@ -18262,7 +18234,7 @@
         }, 
         {
           "TOTALPOVHEADERS": 13, 
-          "TOTALSTAGEPHVS": 59, 
+          "TOTALSTAGEPHVS": 56, 
           "TOTALPHVRECORDS": 95, 
           "Phvs": [
             {
@@ -18342,6 +18314,31 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 31, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_dstPort", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 24, 
+                      "POSITIONOFFSET": 33
+                    }, 
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 23, 
+                      "FIELDMSB": 31, 
+                      "PHVNAME": "tcp_seqNo", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 76
+                    }
+                  ], 
+                  "PHVNUMBER": 3
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 8, 
                       "PHVMSB": 31, 
@@ -18352,7 +18349,7 @@
                       "POSITIONOFFSET": 20
                     }
                   ], 
-                  "PHVNUMBER": 3
+                  "PHVNUMBER": 4
                 }, 
                 {
                   "PHVRECORD": [
@@ -18367,31 +18364,6 @@
                       "POSITIONOFFSET": 70
                     }
                   ], 
-                  "PHVNUMBER": 4
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 31, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_srcPort", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 16, 
-                      "POSITIONOFFSET": 66
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_dstPort", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 55
-                    }
-                  ], 
                   "PHVNUMBER": 5
                 }, 
                 {
@@ -18401,10 +18373,10 @@
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "ecmp_metadata_group_id", 
+                      "PHVNAME": "ethernet_etherType", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 36
+                      "POSITIONOFFSET": 5
                     }
                   ], 
                   "PHVNUMBER": 134
@@ -18437,17 +18409,17 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 16, 
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
                       "PHVMSB": 15, 
-                      "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_ackNo", 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "ecmp_metadata_selector", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 26
+                      "POSITIONOFFSET": 61
                     }
                   ], 
-                  "PHVNUMBER": 324
+                  "PHVNUMBER": 136
                 }, 
                 {
                   "PHVRECORD": [
@@ -18577,6 +18549,31 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_srcPort", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 8, 
+                      "POSITIONOFFSET": 38
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_dstPort", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 33
+                    }
+                  ], 
+                  "PHVNUMBER": 132
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
@@ -18597,21 +18594,6 @@
                       "POSITIONOFFSET": 70
                     }
                   ], 
-                  "PHVNUMBER": 132
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "ethernet_etherType", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 5
-                    }
-                  ], 
                   "PHVNUMBER": 133
                 }, 
                 {
@@ -18642,24 +18624,24 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 8, 
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 0, 
                       "PHVMSB": 7, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_srcPort", 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_seqNo", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
+                      "POSITIONOFFSET": 76
                     }, 
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 8, 
                       "PHVMSB": 7, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "udp_length_", 
+                      "PHVNAME": "udp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 17
+                      "POSITIONOFFSET": 66
                     }
                   ], 
                   "PHVNUMBER": 289
@@ -18669,67 +18651,12 @@
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 0, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "tcp_srcPort", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "udp_length_", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 17
-                    }
-                  ], 
-                  "PHVNUMBER": 290
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 8, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_dstPort", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 33
-                    }
-                  ], 
-                  "PHVNUMBER": 291
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "tcp_dstPort", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 33
-                    }
-                  ], 
-                  "PHVNUMBER": 292
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "ecmp_metadata_selector", 
+                      "PHVNAME": "ecmp_metadata_group_id", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 61
+                      "POSITIONOFFSET": 36
                     }
                   ], 
                   "PHVNUMBER": 135
@@ -18785,6 +18712,26 @@
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
                       "POSITIONOFFSET": 46
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 31, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_length_", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 16, 
+                      "POSITIONOFFSET": 17
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_checksum", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 68
                     }
                   ], 
                   "PHVNUMBER": 257
@@ -18832,6 +18779,31 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_srcPort", 
+                      "CONTAINERWIDTH": 8, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 38
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "udp_srcPort", 
+                      "CONTAINERWIDTH": 8, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 66
+                    }
+                  ], 
+                  "PHVNUMBER": 65
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 40, 
                       "PHVMSB": 7, 
@@ -18842,7 +18814,7 @@
                       "POSITIONOFFSET": 20
                     }
                   ], 
-                  "PHVNUMBER": 65
+                  "PHVNUMBER": 66
                 }, 
                 {
                   "PHVRECORD": [
@@ -18857,7 +18829,7 @@
                       "POSITIONOFFSET": 70
                     }
                   ], 
-                  "PHVNUMBER": 66
+                  "PHVNUMBER": 67
                 }, 
                 {
                   "PHVRECORD": [
@@ -18908,7 +18880,7 @@
                       ]
                     }
                   ], 
-                  "PHVNUMBER": 67
+                  "PHVNUMBER": 68
                 }, 
                 {
                   "PHVRECORD": [
@@ -18923,22 +18895,7 @@
                       "POSITIONOFFSET": 51
                     }
                   ], 
-                  "PHVNUMBER": 68
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_ackNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 26
-                    }
-                  ], 
-                  "PHVNUMBER": 325
+                  "PHVNUMBER": 69
                 }, 
                 {
                   "PHVRECORD": [
@@ -18972,20 +18929,20 @@
                       "FIELDLSB": 16, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_seqNo", 
+                      "PHVNAME": "tcp_ackNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 76
+                      "POSITIONOFFSET": 26
                     }, 
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "udp_checksum", 
+                      "PHVNAME": "udp_dstPort", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 68
+                      "POSITIONOFFSET": 55
                     }
                   ], 
                   "PHVNUMBER": 322
@@ -18997,16 +18954,16 @@
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_seqNo", 
+                      "PHVNAME": "tcp_ackNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 76
+                      "POSITIONOFFSET": 26
                     }
                   ], 
                   "PHVNUMBER": 323
                 }
               ], 
-              "TOTALINGRESSPHVS": 33
+              "TOTALINGRESSPHVS": 30
             }, 
             {
               "PHVDIRECTION": 1, 
@@ -19044,7 +19001,7 @@
                       "POSITIONOFFSET": 9
                     }
                   ], 
-                  "PHVNUMBER": 264
+                  "PHVNUMBER": 260
                 }, 
                 {
                   "PHVRECORD": [
@@ -19059,7 +19016,7 @@
                       "POSITIONOFFSET": 12
                     }
                   ], 
-                  "PHVNUMBER": 265
+                  "PHVNUMBER": 261
                 }, 
                 {
                   "PHVRECORD": [
@@ -19074,7 +19031,7 @@
                       "POSITIONOFFSET": 50
                     }
                   ], 
-                  "PHVNUMBER": 266
+                  "PHVNUMBER": 262
                 }, 
                 {
                   "PHVRECORD": [
@@ -19109,7 +19066,7 @@
                       "POSITIONOFFSET": 59
                     }
                   ], 
-                  "PHVNUMBER": 267
+                  "PHVNUMBER": 263
                 }, 
                 {
                   "PHVRECORD": [
@@ -19164,7 +19121,7 @@
                       "POSITIONOFFSET": 41
                     }
                   ], 
-                  "PHVNUMBER": 268
+                  "PHVNUMBER": 264
                 }, 
                 {
                   "PHVRECORD": [
@@ -19189,7 +19146,7 @@
                       "POSITIONOFFSET": 45
                     }
                   ], 
-                  "PHVNUMBER": 269
+                  "PHVNUMBER": 265
                 }, 
                 {
                   "PHVRECORD": [
@@ -19204,7 +19161,7 @@
                       "POSITIONOFFSET": 19
                     }
                   ], 
-                  "PHVNUMBER": 270
+                  "PHVNUMBER": 266
                 }, 
                 {
                   "PHVRECORD": [
@@ -19219,7 +19176,7 @@
                       "POSITIONOFFSET": 63
                     }
                   ], 
-                  "PHVNUMBER": 271
+                  "PHVNUMBER": 267
                 }, 
                 {
                   "PHVRECORD": [
@@ -19259,7 +19216,7 @@
                       "POSITIONOFFSET": 37
                     }
                   ], 
-                  "PHVNUMBER": 296
+                  "PHVNUMBER": 292
                 }, 
                 {
                   "PHVRECORD": [
@@ -19274,7 +19231,7 @@
                       "POSITIONOFFSET": 4
                     }
                   ], 
-                  "PHVNUMBER": 297
+                  "PHVNUMBER": 293
                 }, 
                 {
                   "PHVRECORD": [
@@ -19299,7 +19256,7 @@
                       "POSITIONOFFSET": 56
                     }
                   ], 
-                  "PHVNUMBER": 298
+                  "PHVNUMBER": 294
                 }, 
                 {
                   "PHVRECORD": [
@@ -19324,7 +19281,7 @@
                       "POSITIONOFFSET": 56
                     }
                   ], 
-                  "PHVNUMBER": 299
+                  "PHVNUMBER": 295
                 }, 
                 {
                   "PHVRECORD": [
@@ -19339,7 +19296,7 @@
                       "POSITIONOFFSET": 19
                     }
                   ], 
-                  "PHVNUMBER": 300
+                  "PHVNUMBER": 296
                 }, 
                 {
                   "PHVRECORD": [
@@ -19354,7 +19311,7 @@
                       "POSITIONOFFSET": 63
                     }
                   ], 
-                  "PHVNUMBER": 301
+                  "PHVNUMBER": 297
                 }, 
                 {
                   "PHVRECORD": [
@@ -19369,7 +19326,7 @@
                       "POSITIONOFFSET": 54
                     }
                   ], 
-                  "PHVNUMBER": 332
+                  "PHVNUMBER": 326
                 }, 
                 {
                   "PHVRECORD": [
@@ -19384,7 +19341,7 @@
                       "POSITIONOFFSET": 43
                     }
                   ], 
-                  "PHVNUMBER": 333
+                  "PHVNUMBER": 327
                 }, 
                 {
                   "PHVRECORD": [
@@ -19409,7 +19366,7 @@
                       "POSITIONOFFSET": 5
                     }
                   ], 
-                  "PHVNUMBER": 334
+                  "PHVNUMBER": 328
                 }, 
                 {
                   "PHVRECORD": [
@@ -19422,9 +19379,114 @@
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
                       "POSITIONOFFSET": 32
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_dstPort", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 48
                     }
                   ], 
-                  "PHVNUMBER": 335
+                  "PHVNUMBER": 329
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 16, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 31, 
+                      "PHVNAME": "tcp_seqNo", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 69
+                    }
+                  ], 
+                  "PHVNUMBER": 330
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_seqNo", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 69
+                    }
+                  ], 
+                  "PHVNUMBER": 331
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 6, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "ethernet_dstAddr", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 8, 
+                      "POSITIONOFFSET": 19
+                    }, 
+                    {
+                      "FIELDWIDTH": 6, 
+                      "FIELDLSB": 40, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 47, 
+                      "PHVNAME": "ethernet_srcAddr", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 63
+                    }
+                  ], 
+                  "PHVNUMBER": 332
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "ethernet_etherType", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 39
+                    }
+                  ], 
+                  "PHVNUMBER": 333
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 8, 
+                      "PHVNAME": "packet_out_hdr_egress_port", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 7, 
+                      "POSITIONOFFSET": 0
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 8, 
+                      "PHVNAME": "packet_in_hdr_ingress_port", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 7, 
+                      "POSITIONOFFSET": 30
+                    }
+                  ], 
+                  "PHVNUMBER": 334
                 }, 
                 {
                   "PHVRECORD": [
@@ -19491,111 +19553,6 @@
                     }
                   ], 
                   "PHVNUMBER": 81
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 6, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "ethernet_dstAddr", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 8, 
-                      "POSITIONOFFSET": 19
-                    }, 
-                    {
-                      "FIELDWIDTH": 6, 
-                      "FIELDLSB": 40, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 47, 
-                      "PHVNAME": "ethernet_srcAddr", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 63
-                    }
-                  ], 
-                  "PHVNUMBER": 338
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "ethernet_etherType", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 39
-                    }
-                  ], 
-                  "PHVNUMBER": 339
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 8, 
-                      "PHVNAME": "packet_out_hdr_egress_port", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 7, 
-                      "POSITIONOFFSET": 0
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 8, 
-                      "PHVNAME": "packet_in_hdr_ingress_port", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 7, 
-                      "POSITIONOFFSET": 30
-                    }
-                  ], 
-                  "PHVNUMBER": 340
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 16, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_seqNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 69
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_dstPort", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 48
-                    }
-                  ], 
-                  "PHVNUMBER": 336
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_seqNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 69
-                    }
-                  ], 
-                  "PHVNUMBER": 337
                 }
               ], 
               "TOTALEGRESSPHVS": 26
@@ -19605,7 +19562,7 @@
         }, 
         {
           "TOTALPOVHEADERS": 13, 
-          "TOTALSTAGEPHVS": 59, 
+          "TOTALSTAGEPHVS": 56, 
           "TOTALPHVRECORDS": 95, 
           "Phvs": [
             {
@@ -19685,6 +19642,31 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 31, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_dstPort", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 24, 
+                      "POSITIONOFFSET": 33
+                    }, 
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 23, 
+                      "FIELDMSB": 31, 
+                      "PHVNAME": "tcp_seqNo", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 76
+                    }
+                  ], 
+                  "PHVNUMBER": 3
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 8, 
                       "PHVMSB": 31, 
@@ -19695,7 +19677,7 @@
                       "POSITIONOFFSET": 20
                     }
                   ], 
-                  "PHVNUMBER": 3
+                  "PHVNUMBER": 4
                 }, 
                 {
                   "PHVRECORD": [
@@ -19710,31 +19692,6 @@
                       "POSITIONOFFSET": 70
                     }
                   ], 
-                  "PHVNUMBER": 4
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 31, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_srcPort", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 16, 
-                      "POSITIONOFFSET": 66
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_dstPort", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 55
-                    }
-                  ], 
                   "PHVNUMBER": 5
                 }, 
                 {
@@ -19744,10 +19701,10 @@
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "ecmp_metadata_group_id", 
+                      "PHVNAME": "ethernet_etherType", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 36
+                      "POSITIONOFFSET": 5
                     }
                   ], 
                   "PHVNUMBER": 134
@@ -19780,17 +19737,17 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 16, 
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
                       "PHVMSB": 15, 
-                      "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_ackNo", 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "ecmp_metadata_selector", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 26
+                      "POSITIONOFFSET": 61
                     }
                   ], 
-                  "PHVNUMBER": 324
+                  "PHVNUMBER": 136
                 }, 
                 {
                   "PHVRECORD": [
@@ -19920,6 +19877,31 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_srcPort", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 8, 
+                      "POSITIONOFFSET": 38
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_dstPort", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 33
+                    }
+                  ], 
+                  "PHVNUMBER": 132
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
@@ -19940,21 +19922,6 @@
                       "POSITIONOFFSET": 70
                     }
                   ], 
-                  "PHVNUMBER": 132
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "ethernet_etherType", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 5
-                    }
-                  ], 
                   "PHVNUMBER": 133
                 }, 
                 {
@@ -19985,24 +19952,24 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 8, 
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 0, 
                       "PHVMSB": 7, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_srcPort", 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_seqNo", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
+                      "POSITIONOFFSET": 76
                     }, 
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 8, 
                       "PHVMSB": 7, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "udp_length_", 
+                      "PHVNAME": "udp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 17
+                      "POSITIONOFFSET": 66
                     }
                   ], 
                   "PHVNUMBER": 289
@@ -20012,67 +19979,12 @@
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 0, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "tcp_srcPort", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "udp_length_", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 17
-                    }
-                  ], 
-                  "PHVNUMBER": 290
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 8, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_dstPort", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 33
-                    }
-                  ], 
-                  "PHVNUMBER": 291
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "tcp_dstPort", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 33
-                    }
-                  ], 
-                  "PHVNUMBER": 292
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "ecmp_metadata_selector", 
+                      "PHVNAME": "ecmp_metadata_group_id", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 61
+                      "POSITIONOFFSET": 36
                     }
                   ], 
                   "PHVNUMBER": 135
@@ -20128,6 +20040,26 @@
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
                       "POSITIONOFFSET": 46
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 31, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_length_", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 16, 
+                      "POSITIONOFFSET": 17
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_checksum", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 68
                     }
                   ], 
                   "PHVNUMBER": 257
@@ -20175,6 +20107,31 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_srcPort", 
+                      "CONTAINERWIDTH": 8, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 38
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "udp_srcPort", 
+                      "CONTAINERWIDTH": 8, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 66
+                    }
+                  ], 
+                  "PHVNUMBER": 65
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 40, 
                       "PHVMSB": 7, 
@@ -20185,7 +20142,7 @@
                       "POSITIONOFFSET": 20
                     }
                   ], 
-                  "PHVNUMBER": 65
+                  "PHVNUMBER": 66
                 }, 
                 {
                   "PHVRECORD": [
@@ -20200,7 +20157,7 @@
                       "POSITIONOFFSET": 70
                     }
                   ], 
-                  "PHVNUMBER": 66
+                  "PHVNUMBER": 67
                 }, 
                 {
                   "PHVRECORD": [
@@ -20251,7 +20208,7 @@
                       ]
                     }
                   ], 
-                  "PHVNUMBER": 67
+                  "PHVNUMBER": 68
                 }, 
                 {
                   "PHVRECORD": [
@@ -20266,22 +20223,7 @@
                       "POSITIONOFFSET": 51
                     }
                   ], 
-                  "PHVNUMBER": 68
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_ackNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 26
-                    }
-                  ], 
-                  "PHVNUMBER": 325
+                  "PHVNUMBER": 69
                 }, 
                 {
                   "PHVRECORD": [
@@ -20315,20 +20257,20 @@
                       "FIELDLSB": 16, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_seqNo", 
+                      "PHVNAME": "tcp_ackNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 76
+                      "POSITIONOFFSET": 26
                     }, 
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "udp_checksum", 
+                      "PHVNAME": "udp_dstPort", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 68
+                      "POSITIONOFFSET": 55
                     }
                   ], 
                   "PHVNUMBER": 322
@@ -20340,16 +20282,16 @@
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_seqNo", 
+                      "PHVNAME": "tcp_ackNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 76
+                      "POSITIONOFFSET": 26
                     }
                   ], 
                   "PHVNUMBER": 323
                 }
               ], 
-              "TOTALINGRESSPHVS": 33
+              "TOTALINGRESSPHVS": 30
             }, 
             {
               "PHVDIRECTION": 1, 
@@ -20387,7 +20329,7 @@
                       "POSITIONOFFSET": 9
                     }
                   ], 
-                  "PHVNUMBER": 264
+                  "PHVNUMBER": 260
                 }, 
                 {
                   "PHVRECORD": [
@@ -20402,7 +20344,7 @@
                       "POSITIONOFFSET": 12
                     }
                   ], 
-                  "PHVNUMBER": 265
+                  "PHVNUMBER": 261
                 }, 
                 {
                   "PHVRECORD": [
@@ -20417,7 +20359,7 @@
                       "POSITIONOFFSET": 50
                     }
                   ], 
-                  "PHVNUMBER": 266
+                  "PHVNUMBER": 262
                 }, 
                 {
                   "PHVRECORD": [
@@ -20452,7 +20394,7 @@
                       "POSITIONOFFSET": 59
                     }
                   ], 
-                  "PHVNUMBER": 267
+                  "PHVNUMBER": 263
                 }, 
                 {
                   "PHVRECORD": [
@@ -20507,7 +20449,7 @@
                       "POSITIONOFFSET": 41
                     }
                   ], 
-                  "PHVNUMBER": 268
+                  "PHVNUMBER": 264
                 }, 
                 {
                   "PHVRECORD": [
@@ -20532,7 +20474,7 @@
                       "POSITIONOFFSET": 45
                     }
                   ], 
-                  "PHVNUMBER": 269
+                  "PHVNUMBER": 265
                 }, 
                 {
                   "PHVRECORD": [
@@ -20547,7 +20489,7 @@
                       "POSITIONOFFSET": 19
                     }
                   ], 
-                  "PHVNUMBER": 270
+                  "PHVNUMBER": 266
                 }, 
                 {
                   "PHVRECORD": [
@@ -20562,7 +20504,7 @@
                       "POSITIONOFFSET": 63
                     }
                   ], 
-                  "PHVNUMBER": 271
+                  "PHVNUMBER": 267
                 }, 
                 {
                   "PHVRECORD": [
@@ -20602,7 +20544,7 @@
                       "POSITIONOFFSET": 37
                     }
                   ], 
-                  "PHVNUMBER": 296
+                  "PHVNUMBER": 292
                 }, 
                 {
                   "PHVRECORD": [
@@ -20617,7 +20559,7 @@
                       "POSITIONOFFSET": 4
                     }
                   ], 
-                  "PHVNUMBER": 297
+                  "PHVNUMBER": 293
                 }, 
                 {
                   "PHVRECORD": [
@@ -20642,7 +20584,7 @@
                       "POSITIONOFFSET": 56
                     }
                   ], 
-                  "PHVNUMBER": 298
+                  "PHVNUMBER": 294
                 }, 
                 {
                   "PHVRECORD": [
@@ -20667,7 +20609,7 @@
                       "POSITIONOFFSET": 56
                     }
                   ], 
-                  "PHVNUMBER": 299
+                  "PHVNUMBER": 295
                 }, 
                 {
                   "PHVRECORD": [
@@ -20682,7 +20624,7 @@
                       "POSITIONOFFSET": 19
                     }
                   ], 
-                  "PHVNUMBER": 300
+                  "PHVNUMBER": 296
                 }, 
                 {
                   "PHVRECORD": [
@@ -20697,7 +20639,7 @@
                       "POSITIONOFFSET": 63
                     }
                   ], 
-                  "PHVNUMBER": 301
+                  "PHVNUMBER": 297
                 }, 
                 {
                   "PHVRECORD": [
@@ -20712,7 +20654,7 @@
                       "POSITIONOFFSET": 54
                     }
                   ], 
-                  "PHVNUMBER": 332
+                  "PHVNUMBER": 326
                 }, 
                 {
                   "PHVRECORD": [
@@ -20727,7 +20669,7 @@
                       "POSITIONOFFSET": 43
                     }
                   ], 
-                  "PHVNUMBER": 333
+                  "PHVNUMBER": 327
                 }, 
                 {
                   "PHVRECORD": [
@@ -20752,7 +20694,7 @@
                       "POSITIONOFFSET": 5
                     }
                   ], 
-                  "PHVNUMBER": 334
+                  "PHVNUMBER": 328
                 }, 
                 {
                   "PHVRECORD": [
@@ -20765,9 +20707,114 @@
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
                       "POSITIONOFFSET": 32
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_dstPort", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 48
                     }
                   ], 
-                  "PHVNUMBER": 335
+                  "PHVNUMBER": 329
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 16, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 31, 
+                      "PHVNAME": "tcp_seqNo", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 69
+                    }
+                  ], 
+                  "PHVNUMBER": 330
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_seqNo", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 69
+                    }
+                  ], 
+                  "PHVNUMBER": 331
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 6, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "ethernet_dstAddr", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 8, 
+                      "POSITIONOFFSET": 19
+                    }, 
+                    {
+                      "FIELDWIDTH": 6, 
+                      "FIELDLSB": 40, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 47, 
+                      "PHVNAME": "ethernet_srcAddr", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 63
+                    }
+                  ], 
+                  "PHVNUMBER": 332
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "ethernet_etherType", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 39
+                    }
+                  ], 
+                  "PHVNUMBER": 333
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 8, 
+                      "PHVNAME": "packet_out_hdr_egress_port", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 7, 
+                      "POSITIONOFFSET": 0
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 8, 
+                      "PHVNAME": "packet_in_hdr_ingress_port", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 7, 
+                      "POSITIONOFFSET": 30
+                    }
+                  ], 
+                  "PHVNUMBER": 334
                 }, 
                 {
                   "PHVRECORD": [
@@ -20834,111 +20881,6 @@
                     }
                   ], 
                   "PHVNUMBER": 81
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 6, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "ethernet_dstAddr", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 8, 
-                      "POSITIONOFFSET": 19
-                    }, 
-                    {
-                      "FIELDWIDTH": 6, 
-                      "FIELDLSB": 40, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 47, 
-                      "PHVNAME": "ethernet_srcAddr", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 63
-                    }
-                  ], 
-                  "PHVNUMBER": 338
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "ethernet_etherType", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 39
-                    }
-                  ], 
-                  "PHVNUMBER": 339
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 8, 
-                      "PHVNAME": "packet_out_hdr_egress_port", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 7, 
-                      "POSITIONOFFSET": 0
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 8, 
-                      "PHVNAME": "packet_in_hdr_ingress_port", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 7, 
-                      "POSITIONOFFSET": 30
-                    }
-                  ], 
-                  "PHVNUMBER": 340
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 16, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_seqNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 69
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_dstPort", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 48
-                    }
-                  ], 
-                  "PHVNUMBER": 336
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_seqNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 69
-                    }
-                  ], 
-                  "PHVNUMBER": 337
                 }
               ], 
               "TOTALEGRESSPHVS": 26
@@ -21380,8 +21322,7 @@
         "6": "default_parser", 
         "7": "parse_pkt_out", 
         "8": "<POV initialization>_<Ingress intrinsic metadata>_<Phase 0>", 
-        "9": "start", 
-        "10": "parse_tcp//spilled"
+        "9": "start"
       }, 
       "parser_value_set": []
     }, 
@@ -21412,21 +21353,16 @@
         "stage_tables": [
           {
             "stage_number": 2, 
-            "stage_table_type": "match_with_no_key", 
-            "number_entries": 1, 
+            "stage_table_type": "hash_action", 
+            "number_entries": 1024, 
             "pack_format_length": 1, 
             "pack_format": [
               {
                 "table_word_width": 0, 
                 "memory_word_width": 0, 
-                "entries_per_table_word": 1, 
+                "entries_per_table_word": 0, 
                 "number_memory_units_per_table_word": 0, 
-                "entry_list": [
-                  {
-                    "entry_number": 0, 
-                    "field_list": []
-                  }
-                ]
+                "entry_list": []
               }
             ], 
             "memory_resource_allocation": null, 
@@ -21463,15 +21399,15 @@
                 ], 
                 "match_group_key_bit_width": 16, 
                 "match_group_phv_bit_scrambling": {
-                  "ig_intr_md_for_tm.ucast_egress_port[0]": 0, 
-                  "ig_intr_md_for_tm.ucast_egress_port[1]": 1, 
-                  "ig_intr_md_for_tm.ucast_egress_port[2]": 2, 
-                  "ig_intr_md_for_tm.ucast_egress_port[3]": 3, 
-                  "ig_intr_md_for_tm.ucast_egress_port[4]": 4, 
-                  "ig_intr_md_for_tm.ucast_egress_port[5]": 5, 
-                  "ig_intr_md_for_tm.ucast_egress_port[6]": 6, 
-                  "ig_intr_md_for_tm.ucast_egress_port[7]": 7, 
-                  "ig_intr_md_for_tm.ucast_egress_port[8]": 8
+                  "ig_intr_md_for_tm.ucast_egress_port[0]": 16, 
+                  "ig_intr_md_for_tm.ucast_egress_port[1]": 17, 
+                  "ig_intr_md_for_tm.ucast_egress_port[2]": 18, 
+                  "ig_intr_md_for_tm.ucast_egress_port[3]": 19, 
+                  "ig_intr_md_for_tm.ucast_egress_port[4]": 20, 
+                  "ig_intr_md_for_tm.ucast_egress_port[5]": 21, 
+                  "ig_intr_md_for_tm.ucast_egress_port[6]": 22, 
+                  "ig_intr_md_for_tm.ucast_egress_port[7]": 23, 
+                  "ig_intr_md_for_tm.ucast_egress_port[8]": 24
                 }, 
                 "match_group_match_bit_scrambling": {}, 
                 "seed": [
@@ -21577,8 +21513,8 @@
           {
             "name": "count_ingress", 
             "handle": 536870914, 
-            "allowed_to_be_default_action": true, 
-            "disallowed_as_default_action_reason": null, 
+            "allowed_to_be_default_action": false, 
+            "disallowed_as_default_action_reason": "USES_HASH_DIST", 
             "override_stat_addr_pfe": true, 
             "override_stat_addr": false, 
             "override_stat_full_addr": 0, 
@@ -21609,8 +21545,8 @@
         "default_action": {
           "name": "count_ingress", 
           "handle": 536870914, 
-          "allowed_to_be_default_action": true, 
-          "disallowed_as_default_action_reason": null, 
+          "allowed_to_be_default_action": false, 
+          "disallowed_as_default_action_reason": "USES_HASH_DIST", 
           "override_stat_addr_pfe": true, 
           "override_stat_addr": false, 
           "override_stat_full_addr": 0, 
@@ -21650,7 +21586,7 @@
         "p4_stateful_tables": [], 
         "p4_selection_tables": [], 
         "include_idletime": false, 
-        "performs_hash_action": false, 
+        "performs_hash_action": true, 
         "uses_range": false, 
         "number_entries_with_ranges": 0, 
         "uses_versioning": true, 
@@ -21671,21 +21607,16 @@
         "stage_tables": [
           {
             "stage_number": 2, 
-            "stage_table_type": "match_with_no_key", 
-            "number_entries": 1, 
+            "stage_table_type": "hash_action", 
+            "number_entries": 1024, 
             "pack_format_length": 1, 
             "pack_format": [
               {
                 "table_word_width": 0, 
                 "memory_word_width": 0, 
-                "entries_per_table_word": 1, 
+                "entries_per_table_word": 0, 
                 "number_memory_units_per_table_word": 0, 
-                "entry_list": [
-                  {
-                    "entry_number": 0, 
-                    "field_list": []
-                  }
-                ]
+                "entry_list": []
               }
             ], 
             "memory_resource_allocation": null, 
@@ -21818,8 +21749,8 @@
           {
             "name": "count_egress", 
             "handle": 536870916, 
-            "allowed_to_be_default_action": true, 
-            "disallowed_as_default_action_reason": null, 
+            "allowed_to_be_default_action": false, 
+            "disallowed_as_default_action_reason": "USES_HASH_DIST", 
             "override_stat_addr_pfe": true, 
             "override_stat_addr": false, 
             "override_stat_full_addr": 0, 
@@ -21850,8 +21781,8 @@
         "default_action": {
           "name": "count_egress", 
           "handle": 536870916, 
-          "allowed_to_be_default_action": true, 
-          "disallowed_as_default_action_reason": null, 
+          "allowed_to_be_default_action": false, 
+          "disallowed_as_default_action_reason": "USES_HASH_DIST", 
           "override_stat_addr_pfe": true, 
           "override_stat_addr": false, 
           "override_stat_full_addr": 0, 
@@ -21891,7 +21822,7 @@
         "p4_stateful_tables": [], 
         "p4_selection_tables": [], 
         "include_idletime": false, 
-        "performs_hash_action": false, 
+        "performs_hash_action": true, 
         "uses_range": false, 
         "number_entries_with_ranges": 0, 
         "uses_versioning": true, 
@@ -22103,7 +22034,7 @@
                 "phv_word_address": 130
               }, 
               {
-                "phv_word_address": 67
+                "phv_word_address": 68
               }
             ], 
             "indirect_resources": []
@@ -22156,7 +22087,7 @@
               "phv_word_address": 130
             }, 
             {
-              "phv_word_address": 67
+              "phv_word_address": 68
             }
           ]
         }, 
@@ -23019,16 +22950,16 @@
                   "conditional_extend": false
                 }, 
                 "total_bits": 1, 
-                "hash_algorithm": "crc32", 
-                "hash_output_width": 32
+                "hash_algorithm": "crc16", 
+                "hash_output_width": 16
               }
             ], 
             "stage_primitives": [
               {
-                "phv_word_address": 134
+                "phv_word_address": 135
               }, 
               {
-                "phv_word_address": 135
+                "phv_word_address": 136
               }
             ]
           }, 
@@ -23097,7 +23028,7 @@
                 "phv_word_address": 130
               }, 
               {
-                "phv_word_address": 67
+                "phv_word_address": 68
               }, 
               {
                 "phv_word_address": 129
@@ -23127,7 +23058,7 @@
             ], 
             "stage_primitives": [
               {
-                "phv_word_address": 68
+                "phv_word_address": 69
               }
             ]
           }
@@ -24483,16 +24414,16 @@
                   "conditional_extend": false
                 }, 
                 "total_bits": 1, 
-                "hash_algorithm": "crc32", 
-                "hash_output_width": 32
+                "hash_algorithm": "crc16", 
+                "hash_output_width": 16
               }
             ], 
             "stage_primitives": [
               {
-                "phv_word_address": 134
+                "phv_word_address": 135
               }, 
               {
-                "phv_word_address": 135
+                "phv_word_address": 136
               }
             ], 
             "indirect_resources": []
@@ -24562,7 +24493,7 @@
                 "phv_word_address": 130
               }, 
               {
-                "phv_word_address": 67
+                "phv_word_address": 68
               }, 
               {
                 "phv_word_address": 129
@@ -24593,7 +24524,7 @@
             ], 
             "stage_primitives": [
               {
-                "phv_word_address": 68
+                "phv_word_address": 69
               }
             ], 
             "indirect_resources": []
@@ -25668,7 +25599,7 @@
         "name": "ingress_port_counter", 
         "handle": 67108865, 
         "direction": "ingress", 
-        "number_entries": 510, 
+        "number_entries": 512, 
         "stage_tables_length": 1, 
         "stage_tables": [
           {
@@ -25776,7 +25707,7 @@
         "name": "egress_port_counter", 
         "handle": 67108866, 
         "direction": "ingress", 
-        "number_entries": 510, 
+        "number_entries": 512, 
         "stage_tables_length": 1, 
         "stage_tables": [
           {
@@ -26178,7 +26109,7 @@
     }, 
     {
       "0": {
-        "67": {
+        "68": {
           "0": "packet_in_hdr", 
           "1": "packet_out_hdr", 
           "2": "ethernet", 
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/context/p4_name_lookup.json b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/context/p4_name_lookup.json
index fb63358..6f61930 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/context/p4_name_lookup.json
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/context/p4_name_lookup.json
@@ -11,14 +11,13 @@
                 "6": "default_parser", 
                 "7": "parse_pkt_out", 
                 "8": "<POV initialization>", 
-                "9": "start", 
-                "10": "parse_tcp"
+                "9": "start"
             }, 
             "pov": {
                 "0": {
                     "0": "--pov_reserved--_0"
                 }, 
-                "67": {
+                "68": {
                     "0": "packet_in_hdr", 
                     "1": "packet_out_hdr", 
                     "2": "ethernet", 
@@ -58,62 +57,59 @@
                 "0": "I [POV[31:0]]", 
                 "1": "I [ipv4.protocol, ipv4.hdrChecksum, ipv4.srcAddr[31:24]]", 
                 "2": "I [ipv4.dstAddr]", 
-                "3": "I [ethernet.dstAddr[39:8]]", 
-                "4": "I [ethernet.srcAddr[31:0]]", 
-                "5": "I [udp.srcPort, udp.dstPort]", 
+                "3": "I [tcp.dstPort[7:0], tcp.seqNo[31:8]]", 
+                "4": "I [ethernet.dstAddr[39:8]]", 
+                "5": "I [ethernet.srcAddr[31:0]]", 
                 "64": "I [ipv4.srcAddr[23:16]]", 
-                "65": "I [ethernet.dstAddr[47:40]]", 
-                "66": "I [ethernet.srcAddr[39:32]]", 
-                "67": "I [POV[39:32]]", 
-                "68": "I [ig_intr_md_for_tm.drop_ctl]", 
+                "65": "I [tcp.srcPort[15:8], udp.srcPort[7:0]]", 
+                "66": "I [ethernet.dstAddr[47:40]]", 
+                "67": "I [ethernet.srcAddr[39:32]]", 
+                "68": "I [POV[39:32]]", 
+                "69": "I [ig_intr_md_for_tm.drop_ctl]", 
                 "80": "E [eg_intr_md._pad7, eg_intr_md.egress_cos]", 
                 "81": "E [POV[7:0]]", 
                 "128": "I [ig_intr_md.resubmit_flag, ig_intr_md._pad1, ig_intr_md._pad2, ig_intr_md._pad3, ig_intr_md.ingress_port]", 
                 "129": "I [packet_out_hdr.egress_port, packet_out_hdr._padding, packet_in_hdr.ingress_port, packet_in_hdr._padding]", 
                 "130": "I [ig_intr_md_for_tm.ucast_egress_port]", 
                 "131": "I [ipv4.srcAddr[15:0]]", 
-                "132": "I [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]", 
-                "133": "I [ethernet.etherType]", 
-                "134": "I [ecmp_metadata.group_id]", 
-                "135": "I [ecmp_metadata.selector]", 
+                "132": "I [tcp.srcPort[7:0], tcp.dstPort[15:8]]", 
+                "133": "I [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]", 
+                "134": "I [ethernet.etherType]", 
+                "135": "I [ecmp_metadata.group_id]", 
+                "136": "I [ecmp_metadata.selector]", 
                 "144": "E [eg_intr_md._pad0, eg_intr_md.egress_port]", 
                 "256": "I [ipv4.identification[7:0], ipv4.flags, ipv4.fragOffset, ipv4.ttl]", 
-                "257": "I [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]", 
+                "257": "I [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window, udp.length_, udp.checksum]", 
                 "258": "I [tcp.checksum, tcp.urgentPtr]", 
-                "264": "E [ipv4.ttl, ipv4.protocol, ipv4.hdrChecksum]", 
-                "265": "E [ipv4.srcAddr]", 
-                "266": "E [ipv4.dstAddr]", 
-                "267": "E [tcp.ackNo, udp.length_, udp.checksum]", 
-                "268": "E [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]", 
-                "269": "E [tcp.checksum, tcp.urgentPtr]", 
-                "270": "E [ethernet.dstAddr[39:8]]", 
-                "271": "E [ethernet.srcAddr[31:0]]", 
+                "260": "E [ipv4.ttl, ipv4.protocol, ipv4.hdrChecksum]", 
+                "261": "E [ipv4.srcAddr]", 
+                "262": "E [ipv4.dstAddr]", 
+                "263": "E [tcp.ackNo, udp.length_, udp.checksum]", 
+                "264": "E [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]", 
+                "265": "E [tcp.checksum, tcp.urgentPtr]", 
+                "266": "E [ethernet.dstAddr[39:8]]", 
+                "267": "E [ethernet.srcAddr[31:0]]", 
                 "288": "I [ipv4.version, ipv4.ihl]", 
-                "289": "I [tcp.srcPort[15:8], udp.length_[15:8]]", 
-                "290": "I [tcp.srcPort[7:0], udp.length_[7:0]]", 
-                "291": "I [tcp.dstPort[15:8]]", 
-                "292": "I [tcp.dstPort[7:0]]", 
-                "296": "E [ipv4.version, ipv4.ihl]", 
-                "297": "E [ipv4.diffserv]", 
-                "298": "E [tcp.srcPort[15:8], udp.srcPort[15:8]]", 
-                "299": "E [tcp.srcPort[7:0], udp.srcPort[7:0]]", 
-                "300": "E [ethernet.dstAddr[47:40]]", 
-                "301": "E [ethernet.srcAddr[39:32]]", 
+                "289": "I [tcp.seqNo[7:0], udp.srcPort[15:8]]", 
+                "292": "E [ipv4.version, ipv4.ihl]", 
+                "293": "E [ipv4.diffserv]", 
+                "294": "E [tcp.srcPort[15:8], udp.srcPort[15:8]]", 
+                "295": "E [tcp.srcPort[7:0], udp.srcPort[7:0]]", 
+                "296": "E [ethernet.dstAddr[47:40]]", 
+                "297": "E [ethernet.srcAddr[39:32]]", 
                 "320": "I [ipv4.diffserv, ipv4.totalLen[15:8]]", 
                 "321": "I [ipv4.totalLen[7:0], ipv4.identification[15:8]]", 
-                "322": "I [tcp.seqNo[31:16], udp.checksum]", 
-                "323": "I [tcp.seqNo[15:0]]", 
-                "324": "I [tcp.ackNo[31:16]]", 
-                "325": "I [tcp.ackNo[15:0]]", 
-                "332": "E [ipv4.totalLen]", 
-                "333": "E [ipv4.identification]", 
-                "334": "E [ipv4.flags, ipv4.fragOffset]", 
-                "335": "E [tcp.dstPort]", 
-                "336": "E [tcp.seqNo[31:16], udp.dstPort]", 
-                "337": "E [tcp.seqNo[15:0]]", 
-                "338": "E [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]", 
-                "339": "E [ethernet.etherType]", 
-                "340": "E [packet_out_hdr.egress_port, packet_out_hdr._padding, packet_in_hdr.ingress_port, packet_in_hdr._padding]"
+                "322": "I [tcp.ackNo[31:16], udp.dstPort]", 
+                "323": "I [tcp.ackNo[15:0]]", 
+                "326": "E [ipv4.totalLen]", 
+                "327": "E [ipv4.identification]", 
+                "328": "E [ipv4.flags, ipv4.fragOffset]", 
+                "329": "E [tcp.dstPort, udp.dstPort]", 
+                "330": "E [tcp.seqNo[31:16]]", 
+                "331": "E [tcp.seqNo[15:0]]", 
+                "332": "E [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]", 
+                "333": "E [ethernet.etherType]", 
+                "334": "E [packet_out_hdr.egress_port, packet_out_hdr._padding, packet_in_hdr.ingress_port, packet_in_hdr._padding]"
             }, 
             "logical_tables": {
                 "0": {
@@ -139,7 +135,7 @@
                                                 "field_instance_most_significant_bit": 15, 
                                                 "phv_container_least_significant_bit": 0, 
                                                 "phv_container_most_significant_bit": 15, 
-                                                "word_address": 134
+                                                "word_address": 135
                                             }
                                         ], 
                                         "type": "phv"
@@ -161,7 +157,7 @@
                                                 "field_instance_most_significant_bit": 15, 
                                                 "phv_container_least_significant_bit": 0, 
                                                 "phv_container_most_significant_bit": 15, 
-                                                "word_address": 135
+                                                "word_address": 136
                                             }
                                         ], 
                                         "type": "phv"
@@ -279,21 +275,21 @@
                                 "field_instance_most_significant_bit": 47, 
                                 "phv_container_least_significant_bit": 0, 
                                 "phv_container_most_significant_bit": 7, 
-                                "word_address": 65
+                                "word_address": 66
                             }, 
                             {
                                 "field_instance_least_significant_bit": 8, 
                                 "field_instance_most_significant_bit": 39, 
                                 "phv_container_least_significant_bit": 0, 
                                 "phv_container_most_significant_bit": 31, 
-                                "word_address": 3
+                                "word_address": 4
                             }, 
                             {
                                 "field_instance_least_significant_bit": 0, 
                                 "field_instance_most_significant_bit": 7, 
                                 "phv_container_least_significant_bit": 8, 
                                 "phv_container_most_significant_bit": 15, 
-                                "word_address": 132
+                                "word_address": 133
                             }
                         ], 
                         "ethernet_etherType": [
@@ -302,7 +298,7 @@
                                 "field_instance_most_significant_bit": 15, 
                                 "phv_container_least_significant_bit": 0, 
                                 "phv_container_most_significant_bit": 15, 
-                                "word_address": 133
+                                "word_address": 134
                             }
                         ], 
                         "ethernet_srcAddr": [
@@ -311,21 +307,21 @@
                                 "field_instance_most_significant_bit": 47, 
                                 "phv_container_least_significant_bit": 0, 
                                 "phv_container_most_significant_bit": 7, 
-                                "word_address": 132
+                                "word_address": 133
                             }, 
                             {
                                 "field_instance_least_significant_bit": 32, 
                                 "field_instance_most_significant_bit": 39, 
                                 "phv_container_least_significant_bit": 0, 
                                 "phv_container_most_significant_bit": 7, 
-                                "word_address": 66
+                                "word_address": 67
                             }, 
                             {
                                 "field_instance_least_significant_bit": 0, 
                                 "field_instance_most_significant_bit": 31, 
                                 "phv_container_least_significant_bit": 0, 
                                 "phv_container_most_significant_bit": 31, 
-                                "word_address": 4
+                                "word_address": 5
                             }
                         ], 
                         "ig_intr_md_ingress_port": [
@@ -401,62 +397,59 @@
                 "0": "I [POV[31:0]]", 
                 "1": "I [ipv4.protocol, ipv4.hdrChecksum, ipv4.srcAddr[31:24]]", 
                 "2": "I [ipv4.dstAddr]", 
-                "3": "I [ethernet.dstAddr[39:8]]", 
-                "4": "I [ethernet.srcAddr[31:0]]", 
-                "5": "I [udp.srcPort, udp.dstPort]", 
+                "3": "I [tcp.dstPort[7:0], tcp.seqNo[31:8]]", 
+                "4": "I [ethernet.dstAddr[39:8]]", 
+                "5": "I [ethernet.srcAddr[31:0]]", 
                 "64": "I [ipv4.srcAddr[23:16]]", 
-                "65": "I [ethernet.dstAddr[47:40]]", 
-                "66": "I [ethernet.srcAddr[39:32]]", 
-                "67": "I [POV[39:32]]", 
-                "68": "I [ig_intr_md_for_tm.drop_ctl]", 
+                "65": "I [tcp.srcPort[15:8], udp.srcPort[7:0]]", 
+                "66": "I [ethernet.dstAddr[47:40]]", 
+                "67": "I [ethernet.srcAddr[39:32]]", 
+                "68": "I [POV[39:32]]", 
+                "69": "I [ig_intr_md_for_tm.drop_ctl]", 
                 "80": "E [eg_intr_md._pad7, eg_intr_md.egress_cos]", 
                 "81": "E [POV[7:0]]", 
                 "128": "I [ig_intr_md.resubmit_flag, ig_intr_md._pad1, ig_intr_md._pad2, ig_intr_md._pad3, ig_intr_md.ingress_port]", 
                 "129": "I [packet_out_hdr.egress_port, packet_out_hdr._padding, packet_in_hdr.ingress_port, packet_in_hdr._padding]", 
                 "130": "I [ig_intr_md_for_tm.ucast_egress_port]", 
                 "131": "I [ipv4.srcAddr[15:0]]", 
-                "132": "I [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]", 
-                "133": "I [ethernet.etherType]", 
-                "134": "I [ecmp_metadata.group_id]", 
-                "135": "I [ecmp_metadata.selector]", 
+                "132": "I [tcp.srcPort[7:0], tcp.dstPort[15:8]]", 
+                "133": "I [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]", 
+                "134": "I [ethernet.etherType]", 
+                "135": "I [ecmp_metadata.group_id]", 
+                "136": "I [ecmp_metadata.selector]", 
                 "144": "E [eg_intr_md._pad0, eg_intr_md.egress_port]", 
                 "256": "I [ipv4.identification[7:0], ipv4.flags, ipv4.fragOffset, ipv4.ttl]", 
-                "257": "I [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]", 
+                "257": "I [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window, udp.length_, udp.checksum]", 
                 "258": "I [tcp.checksum, tcp.urgentPtr]", 
-                "264": "E [ipv4.ttl, ipv4.protocol, ipv4.hdrChecksum]", 
-                "265": "E [ipv4.srcAddr]", 
-                "266": "E [ipv4.dstAddr]", 
-                "267": "E [tcp.ackNo, udp.length_, udp.checksum]", 
-                "268": "E [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]", 
-                "269": "E [tcp.checksum, tcp.urgentPtr]", 
-                "270": "E [ethernet.dstAddr[39:8]]", 
-                "271": "E [ethernet.srcAddr[31:0]]", 
+                "260": "E [ipv4.ttl, ipv4.protocol, ipv4.hdrChecksum]", 
+                "261": "E [ipv4.srcAddr]", 
+                "262": "E [ipv4.dstAddr]", 
+                "263": "E [tcp.ackNo, udp.length_, udp.checksum]", 
+                "264": "E [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]", 
+                "265": "E [tcp.checksum, tcp.urgentPtr]", 
+                "266": "E [ethernet.dstAddr[39:8]]", 
+                "267": "E [ethernet.srcAddr[31:0]]", 
                 "288": "I [ipv4.version, ipv4.ihl]", 
-                "289": "I [tcp.srcPort[15:8], udp.length_[15:8]]", 
-                "290": "I [tcp.srcPort[7:0], udp.length_[7:0]]", 
-                "291": "I [tcp.dstPort[15:8]]", 
-                "292": "I [tcp.dstPort[7:0]]", 
-                "296": "E [ipv4.version, ipv4.ihl]", 
-                "297": "E [ipv4.diffserv]", 
-                "298": "E [tcp.srcPort[15:8], udp.srcPort[15:8]]", 
-                "299": "E [tcp.srcPort[7:0], udp.srcPort[7:0]]", 
-                "300": "E [ethernet.dstAddr[47:40]]", 
-                "301": "E [ethernet.srcAddr[39:32]]", 
+                "289": "I [tcp.seqNo[7:0], udp.srcPort[15:8]]", 
+                "292": "E [ipv4.version, ipv4.ihl]", 
+                "293": "E [ipv4.diffserv]", 
+                "294": "E [tcp.srcPort[15:8], udp.srcPort[15:8]]", 
+                "295": "E [tcp.srcPort[7:0], udp.srcPort[7:0]]", 
+                "296": "E [ethernet.dstAddr[47:40]]", 
+                "297": "E [ethernet.srcAddr[39:32]]", 
                 "320": "I [ipv4.diffserv, ipv4.totalLen[15:8]]", 
                 "321": "I [ipv4.totalLen[7:0], ipv4.identification[15:8]]", 
-                "322": "I [tcp.seqNo[31:16], udp.checksum]", 
-                "323": "I [tcp.seqNo[15:0]]", 
-                "324": "I [tcp.ackNo[31:16]]", 
-                "325": "I [tcp.ackNo[15:0]]", 
-                "332": "E [ipv4.totalLen]", 
-                "333": "E [ipv4.identification]", 
-                "334": "E [ipv4.flags, ipv4.fragOffset]", 
-                "335": "E [tcp.dstPort]", 
-                "336": "E [tcp.seqNo[31:16], udp.dstPort]", 
-                "337": "E [tcp.seqNo[15:0]]", 
-                "338": "E [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]", 
-                "339": "E [ethernet.etherType]", 
-                "340": "E [packet_out_hdr.egress_port, packet_out_hdr._padding, packet_in_hdr.ingress_port, packet_in_hdr._padding]"
+                "322": "I [tcp.ackNo[31:16], udp.dstPort]", 
+                "323": "I [tcp.ackNo[15:0]]", 
+                "326": "E [ipv4.totalLen]", 
+                "327": "E [ipv4.identification]", 
+                "328": "E [ipv4.flags, ipv4.fragOffset]", 
+                "329": "E [tcp.dstPort, udp.dstPort]", 
+                "330": "E [tcp.seqNo[31:16]]", 
+                "331": "E [tcp.seqNo[15:0]]", 
+                "332": "E [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]", 
+                "333": "E [ethernet.etherType]", 
+                "334": "E [packet_out_hdr.egress_port, packet_out_hdr._padding, packet_in_hdr.ingress_port, packet_in_hdr._padding]"
             }, 
             "logical_tables": {
                 "0": {
@@ -500,7 +493,7 @@
                                 "field_instance_most_significant_bit": 15, 
                                 "phv_container_least_significant_bit": 0, 
                                 "phv_container_most_significant_bit": 15, 
-                                "word_address": 134
+                                "word_address": 135
                             }
                         ], 
                         "ecmp_metadata_selector": [
@@ -509,7 +502,7 @@
                                 "field_instance_most_significant_bit": 15, 
                                 "phv_container_least_significant_bit": 0, 
                                 "phv_container_most_significant_bit": 15, 
-                                "word_address": 135
+                                "word_address": 136
                             }
                         ]
                     }, 
@@ -523,62 +516,59 @@
                 "0": "I [POV[31:0]]", 
                 "1": "I [ipv4.protocol, ipv4.hdrChecksum, ipv4.srcAddr[31:24]]", 
                 "2": "I [ipv4.dstAddr]", 
-                "3": "I [ethernet.dstAddr[39:8]]", 
-                "4": "I [ethernet.srcAddr[31:0]]", 
-                "5": "I [udp.srcPort, udp.dstPort]", 
+                "3": "I [tcp.dstPort[7:0], tcp.seqNo[31:8]]", 
+                "4": "I [ethernet.dstAddr[39:8]]", 
+                "5": "I [ethernet.srcAddr[31:0]]", 
                 "64": "I [ipv4.srcAddr[23:16]]", 
-                "65": "I [ethernet.dstAddr[47:40]]", 
-                "66": "I [ethernet.srcAddr[39:32]]", 
-                "67": "I [POV[39:32]]", 
-                "68": "I [ig_intr_md_for_tm.drop_ctl]", 
+                "65": "I [tcp.srcPort[15:8], udp.srcPort[7:0]]", 
+                "66": "I [ethernet.dstAddr[47:40]]", 
+                "67": "I [ethernet.srcAddr[39:32]]", 
+                "68": "I [POV[39:32]]", 
+                "69": "I [ig_intr_md_for_tm.drop_ctl]", 
                 "80": "E [eg_intr_md._pad7, eg_intr_md.egress_cos]", 
                 "81": "E [POV[7:0]]", 
                 "128": "I [ig_intr_md.resubmit_flag, ig_intr_md._pad1, ig_intr_md._pad2, ig_intr_md._pad3, ig_intr_md.ingress_port]", 
                 "129": "I [packet_out_hdr.egress_port, packet_out_hdr._padding, packet_in_hdr.ingress_port, packet_in_hdr._padding]", 
                 "130": "I [ig_intr_md_for_tm.ucast_egress_port]", 
                 "131": "I [ipv4.srcAddr[15:0]]", 
-                "132": "I [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]", 
-                "133": "I [ethernet.etherType]", 
-                "134": "I [ecmp_metadata.group_id]", 
-                "135": "I [ecmp_metadata.selector]", 
+                "132": "I [tcp.srcPort[7:0], tcp.dstPort[15:8]]", 
+                "133": "I [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]", 
+                "134": "I [ethernet.etherType]", 
+                "135": "I [ecmp_metadata.group_id]", 
+                "136": "I [ecmp_metadata.selector]", 
                 "144": "E [eg_intr_md._pad0, eg_intr_md.egress_port]", 
                 "256": "I [ipv4.identification[7:0], ipv4.flags, ipv4.fragOffset, ipv4.ttl]", 
-                "257": "I [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]", 
+                "257": "I [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window, udp.length_, udp.checksum]", 
                 "258": "I [tcp.checksum, tcp.urgentPtr]", 
-                "264": "E [ipv4.ttl, ipv4.protocol, ipv4.hdrChecksum]", 
-                "265": "E [ipv4.srcAddr]", 
-                "266": "E [ipv4.dstAddr]", 
-                "267": "E [tcp.ackNo, udp.length_, udp.checksum]", 
-                "268": "E [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]", 
-                "269": "E [tcp.checksum, tcp.urgentPtr]", 
-                "270": "E [ethernet.dstAddr[39:8]]", 
-                "271": "E [ethernet.srcAddr[31:0]]", 
+                "260": "E [ipv4.ttl, ipv4.protocol, ipv4.hdrChecksum]", 
+                "261": "E [ipv4.srcAddr]", 
+                "262": "E [ipv4.dstAddr]", 
+                "263": "E [tcp.ackNo, udp.length_, udp.checksum]", 
+                "264": "E [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]", 
+                "265": "E [tcp.checksum, tcp.urgentPtr]", 
+                "266": "E [ethernet.dstAddr[39:8]]", 
+                "267": "E [ethernet.srcAddr[31:0]]", 
                 "288": "I [ipv4.version, ipv4.ihl]", 
-                "289": "I [tcp.srcPort[15:8], udp.length_[15:8]]", 
-                "290": "I [tcp.srcPort[7:0], udp.length_[7:0]]", 
-                "291": "I [tcp.dstPort[15:8]]", 
-                "292": "I [tcp.dstPort[7:0]]", 
-                "296": "E [ipv4.version, ipv4.ihl]", 
-                "297": "E [ipv4.diffserv]", 
-                "298": "E [tcp.srcPort[15:8], udp.srcPort[15:8]]", 
-                "299": "E [tcp.srcPort[7:0], udp.srcPort[7:0]]", 
-                "300": "E [ethernet.dstAddr[47:40]]", 
-                "301": "E [ethernet.srcAddr[39:32]]", 
+                "289": "I [tcp.seqNo[7:0], udp.srcPort[15:8]]", 
+                "292": "E [ipv4.version, ipv4.ihl]", 
+                "293": "E [ipv4.diffserv]", 
+                "294": "E [tcp.srcPort[15:8], udp.srcPort[15:8]]", 
+                "295": "E [tcp.srcPort[7:0], udp.srcPort[7:0]]", 
+                "296": "E [ethernet.dstAddr[47:40]]", 
+                "297": "E [ethernet.srcAddr[39:32]]", 
                 "320": "I [ipv4.diffserv, ipv4.totalLen[15:8]]", 
                 "321": "I [ipv4.totalLen[7:0], ipv4.identification[15:8]]", 
-                "322": "I [tcp.seqNo[31:16], udp.checksum]", 
-                "323": "I [tcp.seqNo[15:0]]", 
-                "324": "I [tcp.ackNo[31:16]]", 
-                "325": "I [tcp.ackNo[15:0]]", 
-                "332": "E [ipv4.totalLen]", 
-                "333": "E [ipv4.identification]", 
-                "334": "E [ipv4.flags, ipv4.fragOffset]", 
-                "335": "E [tcp.dstPort]", 
-                "336": "E [tcp.seqNo[31:16], udp.dstPort]", 
-                "337": "E [tcp.seqNo[15:0]]", 
-                "338": "E [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]", 
-                "339": "E [ethernet.etherType]", 
-                "340": "E [packet_out_hdr.egress_port, packet_out_hdr._padding, packet_in_hdr.ingress_port, packet_in_hdr._padding]"
+                "322": "I [tcp.ackNo[31:16], udp.dstPort]", 
+                "323": "I [tcp.ackNo[15:0]]", 
+                "326": "E [ipv4.totalLen]", 
+                "327": "E [ipv4.identification]", 
+                "328": "E [ipv4.flags, ipv4.fragOffset]", 
+                "329": "E [tcp.dstPort, udp.dstPort]", 
+                "330": "E [tcp.seqNo[31:16]]", 
+                "331": "E [tcp.seqNo[15:0]]", 
+                "332": "E [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]", 
+                "333": "E [ethernet.etherType]", 
+                "334": "E [packet_out_hdr.egress_port, packet_out_hdr._padding, packet_in_hdr.ingress_port, packet_in_hdr._padding]"
             }, 
             "logical_tables": {
                 "0": {
@@ -633,62 +623,59 @@
                 "0": "I [POV[31:0]]", 
                 "1": "I [ipv4.protocol, ipv4.hdrChecksum, ipv4.srcAddr[31:24]]", 
                 "2": "I [ipv4.dstAddr]", 
-                "3": "I [ethernet.dstAddr[39:8]]", 
-                "4": "I [ethernet.srcAddr[31:0]]", 
-                "5": "I [udp.srcPort, udp.dstPort]", 
+                "3": "I [tcp.dstPort[7:0], tcp.seqNo[31:8]]", 
+                "4": "I [ethernet.dstAddr[39:8]]", 
+                "5": "I [ethernet.srcAddr[31:0]]", 
                 "64": "I [ipv4.srcAddr[23:16]]", 
-                "65": "I [ethernet.dstAddr[47:40]]", 
-                "66": "I [ethernet.srcAddr[39:32]]", 
-                "67": "I [POV[39:32]]", 
-                "68": "I [ig_intr_md_for_tm.drop_ctl]", 
+                "65": "I [tcp.srcPort[15:8], udp.srcPort[7:0]]", 
+                "66": "I [ethernet.dstAddr[47:40]]", 
+                "67": "I [ethernet.srcAddr[39:32]]", 
+                "68": "I [POV[39:32]]", 
+                "69": "I [ig_intr_md_for_tm.drop_ctl]", 
                 "80": "E [eg_intr_md._pad7, eg_intr_md.egress_cos]", 
                 "81": "E [POV[7:0]]", 
                 "128": "I [ig_intr_md.resubmit_flag, ig_intr_md._pad1, ig_intr_md._pad2, ig_intr_md._pad3, ig_intr_md.ingress_port]", 
                 "129": "I [packet_out_hdr.egress_port, packet_out_hdr._padding, packet_in_hdr.ingress_port, packet_in_hdr._padding]", 
                 "130": "I [ig_intr_md_for_tm.ucast_egress_port]", 
                 "131": "I [ipv4.srcAddr[15:0]]", 
-                "132": "I [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]", 
-                "133": "I [ethernet.etherType]", 
-                "134": "I [ecmp_metadata.group_id]", 
-                "135": "I [ecmp_metadata.selector]", 
+                "132": "I [tcp.srcPort[7:0], tcp.dstPort[15:8]]", 
+                "133": "I [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]", 
+                "134": "I [ethernet.etherType]", 
+                "135": "I [ecmp_metadata.group_id]", 
+                "136": "I [ecmp_metadata.selector]", 
                 "144": "E [eg_intr_md._pad0, eg_intr_md.egress_port]", 
                 "256": "I [ipv4.identification[7:0], ipv4.flags, ipv4.fragOffset, ipv4.ttl]", 
-                "257": "I [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]", 
+                "257": "I [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window, udp.length_, udp.checksum]", 
                 "258": "I [tcp.checksum, tcp.urgentPtr]", 
-                "264": "E [ipv4.ttl, ipv4.protocol, ipv4.hdrChecksum]", 
-                "265": "E [ipv4.srcAddr]", 
-                "266": "E [ipv4.dstAddr]", 
-                "267": "E [tcp.ackNo, udp.length_, udp.checksum]", 
-                "268": "E [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]", 
-                "269": "E [tcp.checksum, tcp.urgentPtr]", 
-                "270": "E [ethernet.dstAddr[39:8]]", 
-                "271": "E [ethernet.srcAddr[31:0]]", 
+                "260": "E [ipv4.ttl, ipv4.protocol, ipv4.hdrChecksum]", 
+                "261": "E [ipv4.srcAddr]", 
+                "262": "E [ipv4.dstAddr]", 
+                "263": "E [tcp.ackNo, udp.length_, udp.checksum]", 
+                "264": "E [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]", 
+                "265": "E [tcp.checksum, tcp.urgentPtr]", 
+                "266": "E [ethernet.dstAddr[39:8]]", 
+                "267": "E [ethernet.srcAddr[31:0]]", 
                 "288": "I [ipv4.version, ipv4.ihl]", 
-                "289": "I [tcp.srcPort[15:8], udp.length_[15:8]]", 
-                "290": "I [tcp.srcPort[7:0], udp.length_[7:0]]", 
-                "291": "I [tcp.dstPort[15:8]]", 
-                "292": "I [tcp.dstPort[7:0]]", 
-                "296": "E [ipv4.version, ipv4.ihl]", 
-                "297": "E [ipv4.diffserv]", 
-                "298": "E [tcp.srcPort[15:8], udp.srcPort[15:8]]", 
-                "299": "E [tcp.srcPort[7:0], udp.srcPort[7:0]]", 
-                "300": "E [ethernet.dstAddr[47:40]]", 
-                "301": "E [ethernet.srcAddr[39:32]]", 
+                "289": "I [tcp.seqNo[7:0], udp.srcPort[15:8]]", 
+                "292": "E [ipv4.version, ipv4.ihl]", 
+                "293": "E [ipv4.diffserv]", 
+                "294": "E [tcp.srcPort[15:8], udp.srcPort[15:8]]", 
+                "295": "E [tcp.srcPort[7:0], udp.srcPort[7:0]]", 
+                "296": "E [ethernet.dstAddr[47:40]]", 
+                "297": "E [ethernet.srcAddr[39:32]]", 
                 "320": "I [ipv4.diffserv, ipv4.totalLen[15:8]]", 
                 "321": "I [ipv4.totalLen[7:0], ipv4.identification[15:8]]", 
-                "322": "I [tcp.seqNo[31:16], udp.checksum]", 
-                "323": "I [tcp.seqNo[15:0]]", 
-                "324": "I [tcp.ackNo[31:16]]", 
-                "325": "I [tcp.ackNo[15:0]]", 
-                "332": "E [ipv4.totalLen]", 
-                "333": "E [ipv4.identification]", 
-                "334": "E [ipv4.flags, ipv4.fragOffset]", 
-                "335": "E [tcp.dstPort]", 
-                "336": "E [tcp.seqNo[31:16], udp.dstPort]", 
-                "337": "E [tcp.seqNo[15:0]]", 
-                "338": "E [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]", 
-                "339": "E [ethernet.etherType]", 
-                "340": "E [packet_out_hdr.egress_port, packet_out_hdr._padding, packet_in_hdr.ingress_port, packet_in_hdr._padding]"
+                "322": "I [tcp.ackNo[31:16], udp.dstPort]", 
+                "323": "I [tcp.ackNo[15:0]]", 
+                "326": "E [ipv4.totalLen]", 
+                "327": "E [ipv4.identification]", 
+                "328": "E [ipv4.flags, ipv4.fragOffset]", 
+                "329": "E [tcp.dstPort, udp.dstPort]", 
+                "330": "E [tcp.seqNo[31:16]]", 
+                "331": "E [tcp.seqNo[15:0]]", 
+                "332": "E [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]", 
+                "333": "E [ethernet.etherType]", 
+                "334": "E [packet_out_hdr.egress_port, packet_out_hdr._padding, packet_in_hdr.ingress_port, packet_in_hdr._padding]"
             }, 
             "logical_tables": {}, 
             "stateful_tables": []
@@ -698,62 +685,59 @@
                 "0": "I [POV[31:0]]", 
                 "1": "I [ipv4.protocol, ipv4.hdrChecksum, ipv4.srcAddr[31:24]]", 
                 "2": "I [ipv4.dstAddr]", 
-                "3": "I [ethernet.dstAddr[39:8]]", 
-                "4": "I [ethernet.srcAddr[31:0]]", 
-                "5": "I [udp.srcPort, udp.dstPort]", 
+                "3": "I [tcp.dstPort[7:0], tcp.seqNo[31:8]]", 
+                "4": "I [ethernet.dstAddr[39:8]]", 
+                "5": "I [ethernet.srcAddr[31:0]]", 
                 "64": "I [ipv4.srcAddr[23:16]]", 
-                "65": "I [ethernet.dstAddr[47:40]]", 
-                "66": "I [ethernet.srcAddr[39:32]]", 
-                "67": "I [POV[39:32]]", 
-                "68": "I [ig_intr_md_for_tm.drop_ctl]", 
+                "65": "I [tcp.srcPort[15:8], udp.srcPort[7:0]]", 
+                "66": "I [ethernet.dstAddr[47:40]]", 
+                "67": "I [ethernet.srcAddr[39:32]]", 
+                "68": "I [POV[39:32]]", 
+                "69": "I [ig_intr_md_for_tm.drop_ctl]", 
                 "80": "E [eg_intr_md._pad7, eg_intr_md.egress_cos]", 
                 "81": "E [POV[7:0]]", 
                 "128": "I [ig_intr_md.resubmit_flag, ig_intr_md._pad1, ig_intr_md._pad2, ig_intr_md._pad3, ig_intr_md.ingress_port]", 
                 "129": "I [packet_out_hdr.egress_port, packet_out_hdr._padding, packet_in_hdr.ingress_port, packet_in_hdr._padding]", 
                 "130": "I [ig_intr_md_for_tm.ucast_egress_port]", 
                 "131": "I [ipv4.srcAddr[15:0]]", 
-                "132": "I [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]", 
-                "133": "I [ethernet.etherType]", 
-                "134": "I [ecmp_metadata.group_id]", 
-                "135": "I [ecmp_metadata.selector]", 
+                "132": "I [tcp.srcPort[7:0], tcp.dstPort[15:8]]", 
+                "133": "I [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]", 
+                "134": "I [ethernet.etherType]", 
+                "135": "I [ecmp_metadata.group_id]", 
+                "136": "I [ecmp_metadata.selector]", 
                 "144": "E [eg_intr_md._pad0, eg_intr_md.egress_port]", 
                 "256": "I [ipv4.identification[7:0], ipv4.flags, ipv4.fragOffset, ipv4.ttl]", 
-                "257": "I [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]", 
+                "257": "I [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window, udp.length_, udp.checksum]", 
                 "258": "I [tcp.checksum, tcp.urgentPtr]", 
-                "264": "E [ipv4.ttl, ipv4.protocol, ipv4.hdrChecksum]", 
-                "265": "E [ipv4.srcAddr]", 
-                "266": "E [ipv4.dstAddr]", 
-                "267": "E [tcp.ackNo, udp.length_, udp.checksum]", 
-                "268": "E [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]", 
-                "269": "E [tcp.checksum, tcp.urgentPtr]", 
-                "270": "E [ethernet.dstAddr[39:8]]", 
-                "271": "E [ethernet.srcAddr[31:0]]", 
+                "260": "E [ipv4.ttl, ipv4.protocol, ipv4.hdrChecksum]", 
+                "261": "E [ipv4.srcAddr]", 
+                "262": "E [ipv4.dstAddr]", 
+                "263": "E [tcp.ackNo, udp.length_, udp.checksum]", 
+                "264": "E [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]", 
+                "265": "E [tcp.checksum, tcp.urgentPtr]", 
+                "266": "E [ethernet.dstAddr[39:8]]", 
+                "267": "E [ethernet.srcAddr[31:0]]", 
                 "288": "I [ipv4.version, ipv4.ihl]", 
-                "289": "I [tcp.srcPort[15:8], udp.length_[15:8]]", 
-                "290": "I [tcp.srcPort[7:0], udp.length_[7:0]]", 
-                "291": "I [tcp.dstPort[15:8]]", 
-                "292": "I [tcp.dstPort[7:0]]", 
-                "296": "E [ipv4.version, ipv4.ihl]", 
-                "297": "E [ipv4.diffserv]", 
-                "298": "E [tcp.srcPort[15:8], udp.srcPort[15:8]]", 
-                "299": "E [tcp.srcPort[7:0], udp.srcPort[7:0]]", 
-                "300": "E [ethernet.dstAddr[47:40]]", 
-                "301": "E [ethernet.srcAddr[39:32]]", 
+                "289": "I [tcp.seqNo[7:0], udp.srcPort[15:8]]", 
+                "292": "E [ipv4.version, ipv4.ihl]", 
+                "293": "E [ipv4.diffserv]", 
+                "294": "E [tcp.srcPort[15:8], udp.srcPort[15:8]]", 
+                "295": "E [tcp.srcPort[7:0], udp.srcPort[7:0]]", 
+                "296": "E [ethernet.dstAddr[47:40]]", 
+                "297": "E [ethernet.srcAddr[39:32]]", 
                 "320": "I [ipv4.diffserv, ipv4.totalLen[15:8]]", 
                 "321": "I [ipv4.totalLen[7:0], ipv4.identification[15:8]]", 
-                "322": "I [tcp.seqNo[31:16], udp.checksum]", 
-                "323": "I [tcp.seqNo[15:0]]", 
-                "324": "I [tcp.ackNo[31:16]]", 
-                "325": "I [tcp.ackNo[15:0]]", 
-                "332": "E [ipv4.totalLen]", 
-                "333": "E [ipv4.identification]", 
-                "334": "E [ipv4.flags, ipv4.fragOffset]", 
-                "335": "E [tcp.dstPort]", 
-                "336": "E [tcp.seqNo[31:16], udp.dstPort]", 
-                "337": "E [tcp.seqNo[15:0]]", 
-                "338": "E [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]", 
-                "339": "E [ethernet.etherType]", 
-                "340": "E [packet_out_hdr.egress_port, packet_out_hdr._padding, packet_in_hdr.ingress_port, packet_in_hdr._padding]"
+                "322": "I [tcp.ackNo[31:16], udp.dstPort]", 
+                "323": "I [tcp.ackNo[15:0]]", 
+                "326": "E [ipv4.totalLen]", 
+                "327": "E [ipv4.identification]", 
+                "328": "E [ipv4.flags, ipv4.fragOffset]", 
+                "329": "E [tcp.dstPort, udp.dstPort]", 
+                "330": "E [tcp.seqNo[31:16]]", 
+                "331": "E [tcp.seqNo[15:0]]", 
+                "332": "E [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]", 
+                "333": "E [ethernet.etherType]", 
+                "334": "E [packet_out_hdr.egress_port, packet_out_hdr._padding, packet_in_hdr.ingress_port, packet_in_hdr._padding]"
             }, 
             "logical_tables": {}, 
             "stateful_tables": []
@@ -763,62 +747,59 @@
                 "0": "I [POV[31:0]]", 
                 "1": "I [ipv4.protocol, ipv4.hdrChecksum, ipv4.srcAddr[31:24]]", 
                 "2": "I [ipv4.dstAddr]", 
-                "3": "I [ethernet.dstAddr[39:8]]", 
-                "4": "I [ethernet.srcAddr[31:0]]", 
-                "5": "I [udp.srcPort, udp.dstPort]", 
+                "3": "I [tcp.dstPort[7:0], tcp.seqNo[31:8]]", 
+                "4": "I [ethernet.dstAddr[39:8]]", 
+                "5": "I [ethernet.srcAddr[31:0]]", 
                 "64": "I [ipv4.srcAddr[23:16]]", 
-                "65": "I [ethernet.dstAddr[47:40]]", 
-                "66": "I [ethernet.srcAddr[39:32]]", 
-                "67": "I [POV[39:32]]", 
-                "68": "I [ig_intr_md_for_tm.drop_ctl]", 
+                "65": "I [tcp.srcPort[15:8], udp.srcPort[7:0]]", 
+                "66": "I [ethernet.dstAddr[47:40]]", 
+                "67": "I [ethernet.srcAddr[39:32]]", 
+                "68": "I [POV[39:32]]", 
+                "69": "I [ig_intr_md_for_tm.drop_ctl]", 
                 "80": "E [eg_intr_md._pad7, eg_intr_md.egress_cos]", 
                 "81": "E [POV[7:0]]", 
                 "128": "I [ig_intr_md.resubmit_flag, ig_intr_md._pad1, ig_intr_md._pad2, ig_intr_md._pad3, ig_intr_md.ingress_port]", 
                 "129": "I [packet_out_hdr.egress_port, packet_out_hdr._padding, packet_in_hdr.ingress_port, packet_in_hdr._padding]", 
                 "130": "I [ig_intr_md_for_tm.ucast_egress_port]", 
                 "131": "I [ipv4.srcAddr[15:0]]", 
-                "132": "I [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]", 
-                "133": "I [ethernet.etherType]", 
-                "134": "I [ecmp_metadata.group_id]", 
-                "135": "I [ecmp_metadata.selector]", 
+                "132": "I [tcp.srcPort[7:0], tcp.dstPort[15:8]]", 
+                "133": "I [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]", 
+                "134": "I [ethernet.etherType]", 
+                "135": "I [ecmp_metadata.group_id]", 
+                "136": "I [ecmp_metadata.selector]", 
                 "144": "E [eg_intr_md._pad0, eg_intr_md.egress_port]", 
                 "256": "I [ipv4.identification[7:0], ipv4.flags, ipv4.fragOffset, ipv4.ttl]", 
-                "257": "I [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]", 
+                "257": "I [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window, udp.length_, udp.checksum]", 
                 "258": "I [tcp.checksum, tcp.urgentPtr]", 
-                "264": "E [ipv4.ttl, ipv4.protocol, ipv4.hdrChecksum]", 
-                "265": "E [ipv4.srcAddr]", 
-                "266": "E [ipv4.dstAddr]", 
-                "267": "E [tcp.ackNo, udp.length_, udp.checksum]", 
-                "268": "E [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]", 
-                "269": "E [tcp.checksum, tcp.urgentPtr]", 
-                "270": "E [ethernet.dstAddr[39:8]]", 
-                "271": "E [ethernet.srcAddr[31:0]]", 
+                "260": "E [ipv4.ttl, ipv4.protocol, ipv4.hdrChecksum]", 
+                "261": "E [ipv4.srcAddr]", 
+                "262": "E [ipv4.dstAddr]", 
+                "263": "E [tcp.ackNo, udp.length_, udp.checksum]", 
+                "264": "E [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]", 
+                "265": "E [tcp.checksum, tcp.urgentPtr]", 
+                "266": "E [ethernet.dstAddr[39:8]]", 
+                "267": "E [ethernet.srcAddr[31:0]]", 
                 "288": "I [ipv4.version, ipv4.ihl]", 
-                "289": "I [tcp.srcPort[15:8], udp.length_[15:8]]", 
-                "290": "I [tcp.srcPort[7:0], udp.length_[7:0]]", 
-                "291": "I [tcp.dstPort[15:8]]", 
-                "292": "I [tcp.dstPort[7:0]]", 
-                "296": "E [ipv4.version, ipv4.ihl]", 
-                "297": "E [ipv4.diffserv]", 
-                "298": "E [tcp.srcPort[15:8], udp.srcPort[15:8]]", 
-                "299": "E [tcp.srcPort[7:0], udp.srcPort[7:0]]", 
-                "300": "E [ethernet.dstAddr[47:40]]", 
-                "301": "E [ethernet.srcAddr[39:32]]", 
+                "289": "I [tcp.seqNo[7:0], udp.srcPort[15:8]]", 
+                "292": "E [ipv4.version, ipv4.ihl]", 
+                "293": "E [ipv4.diffserv]", 
+                "294": "E [tcp.srcPort[15:8], udp.srcPort[15:8]]", 
+                "295": "E [tcp.srcPort[7:0], udp.srcPort[7:0]]", 
+                "296": "E [ethernet.dstAddr[47:40]]", 
+                "297": "E [ethernet.srcAddr[39:32]]", 
                 "320": "I [ipv4.diffserv, ipv4.totalLen[15:8]]", 
                 "321": "I [ipv4.totalLen[7:0], ipv4.identification[15:8]]", 
-                "322": "I [tcp.seqNo[31:16], udp.checksum]", 
-                "323": "I [tcp.seqNo[15:0]]", 
-                "324": "I [tcp.ackNo[31:16]]", 
-                "325": "I [tcp.ackNo[15:0]]", 
-                "332": "E [ipv4.totalLen]", 
-                "333": "E [ipv4.identification]", 
-                "334": "E [ipv4.flags, ipv4.fragOffset]", 
-                "335": "E [tcp.dstPort]", 
-                "336": "E [tcp.seqNo[31:16], udp.dstPort]", 
-                "337": "E [tcp.seqNo[15:0]]", 
-                "338": "E [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]", 
-                "339": "E [ethernet.etherType]", 
-                "340": "E [packet_out_hdr.egress_port, packet_out_hdr._padding, packet_in_hdr.ingress_port, packet_in_hdr._padding]"
+                "322": "I [tcp.ackNo[31:16], udp.dstPort]", 
+                "323": "I [tcp.ackNo[15:0]]", 
+                "326": "E [ipv4.totalLen]", 
+                "327": "E [ipv4.identification]", 
+                "328": "E [ipv4.flags, ipv4.fragOffset]", 
+                "329": "E [tcp.dstPort, udp.dstPort]", 
+                "330": "E [tcp.seqNo[31:16]]", 
+                "331": "E [tcp.seqNo[15:0]]", 
+                "332": "E [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]", 
+                "333": "E [ethernet.etherType]", 
+                "334": "E [packet_out_hdr.egress_port, packet_out_hdr._padding, packet_in_hdr.ingress_port, packet_in_hdr._padding]"
             }, 
             "logical_tables": {}, 
             "stateful_tables": []
@@ -828,62 +809,59 @@
                 "0": "I [POV[31:0]]", 
                 "1": "I [ipv4.protocol, ipv4.hdrChecksum, ipv4.srcAddr[31:24]]", 
                 "2": "I [ipv4.dstAddr]", 
-                "3": "I [ethernet.dstAddr[39:8]]", 
-                "4": "I [ethernet.srcAddr[31:0]]", 
-                "5": "I [udp.srcPort, udp.dstPort]", 
+                "3": "I [tcp.dstPort[7:0], tcp.seqNo[31:8]]", 
+                "4": "I [ethernet.dstAddr[39:8]]", 
+                "5": "I [ethernet.srcAddr[31:0]]", 
                 "64": "I [ipv4.srcAddr[23:16]]", 
-                "65": "I [ethernet.dstAddr[47:40]]", 
-                "66": "I [ethernet.srcAddr[39:32]]", 
-                "67": "I [POV[39:32]]", 
-                "68": "I [ig_intr_md_for_tm.drop_ctl]", 
+                "65": "I [tcp.srcPort[15:8], udp.srcPort[7:0]]", 
+                "66": "I [ethernet.dstAddr[47:40]]", 
+                "67": "I [ethernet.srcAddr[39:32]]", 
+                "68": "I [POV[39:32]]", 
+                "69": "I [ig_intr_md_for_tm.drop_ctl]", 
                 "80": "E [eg_intr_md._pad7, eg_intr_md.egress_cos]", 
                 "81": "E [POV[7:0]]", 
                 "128": "I [ig_intr_md.resubmit_flag, ig_intr_md._pad1, ig_intr_md._pad2, ig_intr_md._pad3, ig_intr_md.ingress_port]", 
                 "129": "I [packet_out_hdr.egress_port, packet_out_hdr._padding, packet_in_hdr.ingress_port, packet_in_hdr._padding]", 
                 "130": "I [ig_intr_md_for_tm.ucast_egress_port]", 
                 "131": "I [ipv4.srcAddr[15:0]]", 
-                "132": "I [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]", 
-                "133": "I [ethernet.etherType]", 
-                "134": "I [ecmp_metadata.group_id]", 
-                "135": "I [ecmp_metadata.selector]", 
+                "132": "I [tcp.srcPort[7:0], tcp.dstPort[15:8]]", 
+                "133": "I [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]", 
+                "134": "I [ethernet.etherType]", 
+                "135": "I [ecmp_metadata.group_id]", 
+                "136": "I [ecmp_metadata.selector]", 
                 "144": "E [eg_intr_md._pad0, eg_intr_md.egress_port]", 
                 "256": "I [ipv4.identification[7:0], ipv4.flags, ipv4.fragOffset, ipv4.ttl]", 
-                "257": "I [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]", 
+                "257": "I [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window, udp.length_, udp.checksum]", 
                 "258": "I [tcp.checksum, tcp.urgentPtr]", 
-                "264": "E [ipv4.ttl, ipv4.protocol, ipv4.hdrChecksum]", 
-                "265": "E [ipv4.srcAddr]", 
-                "266": "E [ipv4.dstAddr]", 
-                "267": "E [tcp.ackNo, udp.length_, udp.checksum]", 
-                "268": "E [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]", 
-                "269": "E [tcp.checksum, tcp.urgentPtr]", 
-                "270": "E [ethernet.dstAddr[39:8]]", 
-                "271": "E [ethernet.srcAddr[31:0]]", 
+                "260": "E [ipv4.ttl, ipv4.protocol, ipv4.hdrChecksum]", 
+                "261": "E [ipv4.srcAddr]", 
+                "262": "E [ipv4.dstAddr]", 
+                "263": "E [tcp.ackNo, udp.length_, udp.checksum]", 
+                "264": "E [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]", 
+                "265": "E [tcp.checksum, tcp.urgentPtr]", 
+                "266": "E [ethernet.dstAddr[39:8]]", 
+                "267": "E [ethernet.srcAddr[31:0]]", 
                 "288": "I [ipv4.version, ipv4.ihl]", 
-                "289": "I [tcp.srcPort[15:8], udp.length_[15:8]]", 
-                "290": "I [tcp.srcPort[7:0], udp.length_[7:0]]", 
-                "291": "I [tcp.dstPort[15:8]]", 
-                "292": "I [tcp.dstPort[7:0]]", 
-                "296": "E [ipv4.version, ipv4.ihl]", 
-                "297": "E [ipv4.diffserv]", 
-                "298": "E [tcp.srcPort[15:8], udp.srcPort[15:8]]", 
-                "299": "E [tcp.srcPort[7:0], udp.srcPort[7:0]]", 
-                "300": "E [ethernet.dstAddr[47:40]]", 
-                "301": "E [ethernet.srcAddr[39:32]]", 
+                "289": "I [tcp.seqNo[7:0], udp.srcPort[15:8]]", 
+                "292": "E [ipv4.version, ipv4.ihl]", 
+                "293": "E [ipv4.diffserv]", 
+                "294": "E [tcp.srcPort[15:8], udp.srcPort[15:8]]", 
+                "295": "E [tcp.srcPort[7:0], udp.srcPort[7:0]]", 
+                "296": "E [ethernet.dstAddr[47:40]]", 
+                "297": "E [ethernet.srcAddr[39:32]]", 
                 "320": "I [ipv4.diffserv, ipv4.totalLen[15:8]]", 
                 "321": "I [ipv4.totalLen[7:0], ipv4.identification[15:8]]", 
-                "322": "I [tcp.seqNo[31:16], udp.checksum]", 
-                "323": "I [tcp.seqNo[15:0]]", 
-                "324": "I [tcp.ackNo[31:16]]", 
-                "325": "I [tcp.ackNo[15:0]]", 
-                "332": "E [ipv4.totalLen]", 
-                "333": "E [ipv4.identification]", 
-                "334": "E [ipv4.flags, ipv4.fragOffset]", 
-                "335": "E [tcp.dstPort]", 
-                "336": "E [tcp.seqNo[31:16], udp.dstPort]", 
-                "337": "E [tcp.seqNo[15:0]]", 
-                "338": "E [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]", 
-                "339": "E [ethernet.etherType]", 
-                "340": "E [packet_out_hdr.egress_port, packet_out_hdr._padding, packet_in_hdr.ingress_port, packet_in_hdr._padding]"
+                "322": "I [tcp.ackNo[31:16], udp.dstPort]", 
+                "323": "I [tcp.ackNo[15:0]]", 
+                "326": "E [ipv4.totalLen]", 
+                "327": "E [ipv4.identification]", 
+                "328": "E [ipv4.flags, ipv4.fragOffset]", 
+                "329": "E [tcp.dstPort, udp.dstPort]", 
+                "330": "E [tcp.seqNo[31:16]]", 
+                "331": "E [tcp.seqNo[15:0]]", 
+                "332": "E [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]", 
+                "333": "E [ethernet.etherType]", 
+                "334": "E [packet_out_hdr.egress_port, packet_out_hdr._padding, packet_in_hdr.ingress_port, packet_in_hdr._padding]"
             }, 
             "logical_tables": {}, 
             "stateful_tables": []
@@ -893,62 +871,59 @@
                 "0": "I [POV[31:0]]", 
                 "1": "I [ipv4.protocol, ipv4.hdrChecksum, ipv4.srcAddr[31:24]]", 
                 "2": "I [ipv4.dstAddr]", 
-                "3": "I [ethernet.dstAddr[39:8]]", 
-                "4": "I [ethernet.srcAddr[31:0]]", 
-                "5": "I [udp.srcPort, udp.dstPort]", 
+                "3": "I [tcp.dstPort[7:0], tcp.seqNo[31:8]]", 
+                "4": "I [ethernet.dstAddr[39:8]]", 
+                "5": "I [ethernet.srcAddr[31:0]]", 
                 "64": "I [ipv4.srcAddr[23:16]]", 
-                "65": "I [ethernet.dstAddr[47:40]]", 
-                "66": "I [ethernet.srcAddr[39:32]]", 
-                "67": "I [POV[39:32]]", 
-                "68": "I [ig_intr_md_for_tm.drop_ctl]", 
+                "65": "I [tcp.srcPort[15:8], udp.srcPort[7:0]]", 
+                "66": "I [ethernet.dstAddr[47:40]]", 
+                "67": "I [ethernet.srcAddr[39:32]]", 
+                "68": "I [POV[39:32]]", 
+                "69": "I [ig_intr_md_for_tm.drop_ctl]", 
                 "80": "E [eg_intr_md._pad7, eg_intr_md.egress_cos]", 
                 "81": "E [POV[7:0]]", 
                 "128": "I [ig_intr_md.resubmit_flag, ig_intr_md._pad1, ig_intr_md._pad2, ig_intr_md._pad3, ig_intr_md.ingress_port]", 
                 "129": "I [packet_out_hdr.egress_port, packet_out_hdr._padding, packet_in_hdr.ingress_port, packet_in_hdr._padding]", 
                 "130": "I [ig_intr_md_for_tm.ucast_egress_port]", 
                 "131": "I [ipv4.srcAddr[15:0]]", 
-                "132": "I [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]", 
-                "133": "I [ethernet.etherType]", 
-                "134": "I [ecmp_metadata.group_id]", 
-                "135": "I [ecmp_metadata.selector]", 
+                "132": "I [tcp.srcPort[7:0], tcp.dstPort[15:8]]", 
+                "133": "I [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]", 
+                "134": "I [ethernet.etherType]", 
+                "135": "I [ecmp_metadata.group_id]", 
+                "136": "I [ecmp_metadata.selector]", 
                 "144": "E [eg_intr_md._pad0, eg_intr_md.egress_port]", 
                 "256": "I [ipv4.identification[7:0], ipv4.flags, ipv4.fragOffset, ipv4.ttl]", 
-                "257": "I [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]", 
+                "257": "I [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window, udp.length_, udp.checksum]", 
                 "258": "I [tcp.checksum, tcp.urgentPtr]", 
-                "264": "E [ipv4.ttl, ipv4.protocol, ipv4.hdrChecksum]", 
-                "265": "E [ipv4.srcAddr]", 
-                "266": "E [ipv4.dstAddr]", 
-                "267": "E [tcp.ackNo, udp.length_, udp.checksum]", 
-                "268": "E [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]", 
-                "269": "E [tcp.checksum, tcp.urgentPtr]", 
-                "270": "E [ethernet.dstAddr[39:8]]", 
-                "271": "E [ethernet.srcAddr[31:0]]", 
+                "260": "E [ipv4.ttl, ipv4.protocol, ipv4.hdrChecksum]", 
+                "261": "E [ipv4.srcAddr]", 
+                "262": "E [ipv4.dstAddr]", 
+                "263": "E [tcp.ackNo, udp.length_, udp.checksum]", 
+                "264": "E [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]", 
+                "265": "E [tcp.checksum, tcp.urgentPtr]", 
+                "266": "E [ethernet.dstAddr[39:8]]", 
+                "267": "E [ethernet.srcAddr[31:0]]", 
                 "288": "I [ipv4.version, ipv4.ihl]", 
-                "289": "I [tcp.srcPort[15:8], udp.length_[15:8]]", 
-                "290": "I [tcp.srcPort[7:0], udp.length_[7:0]]", 
-                "291": "I [tcp.dstPort[15:8]]", 
-                "292": "I [tcp.dstPort[7:0]]", 
-                "296": "E [ipv4.version, ipv4.ihl]", 
-                "297": "E [ipv4.diffserv]", 
-                "298": "E [tcp.srcPort[15:8], udp.srcPort[15:8]]", 
-                "299": "E [tcp.srcPort[7:0], udp.srcPort[7:0]]", 
-                "300": "E [ethernet.dstAddr[47:40]]", 
-                "301": "E [ethernet.srcAddr[39:32]]", 
+                "289": "I [tcp.seqNo[7:0], udp.srcPort[15:8]]", 
+                "292": "E [ipv4.version, ipv4.ihl]", 
+                "293": "E [ipv4.diffserv]", 
+                "294": "E [tcp.srcPort[15:8], udp.srcPort[15:8]]", 
+                "295": "E [tcp.srcPort[7:0], udp.srcPort[7:0]]", 
+                "296": "E [ethernet.dstAddr[47:40]]", 
+                "297": "E [ethernet.srcAddr[39:32]]", 
                 "320": "I [ipv4.diffserv, ipv4.totalLen[15:8]]", 
                 "321": "I [ipv4.totalLen[7:0], ipv4.identification[15:8]]", 
-                "322": "I [tcp.seqNo[31:16], udp.checksum]", 
-                "323": "I [tcp.seqNo[15:0]]", 
-                "324": "I [tcp.ackNo[31:16]]", 
-                "325": "I [tcp.ackNo[15:0]]", 
-                "332": "E [ipv4.totalLen]", 
-                "333": "E [ipv4.identification]", 
-                "334": "E [ipv4.flags, ipv4.fragOffset]", 
-                "335": "E [tcp.dstPort]", 
-                "336": "E [tcp.seqNo[31:16], udp.dstPort]", 
-                "337": "E [tcp.seqNo[15:0]]", 
-                "338": "E [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]", 
-                "339": "E [ethernet.etherType]", 
-                "340": "E [packet_out_hdr.egress_port, packet_out_hdr._padding, packet_in_hdr.ingress_port, packet_in_hdr._padding]"
+                "322": "I [tcp.ackNo[31:16], udp.dstPort]", 
+                "323": "I [tcp.ackNo[15:0]]", 
+                "326": "E [ipv4.totalLen]", 
+                "327": "E [ipv4.identification]", 
+                "328": "E [ipv4.flags, ipv4.fragOffset]", 
+                "329": "E [tcp.dstPort, udp.dstPort]", 
+                "330": "E [tcp.seqNo[31:16]]", 
+                "331": "E [tcp.seqNo[15:0]]", 
+                "332": "E [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]", 
+                "333": "E [ethernet.etherType]", 
+                "334": "E [packet_out_hdr.egress_port, packet_out_hdr._padding, packet_in_hdr.ingress_port, packet_in_hdr._padding]"
             }, 
             "logical_tables": {}, 
             "stateful_tables": []
@@ -958,62 +933,59 @@
                 "0": "I [POV[31:0]]", 
                 "1": "I [ipv4.protocol, ipv4.hdrChecksum, ipv4.srcAddr[31:24]]", 
                 "2": "I [ipv4.dstAddr]", 
-                "3": "I [ethernet.dstAddr[39:8]]", 
-                "4": "I [ethernet.srcAddr[31:0]]", 
-                "5": "I [udp.srcPort, udp.dstPort]", 
+                "3": "I [tcp.dstPort[7:0], tcp.seqNo[31:8]]", 
+                "4": "I [ethernet.dstAddr[39:8]]", 
+                "5": "I [ethernet.srcAddr[31:0]]", 
                 "64": "I [ipv4.srcAddr[23:16]]", 
-                "65": "I [ethernet.dstAddr[47:40]]", 
-                "66": "I [ethernet.srcAddr[39:32]]", 
-                "67": "I [POV[39:32]]", 
-                "68": "I [ig_intr_md_for_tm.drop_ctl]", 
+                "65": "I [tcp.srcPort[15:8], udp.srcPort[7:0]]", 
+                "66": "I [ethernet.dstAddr[47:40]]", 
+                "67": "I [ethernet.srcAddr[39:32]]", 
+                "68": "I [POV[39:32]]", 
+                "69": "I [ig_intr_md_for_tm.drop_ctl]", 
                 "80": "E [eg_intr_md._pad7, eg_intr_md.egress_cos]", 
                 "81": "E [POV[7:0]]", 
                 "128": "I [ig_intr_md.resubmit_flag, ig_intr_md._pad1, ig_intr_md._pad2, ig_intr_md._pad3, ig_intr_md.ingress_port]", 
                 "129": "I [packet_out_hdr.egress_port, packet_out_hdr._padding, packet_in_hdr.ingress_port, packet_in_hdr._padding]", 
                 "130": "I [ig_intr_md_for_tm.ucast_egress_port]", 
                 "131": "I [ipv4.srcAddr[15:0]]", 
-                "132": "I [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]", 
-                "133": "I [ethernet.etherType]", 
-                "134": "I [ecmp_metadata.group_id]", 
-                "135": "I [ecmp_metadata.selector]", 
+                "132": "I [tcp.srcPort[7:0], tcp.dstPort[15:8]]", 
+                "133": "I [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]", 
+                "134": "I [ethernet.etherType]", 
+                "135": "I [ecmp_metadata.group_id]", 
+                "136": "I [ecmp_metadata.selector]", 
                 "144": "E [eg_intr_md._pad0, eg_intr_md.egress_port]", 
                 "256": "I [ipv4.identification[7:0], ipv4.flags, ipv4.fragOffset, ipv4.ttl]", 
-                "257": "I [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]", 
+                "257": "I [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window, udp.length_, udp.checksum]", 
                 "258": "I [tcp.checksum, tcp.urgentPtr]", 
-                "264": "E [ipv4.ttl, ipv4.protocol, ipv4.hdrChecksum]", 
-                "265": "E [ipv4.srcAddr]", 
-                "266": "E [ipv4.dstAddr]", 
-                "267": "E [tcp.ackNo, udp.length_, udp.checksum]", 
-                "268": "E [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]", 
-                "269": "E [tcp.checksum, tcp.urgentPtr]", 
-                "270": "E [ethernet.dstAddr[39:8]]", 
-                "271": "E [ethernet.srcAddr[31:0]]", 
+                "260": "E [ipv4.ttl, ipv4.protocol, ipv4.hdrChecksum]", 
+                "261": "E [ipv4.srcAddr]", 
+                "262": "E [ipv4.dstAddr]", 
+                "263": "E [tcp.ackNo, udp.length_, udp.checksum]", 
+                "264": "E [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]", 
+                "265": "E [tcp.checksum, tcp.urgentPtr]", 
+                "266": "E [ethernet.dstAddr[39:8]]", 
+                "267": "E [ethernet.srcAddr[31:0]]", 
                 "288": "I [ipv4.version, ipv4.ihl]", 
-                "289": "I [tcp.srcPort[15:8], udp.length_[15:8]]", 
-                "290": "I [tcp.srcPort[7:0], udp.length_[7:0]]", 
-                "291": "I [tcp.dstPort[15:8]]", 
-                "292": "I [tcp.dstPort[7:0]]", 
-                "296": "E [ipv4.version, ipv4.ihl]", 
-                "297": "E [ipv4.diffserv]", 
-                "298": "E [tcp.srcPort[15:8], udp.srcPort[15:8]]", 
-                "299": "E [tcp.srcPort[7:0], udp.srcPort[7:0]]", 
-                "300": "E [ethernet.dstAddr[47:40]]", 
-                "301": "E [ethernet.srcAddr[39:32]]", 
+                "289": "I [tcp.seqNo[7:0], udp.srcPort[15:8]]", 
+                "292": "E [ipv4.version, ipv4.ihl]", 
+                "293": "E [ipv4.diffserv]", 
+                "294": "E [tcp.srcPort[15:8], udp.srcPort[15:8]]", 
+                "295": "E [tcp.srcPort[7:0], udp.srcPort[7:0]]", 
+                "296": "E [ethernet.dstAddr[47:40]]", 
+                "297": "E [ethernet.srcAddr[39:32]]", 
                 "320": "I [ipv4.diffserv, ipv4.totalLen[15:8]]", 
                 "321": "I [ipv4.totalLen[7:0], ipv4.identification[15:8]]", 
-                "322": "I [tcp.seqNo[31:16], udp.checksum]", 
-                "323": "I [tcp.seqNo[15:0]]", 
-                "324": "I [tcp.ackNo[31:16]]", 
-                "325": "I [tcp.ackNo[15:0]]", 
-                "332": "E [ipv4.totalLen]", 
-                "333": "E [ipv4.identification]", 
-                "334": "E [ipv4.flags, ipv4.fragOffset]", 
-                "335": "E [tcp.dstPort]", 
-                "336": "E [tcp.seqNo[31:16], udp.dstPort]", 
-                "337": "E [tcp.seqNo[15:0]]", 
-                "338": "E [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]", 
-                "339": "E [ethernet.etherType]", 
-                "340": "E [packet_out_hdr.egress_port, packet_out_hdr._padding, packet_in_hdr.ingress_port, packet_in_hdr._padding]"
+                "322": "I [tcp.ackNo[31:16], udp.dstPort]", 
+                "323": "I [tcp.ackNo[15:0]]", 
+                "326": "E [ipv4.totalLen]", 
+                "327": "E [ipv4.identification]", 
+                "328": "E [ipv4.flags, ipv4.fragOffset]", 
+                "329": "E [tcp.dstPort, udp.dstPort]", 
+                "330": "E [tcp.seqNo[31:16]]", 
+                "331": "E [tcp.seqNo[15:0]]", 
+                "332": "E [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]", 
+                "333": "E [ethernet.etherType]", 
+                "334": "E [packet_out_hdr.egress_port, packet_out_hdr._padding, packet_in_hdr.ingress_port, packet_in_hdr._padding]"
             }, 
             "logical_tables": {}, 
             "stateful_tables": []
@@ -1023,62 +995,59 @@
                 "0": "I [POV[31:0]]", 
                 "1": "I [ipv4.protocol, ipv4.hdrChecksum, ipv4.srcAddr[31:24]]", 
                 "2": "I [ipv4.dstAddr]", 
-                "3": "I [ethernet.dstAddr[39:8]]", 
-                "4": "I [ethernet.srcAddr[31:0]]", 
-                "5": "I [udp.srcPort, udp.dstPort]", 
+                "3": "I [tcp.dstPort[7:0], tcp.seqNo[31:8]]", 
+                "4": "I [ethernet.dstAddr[39:8]]", 
+                "5": "I [ethernet.srcAddr[31:0]]", 
                 "64": "I [ipv4.srcAddr[23:16]]", 
-                "65": "I [ethernet.dstAddr[47:40]]", 
-                "66": "I [ethernet.srcAddr[39:32]]", 
-                "67": "I [POV[39:32]]", 
-                "68": "I [ig_intr_md_for_tm.drop_ctl]", 
+                "65": "I [tcp.srcPort[15:8], udp.srcPort[7:0]]", 
+                "66": "I [ethernet.dstAddr[47:40]]", 
+                "67": "I [ethernet.srcAddr[39:32]]", 
+                "68": "I [POV[39:32]]", 
+                "69": "I [ig_intr_md_for_tm.drop_ctl]", 
                 "80": "E [eg_intr_md._pad7, eg_intr_md.egress_cos]", 
                 "81": "E [POV[7:0]]", 
                 "128": "I [ig_intr_md.resubmit_flag, ig_intr_md._pad1, ig_intr_md._pad2, ig_intr_md._pad3, ig_intr_md.ingress_port]", 
                 "129": "I [packet_out_hdr.egress_port, packet_out_hdr._padding, packet_in_hdr.ingress_port, packet_in_hdr._padding]", 
                 "130": "I [ig_intr_md_for_tm.ucast_egress_port]", 
                 "131": "I [ipv4.srcAddr[15:0]]", 
-                "132": "I [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]", 
-                "133": "I [ethernet.etherType]", 
-                "134": "I [ecmp_metadata.group_id]", 
-                "135": "I [ecmp_metadata.selector]", 
+                "132": "I [tcp.srcPort[7:0], tcp.dstPort[15:8]]", 
+                "133": "I [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]", 
+                "134": "I [ethernet.etherType]", 
+                "135": "I [ecmp_metadata.group_id]", 
+                "136": "I [ecmp_metadata.selector]", 
                 "144": "E [eg_intr_md._pad0, eg_intr_md.egress_port]", 
                 "256": "I [ipv4.identification[7:0], ipv4.flags, ipv4.fragOffset, ipv4.ttl]", 
-                "257": "I [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]", 
+                "257": "I [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window, udp.length_, udp.checksum]", 
                 "258": "I [tcp.checksum, tcp.urgentPtr]", 
-                "264": "E [ipv4.ttl, ipv4.protocol, ipv4.hdrChecksum]", 
-                "265": "E [ipv4.srcAddr]", 
-                "266": "E [ipv4.dstAddr]", 
-                "267": "E [tcp.ackNo, udp.length_, udp.checksum]", 
-                "268": "E [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]", 
-                "269": "E [tcp.checksum, tcp.urgentPtr]", 
-                "270": "E [ethernet.dstAddr[39:8]]", 
-                "271": "E [ethernet.srcAddr[31:0]]", 
+                "260": "E [ipv4.ttl, ipv4.protocol, ipv4.hdrChecksum]", 
+                "261": "E [ipv4.srcAddr]", 
+                "262": "E [ipv4.dstAddr]", 
+                "263": "E [tcp.ackNo, udp.length_, udp.checksum]", 
+                "264": "E [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]", 
+                "265": "E [tcp.checksum, tcp.urgentPtr]", 
+                "266": "E [ethernet.dstAddr[39:8]]", 
+                "267": "E [ethernet.srcAddr[31:0]]", 
                 "288": "I [ipv4.version, ipv4.ihl]", 
-                "289": "I [tcp.srcPort[15:8], udp.length_[15:8]]", 
-                "290": "I [tcp.srcPort[7:0], udp.length_[7:0]]", 
-                "291": "I [tcp.dstPort[15:8]]", 
-                "292": "I [tcp.dstPort[7:0]]", 
-                "296": "E [ipv4.version, ipv4.ihl]", 
-                "297": "E [ipv4.diffserv]", 
-                "298": "E [tcp.srcPort[15:8], udp.srcPort[15:8]]", 
-                "299": "E [tcp.srcPort[7:0], udp.srcPort[7:0]]", 
-                "300": "E [ethernet.dstAddr[47:40]]", 
-                "301": "E [ethernet.srcAddr[39:32]]", 
+                "289": "I [tcp.seqNo[7:0], udp.srcPort[15:8]]", 
+                "292": "E [ipv4.version, ipv4.ihl]", 
+                "293": "E [ipv4.diffserv]", 
+                "294": "E [tcp.srcPort[15:8], udp.srcPort[15:8]]", 
+                "295": "E [tcp.srcPort[7:0], udp.srcPort[7:0]]", 
+                "296": "E [ethernet.dstAddr[47:40]]", 
+                "297": "E [ethernet.srcAddr[39:32]]", 
                 "320": "I [ipv4.diffserv, ipv4.totalLen[15:8]]", 
                 "321": "I [ipv4.totalLen[7:0], ipv4.identification[15:8]]", 
-                "322": "I [tcp.seqNo[31:16], udp.checksum]", 
-                "323": "I [tcp.seqNo[15:0]]", 
-                "324": "I [tcp.ackNo[31:16]]", 
-                "325": "I [tcp.ackNo[15:0]]", 
-                "332": "E [ipv4.totalLen]", 
-                "333": "E [ipv4.identification]", 
-                "334": "E [ipv4.flags, ipv4.fragOffset]", 
-                "335": "E [tcp.dstPort]", 
-                "336": "E [tcp.seqNo[31:16], udp.dstPort]", 
-                "337": "E [tcp.seqNo[15:0]]", 
-                "338": "E [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]", 
-                "339": "E [ethernet.etherType]", 
-                "340": "E [packet_out_hdr.egress_port, packet_out_hdr._padding, packet_in_hdr.ingress_port, packet_in_hdr._padding]"
+                "322": "I [tcp.ackNo[31:16], udp.dstPort]", 
+                "323": "I [tcp.ackNo[15:0]]", 
+                "326": "E [ipv4.totalLen]", 
+                "327": "E [ipv4.identification]", 
+                "328": "E [ipv4.flags, ipv4.fragOffset]", 
+                "329": "E [tcp.dstPort, udp.dstPort]", 
+                "330": "E [tcp.seqNo[31:16]]", 
+                "331": "E [tcp.seqNo[15:0]]", 
+                "332": "E [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]", 
+                "333": "E [ethernet.etherType]", 
+                "334": "E [packet_out_hdr.egress_port, packet_out_hdr._padding, packet_in_hdr.ingress_port, packet_in_hdr._padding]"
             }, 
             "logical_tables": {}, 
             "stateful_tables": []
@@ -1088,62 +1057,59 @@
                 "0": "I [POV[31:0]]", 
                 "1": "I [ipv4.protocol, ipv4.hdrChecksum, ipv4.srcAddr[31:24]]", 
                 "2": "I [ipv4.dstAddr]", 
-                "3": "I [ethernet.dstAddr[39:8]]", 
-                "4": "I [ethernet.srcAddr[31:0]]", 
-                "5": "I [udp.srcPort, udp.dstPort]", 
+                "3": "I [tcp.dstPort[7:0], tcp.seqNo[31:8]]", 
+                "4": "I [ethernet.dstAddr[39:8]]", 
+                "5": "I [ethernet.srcAddr[31:0]]", 
                 "64": "I [ipv4.srcAddr[23:16]]", 
-                "65": "I [ethernet.dstAddr[47:40]]", 
-                "66": "I [ethernet.srcAddr[39:32]]", 
-                "67": "I [POV[39:32]]", 
-                "68": "I [ig_intr_md_for_tm.drop_ctl]", 
+                "65": "I [tcp.srcPort[15:8], udp.srcPort[7:0]]", 
+                "66": "I [ethernet.dstAddr[47:40]]", 
+                "67": "I [ethernet.srcAddr[39:32]]", 
+                "68": "I [POV[39:32]]", 
+                "69": "I [ig_intr_md_for_tm.drop_ctl]", 
                 "80": "E [eg_intr_md._pad7, eg_intr_md.egress_cos]", 
                 "81": "E [POV[7:0]]", 
                 "128": "I [ig_intr_md.resubmit_flag, ig_intr_md._pad1, ig_intr_md._pad2, ig_intr_md._pad3, ig_intr_md.ingress_port]", 
                 "129": "I [packet_out_hdr.egress_port, packet_out_hdr._padding, packet_in_hdr.ingress_port, packet_in_hdr._padding]", 
                 "130": "I [ig_intr_md_for_tm.ucast_egress_port]", 
                 "131": "I [ipv4.srcAddr[15:0]]", 
-                "132": "I [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]", 
-                "133": "I [ethernet.etherType]", 
-                "134": "I [ecmp_metadata.group_id]", 
-                "135": "I [ecmp_metadata.selector]", 
+                "132": "I [tcp.srcPort[7:0], tcp.dstPort[15:8]]", 
+                "133": "I [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]", 
+                "134": "I [ethernet.etherType]", 
+                "135": "I [ecmp_metadata.group_id]", 
+                "136": "I [ecmp_metadata.selector]", 
                 "144": "E [eg_intr_md._pad0, eg_intr_md.egress_port]", 
                 "256": "I [ipv4.identification[7:0], ipv4.flags, ipv4.fragOffset, ipv4.ttl]", 
-                "257": "I [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]", 
+                "257": "I [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window, udp.length_, udp.checksum]", 
                 "258": "I [tcp.checksum, tcp.urgentPtr]", 
-                "264": "E [ipv4.ttl, ipv4.protocol, ipv4.hdrChecksum]", 
-                "265": "E [ipv4.srcAddr]", 
-                "266": "E [ipv4.dstAddr]", 
-                "267": "E [tcp.ackNo, udp.length_, udp.checksum]", 
-                "268": "E [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]", 
-                "269": "E [tcp.checksum, tcp.urgentPtr]", 
-                "270": "E [ethernet.dstAddr[39:8]]", 
-                "271": "E [ethernet.srcAddr[31:0]]", 
+                "260": "E [ipv4.ttl, ipv4.protocol, ipv4.hdrChecksum]", 
+                "261": "E [ipv4.srcAddr]", 
+                "262": "E [ipv4.dstAddr]", 
+                "263": "E [tcp.ackNo, udp.length_, udp.checksum]", 
+                "264": "E [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]", 
+                "265": "E [tcp.checksum, tcp.urgentPtr]", 
+                "266": "E [ethernet.dstAddr[39:8]]", 
+                "267": "E [ethernet.srcAddr[31:0]]", 
                 "288": "I [ipv4.version, ipv4.ihl]", 
-                "289": "I [tcp.srcPort[15:8], udp.length_[15:8]]", 
-                "290": "I [tcp.srcPort[7:0], udp.length_[7:0]]", 
-                "291": "I [tcp.dstPort[15:8]]", 
-                "292": "I [tcp.dstPort[7:0]]", 
-                "296": "E [ipv4.version, ipv4.ihl]", 
-                "297": "E [ipv4.diffserv]", 
-                "298": "E [tcp.srcPort[15:8], udp.srcPort[15:8]]", 
-                "299": "E [tcp.srcPort[7:0], udp.srcPort[7:0]]", 
-                "300": "E [ethernet.dstAddr[47:40]]", 
-                "301": "E [ethernet.srcAddr[39:32]]", 
+                "289": "I [tcp.seqNo[7:0], udp.srcPort[15:8]]", 
+                "292": "E [ipv4.version, ipv4.ihl]", 
+                "293": "E [ipv4.diffserv]", 
+                "294": "E [tcp.srcPort[15:8], udp.srcPort[15:8]]", 
+                "295": "E [tcp.srcPort[7:0], udp.srcPort[7:0]]", 
+                "296": "E [ethernet.dstAddr[47:40]]", 
+                "297": "E [ethernet.srcAddr[39:32]]", 
                 "320": "I [ipv4.diffserv, ipv4.totalLen[15:8]]", 
                 "321": "I [ipv4.totalLen[7:0], ipv4.identification[15:8]]", 
-                "322": "I [tcp.seqNo[31:16], udp.checksum]", 
-                "323": "I [tcp.seqNo[15:0]]", 
-                "324": "I [tcp.ackNo[31:16]]", 
-                "325": "I [tcp.ackNo[15:0]]", 
-                "332": "E [ipv4.totalLen]", 
-                "333": "E [ipv4.identification]", 
-                "334": "E [ipv4.flags, ipv4.fragOffset]", 
-                "335": "E [tcp.dstPort]", 
-                "336": "E [tcp.seqNo[31:16], udp.dstPort]", 
-                "337": "E [tcp.seqNo[15:0]]", 
-                "338": "E [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]", 
-                "339": "E [ethernet.etherType]", 
-                "340": "E [packet_out_hdr.egress_port, packet_out_hdr._padding, packet_in_hdr.ingress_port, packet_in_hdr._padding]"
+                "322": "I [tcp.ackNo[31:16], udp.dstPort]", 
+                "323": "I [tcp.ackNo[15:0]]", 
+                "326": "E [ipv4.totalLen]", 
+                "327": "E [ipv4.identification]", 
+                "328": "E [ipv4.flags, ipv4.fragOffset]", 
+                "329": "E [tcp.dstPort, udp.dstPort]", 
+                "330": "E [tcp.seqNo[31:16]]", 
+                "331": "E [tcp.seqNo[15:0]]", 
+                "332": "E [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]", 
+                "333": "E [ethernet.etherType]", 
+                "334": "E [packet_out_hdr.egress_port, packet_out_hdr._padding, packet_in_hdr.ingress_port, packet_in_hdr._padding]"
             }, 
             "logical_tables": {}, 
             "stateful_tables": []
@@ -1153,62 +1119,59 @@
                 "0": "I [POV[31:0]]", 
                 "1": "I [ipv4.protocol, ipv4.hdrChecksum, ipv4.srcAddr[31:24]]", 
                 "2": "I [ipv4.dstAddr]", 
-                "3": "I [ethernet.dstAddr[39:8]]", 
-                "4": "I [ethernet.srcAddr[31:0]]", 
-                "5": "I [udp.srcPort, udp.dstPort]", 
+                "3": "I [tcp.dstPort[7:0], tcp.seqNo[31:8]]", 
+                "4": "I [ethernet.dstAddr[39:8]]", 
+                "5": "I [ethernet.srcAddr[31:0]]", 
                 "64": "I [ipv4.srcAddr[23:16]]", 
-                "65": "I [ethernet.dstAddr[47:40]]", 
-                "66": "I [ethernet.srcAddr[39:32]]", 
-                "67": "I [POV[39:32]]", 
-                "68": "I [ig_intr_md_for_tm.drop_ctl]", 
+                "65": "I [tcp.srcPort[15:8], udp.srcPort[7:0]]", 
+                "66": "I [ethernet.dstAddr[47:40]]", 
+                "67": "I [ethernet.srcAddr[39:32]]", 
+                "68": "I [POV[39:32]]", 
+                "69": "I [ig_intr_md_for_tm.drop_ctl]", 
                 "80": "E [eg_intr_md._pad7, eg_intr_md.egress_cos]", 
                 "81": "E [POV[7:0]]", 
                 "128": "I [ig_intr_md.resubmit_flag, ig_intr_md._pad1, ig_intr_md._pad2, ig_intr_md._pad3, ig_intr_md.ingress_port]", 
                 "129": "I [packet_out_hdr.egress_port, packet_out_hdr._padding, packet_in_hdr.ingress_port, packet_in_hdr._padding]", 
                 "130": "I [ig_intr_md_for_tm.ucast_egress_port]", 
                 "131": "I [ipv4.srcAddr[15:0]]", 
-                "132": "I [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]", 
-                "133": "I [ethernet.etherType]", 
-                "134": "I [ecmp_metadata.group_id]", 
-                "135": "I [ecmp_metadata.selector]", 
+                "132": "I [tcp.srcPort[7:0], tcp.dstPort[15:8]]", 
+                "133": "I [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]", 
+                "134": "I [ethernet.etherType]", 
+                "135": "I [ecmp_metadata.group_id]", 
+                "136": "I [ecmp_metadata.selector]", 
                 "144": "E [eg_intr_md._pad0, eg_intr_md.egress_port]", 
                 "256": "I [ipv4.identification[7:0], ipv4.flags, ipv4.fragOffset, ipv4.ttl]", 
-                "257": "I [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]", 
+                "257": "I [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window, udp.length_, udp.checksum]", 
                 "258": "I [tcp.checksum, tcp.urgentPtr]", 
-                "264": "E [ipv4.ttl, ipv4.protocol, ipv4.hdrChecksum]", 
-                "265": "E [ipv4.srcAddr]", 
-                "266": "E [ipv4.dstAddr]", 
-                "267": "E [tcp.ackNo, udp.length_, udp.checksum]", 
-                "268": "E [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]", 
-                "269": "E [tcp.checksum, tcp.urgentPtr]", 
-                "270": "E [ethernet.dstAddr[39:8]]", 
-                "271": "E [ethernet.srcAddr[31:0]]", 
+                "260": "E [ipv4.ttl, ipv4.protocol, ipv4.hdrChecksum]", 
+                "261": "E [ipv4.srcAddr]", 
+                "262": "E [ipv4.dstAddr]", 
+                "263": "E [tcp.ackNo, udp.length_, udp.checksum]", 
+                "264": "E [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]", 
+                "265": "E [tcp.checksum, tcp.urgentPtr]", 
+                "266": "E [ethernet.dstAddr[39:8]]", 
+                "267": "E [ethernet.srcAddr[31:0]]", 
                 "288": "I [ipv4.version, ipv4.ihl]", 
-                "289": "I [tcp.srcPort[15:8], udp.length_[15:8]]", 
-                "290": "I [tcp.srcPort[7:0], udp.length_[7:0]]", 
-                "291": "I [tcp.dstPort[15:8]]", 
-                "292": "I [tcp.dstPort[7:0]]", 
-                "296": "E [ipv4.version, ipv4.ihl]", 
-                "297": "E [ipv4.diffserv]", 
-                "298": "E [tcp.srcPort[15:8], udp.srcPort[15:8]]", 
-                "299": "E [tcp.srcPort[7:0], udp.srcPort[7:0]]", 
-                "300": "E [ethernet.dstAddr[47:40]]", 
-                "301": "E [ethernet.srcAddr[39:32]]", 
+                "289": "I [tcp.seqNo[7:0], udp.srcPort[15:8]]", 
+                "292": "E [ipv4.version, ipv4.ihl]", 
+                "293": "E [ipv4.diffserv]", 
+                "294": "E [tcp.srcPort[15:8], udp.srcPort[15:8]]", 
+                "295": "E [tcp.srcPort[7:0], udp.srcPort[7:0]]", 
+                "296": "E [ethernet.dstAddr[47:40]]", 
+                "297": "E [ethernet.srcAddr[39:32]]", 
                 "320": "I [ipv4.diffserv, ipv4.totalLen[15:8]]", 
                 "321": "I [ipv4.totalLen[7:0], ipv4.identification[15:8]]", 
-                "322": "I [tcp.seqNo[31:16], udp.checksum]", 
-                "323": "I [tcp.seqNo[15:0]]", 
-                "324": "I [tcp.ackNo[31:16]]", 
-                "325": "I [tcp.ackNo[15:0]]", 
-                "332": "E [ipv4.totalLen]", 
-                "333": "E [ipv4.identification]", 
-                "334": "E [ipv4.flags, ipv4.fragOffset]", 
-                "335": "E [tcp.dstPort]", 
-                "336": "E [tcp.seqNo[31:16], udp.dstPort]", 
-                "337": "E [tcp.seqNo[15:0]]", 
-                "338": "E [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]", 
-                "339": "E [ethernet.etherType]", 
-                "340": "E [packet_out_hdr.egress_port, packet_out_hdr._padding, packet_in_hdr.ingress_port, packet_in_hdr._padding]"
+                "322": "I [tcp.ackNo[31:16], udp.dstPort]", 
+                "323": "I [tcp.ackNo[15:0]]", 
+                "326": "E [ipv4.totalLen]", 
+                "327": "E [ipv4.identification]", 
+                "328": "E [ipv4.flags, ipv4.fragOffset]", 
+                "329": "E [tcp.dstPort, udp.dstPort]", 
+                "330": "E [tcp.seqNo[31:16]]", 
+                "331": "E [tcp.seqNo[15:0]]", 
+                "332": "E [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]", 
+                "333": "E [ethernet.etherType]", 
+                "334": "E [packet_out_hdr.egress_port, packet_out_hdr._padding, packet_in_hdr.ingress_port, packet_in_hdr._padding]"
             }, 
             "logical_tables": {}, 
             "stateful_tables": []
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/context/parser.context.json b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/context/parser.context.json
index d35269e..ee2d1a5 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/context/parser.context.json
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/context/parser.context.json
@@ -243,6 +243,7 @@
       null, 
       null, 
       null, 
+      null, 
       {
         "origin": "start", 
         "origin-case": 0, 
@@ -280,12 +281,6 @@
         "origin-mask": 511
       }, 
       {
-        "origin": "parse_tcp", 
-        "origin-case": 0, 
-        "state": "parse_tcp//spilled", 
-        "origin-mask": 0
-      }, 
-      {
         "origin": "parse_ipv4", 
         "origin-case": 0, 
         "state": "<leaf>", 
@@ -339,8 +334,7 @@
       "6": "default_parser", 
       "7": "parse_pkt_out", 
       "8": "<POV initialization>_<Ingress intrinsic metadata>_<Phase 0>", 
-      "9": "start", 
-      "10": "parse_tcp//spilled"
+      "9": "start"
     }
   }, 
   "egress": {
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/context/phv.context.json b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/context/phv.context.json
index b387dd4..d15801c 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/context/phv.context.json
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/context/phv.context.json
@@ -57,11 +57,18 @@
       "pipeline": "ingress", 
       "data": [
         {
-          "data_lsb": 8, 
-          "data_msb": 39, 
-          "name": "ethernet.dstAddr", 
-          "container_lsb": 0, 
+          "data_lsb": 0, 
+          "data_msb": 7, 
+          "name": "tcp.dstPort", 
+          "container_lsb": 24, 
           "container_msb": 31
+        }, 
+        {
+          "data_lsb": 8, 
+          "data_msb": 31, 
+          "name": "tcp.seqNo", 
+          "container_lsb": 0, 
+          "container_msb": 23
         }
       ], 
       "address": 3
@@ -70,9 +77,9 @@
       "pipeline": "ingress", 
       "data": [
         {
-          "data_lsb": 0, 
-          "data_msb": 31, 
-          "name": "ethernet.srcAddr", 
+          "data_lsb": 8, 
+          "data_msb": 39, 
+          "name": "ethernet.dstAddr", 
           "container_lsb": 0, 
           "container_msb": 31
         }
@@ -84,17 +91,10 @@
       "data": [
         {
           "data_lsb": 0, 
-          "data_msb": 15, 
-          "name": "udp.srcPort", 
-          "container_lsb": 16, 
-          "container_msb": 31
-        }, 
-        {
-          "data_lsb": 0, 
-          "data_msb": 15, 
-          "name": "udp.dstPort", 
+          "data_msb": 31, 
+          "name": "ethernet.srcAddr", 
           "container_lsb": 0, 
-          "container_msb": 15
+          "container_msb": 31
         }
       ], 
       "address": 5
@@ -406,9 +406,16 @@
       "pipeline": "ingress", 
       "data": [
         {
-          "data_lsb": 40, 
-          "data_msb": 47, 
-          "name": "ethernet.dstAddr", 
+          "data_lsb": 8, 
+          "data_msb": 15, 
+          "name": "tcp.srcPort", 
+          "container_lsb": 0, 
+          "container_msb": 7
+        }, 
+        {
+          "data_lsb": 0, 
+          "data_msb": 7, 
+          "name": "udp.srcPort", 
           "container_lsb": 0, 
           "container_msb": 7
         }
@@ -419,9 +426,9 @@
       "pipeline": "ingress", 
       "data": [
         {
-          "data_lsb": 32, 
-          "data_msb": 39, 
-          "name": "ethernet.srcAddr", 
+          "data_lsb": 40, 
+          "data_msb": 47, 
+          "name": "ethernet.dstAddr", 
           "container_lsb": 0, 
           "container_msb": 7
         }
@@ -434,7 +441,7 @@
         {
           "data_lsb": 32, 
           "data_msb": 39, 
-          "name": "POV", 
+          "name": "ethernet.srcAddr", 
           "container_lsb": 0, 
           "container_msb": 7
         }
@@ -445,6 +452,19 @@
       "pipeline": "ingress", 
       "data": [
         {
+          "data_lsb": 32, 
+          "data_msb": 39, 
+          "name": "POV", 
+          "container_lsb": 0, 
+          "container_msb": 7
+        }
+      ], 
+      "address": 68
+    }, 
+    {
+      "pipeline": "ingress", 
+      "data": [
+        {
           "data_lsb": 0, 
           "data_msb": 2, 
           "name": "ig_intr_md_for_tm.drop_ctl", 
@@ -452,11 +472,6 @@
           "container_msb": 7
         }
       ], 
-      "address": 68
-    }, 
-    {
-      "pipeline": "unused", 
-      "data": [], 
       "address": 69
     }, 
     {
@@ -879,6 +894,26 @@
         {
           "data_lsb": 0, 
           "data_msb": 7, 
+          "name": "tcp.srcPort", 
+          "container_lsb": 8, 
+          "container_msb": 15
+        }, 
+        {
+          "data_lsb": 8, 
+          "data_msb": 15, 
+          "name": "tcp.dstPort", 
+          "container_lsb": 0, 
+          "container_msb": 7
+        }
+      ], 
+      "address": 132
+    }, 
+    {
+      "pipeline": "ingress", 
+      "data": [
+        {
+          "data_lsb": 0, 
+          "data_msb": 7, 
           "name": "ethernet.dstAddr", 
           "container_lsb": 8, 
           "container_msb": 15
@@ -891,7 +926,7 @@
           "container_msb": 7
         }
       ], 
-      "address": 132
+      "address": 133
     }, 
     {
       "pipeline": "ingress", 
@@ -904,7 +939,7 @@
           "container_msb": 15
         }
       ], 
-      "address": 133
+      "address": 134
     }, 
     {
       "pipeline": "ingress", 
@@ -917,7 +952,7 @@
           "container_msb": 15
         }
       ], 
-      "address": 134
+      "address": 135
     }, 
     {
       "pipeline": "ingress", 
@@ -930,11 +965,6 @@
           "container_msb": 15
         }
       ], 
-      "address": 135
-    }, 
-    {
-      "pipeline": "unused", 
-      "data": [], 
       "address": 136
     }, 
     {
@@ -1490,6 +1520,20 @@
           "name": "tcp.window", 
           "container_lsb": 0, 
           "container_msb": 15
+        }, 
+        {
+          "data_lsb": 0, 
+          "data_msb": 15, 
+          "name": "udp.length_", 
+          "container_lsb": 16, 
+          "container_msb": 31
+        }, 
+        {
+          "data_lsb": 0, 
+          "data_msb": 15, 
+          "name": "udp.checksum", 
+          "container_lsb": 0, 
+          "container_msb": 15
         }
       ], 
       "address": 257
@@ -1520,26 +1564,6 @@
       "address": 259
     }, 
     {
-      "pipeline": "unused", 
-      "data": [], 
-      "address": 260
-    }, 
-    {
-      "pipeline": "unused", 
-      "data": [], 
-      "address": 261
-    }, 
-    {
-      "pipeline": "unused", 
-      "data": [], 
-      "address": 262
-    }, 
-    {
-      "pipeline": "unused", 
-      "data": [], 
-      "address": 263
-    }, 
-    {
       "pipeline": "egress", 
       "data": [
         {
@@ -1564,7 +1588,7 @@
           "container_msb": 15
         }
       ], 
-      "address": 264
+      "address": 260
     }, 
     {
       "pipeline": "egress", 
@@ -1577,7 +1601,7 @@
           "container_msb": 31
         }
       ], 
-      "address": 265
+      "address": 261
     }, 
     {
       "pipeline": "egress", 
@@ -1590,7 +1614,7 @@
           "container_msb": 31
         }
       ], 
-      "address": 266
+      "address": 262
     }, 
     {
       "pipeline": "egress", 
@@ -1617,7 +1641,7 @@
           "container_msb": 15
         }
       ], 
-      "address": 267
+      "address": 263
     }, 
     {
       "pipeline": "egress", 
@@ -1658,7 +1682,7 @@
           "container_msb": 15
         }
       ], 
-      "address": 268
+      "address": 264
     }, 
     {
       "pipeline": "egress", 
@@ -1678,7 +1702,7 @@
           "container_msb": 15
         }
       ], 
-      "address": 269
+      "address": 265
     }, 
     {
       "pipeline": "egress", 
@@ -1691,7 +1715,7 @@
           "container_msb": 31
         }
       ], 
-      "address": 270
+      "address": 266
     }, 
     {
       "pipeline": "egress", 
@@ -1704,6 +1728,26 @@
           "container_msb": 31
         }
       ], 
+      "address": 267
+    }, 
+    {
+      "pipeline": "unused", 
+      "data": [], 
+      "address": 268
+    }, 
+    {
+      "pipeline": "unused", 
+      "data": [], 
+      "address": 269
+    }, 
+    {
+      "pipeline": "unused", 
+      "data": [], 
+      "address": 270
+    }, 
+    {
+      "pipeline": "unused", 
+      "data": [], 
       "address": 271
     }, 
     {
@@ -1810,16 +1854,16 @@
       "pipeline": "ingress", 
       "data": [
         {
-          "data_lsb": 8, 
-          "data_msb": 15, 
-          "name": "tcp.srcPort", 
+          "data_lsb": 0, 
+          "data_msb": 7, 
+          "name": "tcp.seqNo", 
           "container_lsb": 0, 
           "container_msb": 7
         }, 
         {
           "data_lsb": 8, 
           "data_msb": 15, 
-          "name": "udp.length_", 
+          "name": "udp.srcPort", 
           "container_lsb": 0, 
           "container_msb": 7
         }
@@ -1827,67 +1871,16 @@
       "address": 289
     }, 
     {
-      "pipeline": "ingress", 
-      "data": [
-        {
-          "data_lsb": 0, 
-          "data_msb": 7, 
-          "name": "tcp.srcPort", 
-          "container_lsb": 0, 
-          "container_msb": 7
-        }, 
-        {
-          "data_lsb": 0, 
-          "data_msb": 7, 
-          "name": "udp.length_", 
-          "container_lsb": 0, 
-          "container_msb": 7
-        }
-      ], 
+      "pipeline": "unused", 
+      "data": [], 
       "address": 290
     }, 
     {
-      "pipeline": "ingress", 
-      "data": [
-        {
-          "data_lsb": 8, 
-          "data_msb": 15, 
-          "name": "tcp.dstPort", 
-          "container_lsb": 0, 
-          "container_msb": 7
-        }
-      ], 
+      "pipeline": "unused", 
+      "data": [], 
       "address": 291
     }, 
     {
-      "pipeline": "ingress", 
-      "data": [
-        {
-          "data_lsb": 0, 
-          "data_msb": 7, 
-          "name": "tcp.dstPort", 
-          "container_lsb": 0, 
-          "container_msb": 7
-        }
-      ], 
-      "address": 292
-    }, 
-    {
-      "pipeline": "unused", 
-      "data": [], 
-      "address": 293
-    }, 
-    {
-      "pipeline": "unused", 
-      "data": [], 
-      "address": 294
-    }, 
-    {
-      "pipeline": "unused", 
-      "data": [], 
-      "address": 295
-    }, 
-    {
       "pipeline": "egress", 
       "data": [
         {
@@ -1905,7 +1898,7 @@
           "container_msb": 3
         }
       ], 
-      "address": 296
+      "address": 292
     }, 
     {
       "pipeline": "egress", 
@@ -1918,7 +1911,7 @@
           "container_msb": 7
         }
       ], 
-      "address": 297
+      "address": 293
     }, 
     {
       "pipeline": "egress", 
@@ -1938,7 +1931,7 @@
           "container_msb": 7
         }
       ], 
-      "address": 298
+      "address": 294
     }, 
     {
       "pipeline": "egress", 
@@ -1958,7 +1951,7 @@
           "container_msb": 7
         }
       ], 
-      "address": 299
+      "address": 295
     }, 
     {
       "pipeline": "egress", 
@@ -1971,7 +1964,7 @@
           "container_msb": 7
         }
       ], 
-      "address": 300
+      "address": 296
     }, 
     {
       "pipeline": "egress", 
@@ -1984,6 +1977,26 @@
           "container_msb": 7
         }
       ], 
+      "address": 297
+    }, 
+    {
+      "pipeline": "unused", 
+      "data": [], 
+      "address": 298
+    }, 
+    {
+      "pipeline": "unused", 
+      "data": [], 
+      "address": 299
+    }, 
+    {
+      "pipeline": "unused", 
+      "data": [], 
+      "address": 300
+    }, 
+    {
+      "pipeline": "unused", 
+      "data": [], 
       "address": 301
     }, 
     {
@@ -2122,14 +2135,14 @@
         {
           "data_lsb": 16, 
           "data_msb": 31, 
-          "name": "tcp.seqNo", 
+          "name": "tcp.ackNo", 
           "container_lsb": 0, 
           "container_msb": 15
         }, 
         {
           "data_lsb": 0, 
           "data_msb": 15, 
-          "name": "udp.checksum", 
+          "name": "udp.dstPort", 
           "container_lsb": 0, 
           "container_msb": 15
         }
@@ -2142,7 +2155,7 @@
         {
           "data_lsb": 0, 
           "data_msb": 15, 
-          "name": "tcp.seqNo", 
+          "name": "tcp.ackNo", 
           "container_lsb": 0, 
           "container_msb": 15
         }
@@ -2150,62 +2163,16 @@
       "address": 323
     }, 
     {
-      "pipeline": "ingress", 
-      "data": [
-        {
-          "data_lsb": 16, 
-          "data_msb": 31, 
-          "name": "tcp.ackNo", 
-          "container_lsb": 0, 
-          "container_msb": 15
-        }
-      ], 
+      "pipeline": "unused", 
+      "data": [], 
       "address": 324
     }, 
     {
-      "pipeline": "ingress", 
-      "data": [
-        {
-          "data_lsb": 0, 
-          "data_msb": 15, 
-          "name": "tcp.ackNo", 
-          "container_lsb": 0, 
-          "container_msb": 15
-        }
-      ], 
+      "pipeline": "unused", 
+      "data": [], 
       "address": 325
     }, 
     {
-      "pipeline": "unused", 
-      "data": [], 
-      "address": 326
-    }, 
-    {
-      "pipeline": "unused", 
-      "data": [], 
-      "address": 327
-    }, 
-    {
-      "pipeline": "unused", 
-      "data": [], 
-      "address": 328
-    }, 
-    {
-      "pipeline": "unused", 
-      "data": [], 
-      "address": 329
-    }, 
-    {
-      "pipeline": "unused", 
-      "data": [], 
-      "address": 330
-    }, 
-    {
-      "pipeline": "unused", 
-      "data": [], 
-      "address": 331
-    }, 
-    {
       "pipeline": "egress", 
       "data": [
         {
@@ -2216,7 +2183,7 @@
           "container_msb": 15
         }
       ], 
-      "address": 332
+      "address": 326
     }, 
     {
       "pipeline": "egress", 
@@ -2229,7 +2196,7 @@
           "container_msb": 15
         }
       ], 
-      "address": 333
+      "address": 327
     }, 
     {
       "pipeline": "egress", 
@@ -2249,7 +2216,7 @@
           "container_msb": 12
         }
       ], 
-      "address": 334
+      "address": 328
     }, 
     {
       "pipeline": "egress", 
@@ -2260,19 +2227,6 @@
           "name": "tcp.dstPort", 
           "container_lsb": 0, 
           "container_msb": 15
-        }
-      ], 
-      "address": 335
-    }, 
-    {
-      "pipeline": "egress", 
-      "data": [
-        {
-          "data_lsb": 16, 
-          "data_msb": 31, 
-          "name": "tcp.seqNo", 
-          "container_lsb": 0, 
-          "container_msb": 15
         }, 
         {
           "data_lsb": 0, 
@@ -2282,7 +2236,20 @@
           "container_msb": 15
         }
       ], 
-      "address": 336
+      "address": 329
+    }, 
+    {
+      "pipeline": "egress", 
+      "data": [
+        {
+          "data_lsb": 16, 
+          "data_msb": 31, 
+          "name": "tcp.seqNo", 
+          "container_lsb": 0, 
+          "container_msb": 15
+        }
+      ], 
+      "address": 330
     }, 
     {
       "pipeline": "egress", 
@@ -2295,7 +2262,7 @@
           "container_msb": 15
         }
       ], 
-      "address": 337
+      "address": 331
     }, 
     {
       "pipeline": "egress", 
@@ -2315,7 +2282,7 @@
           "container_msb": 7
         }
       ], 
-      "address": 338
+      "address": 332
     }, 
     {
       "pipeline": "egress", 
@@ -2328,7 +2295,7 @@
           "container_msb": 15
         }
       ], 
-      "address": 339
+      "address": 333
     }, 
     {
       "pipeline": "egress", 
@@ -2362,6 +2329,36 @@
           "container_msb": 6
         }
       ], 
+      "address": 334
+    }, 
+    {
+      "pipeline": "unused", 
+      "data": [], 
+      "address": 335
+    }, 
+    {
+      "pipeline": "unused", 
+      "data": [], 
+      "address": 336
+    }, 
+    {
+      "pipeline": "unused", 
+      "data": [], 
+      "address": 337
+    }, 
+    {
+      "pipeline": "unused", 
+      "data": [], 
+      "address": 338
+    }, 
+    {
+      "pipeline": "unused", 
+      "data": [], 
+      "address": 339
+    }, 
+    {
+      "pipeline": "unused", 
+      "data": [], 
       "address": 340
     }, 
     {
@@ -2518,7 +2515,7 @@
           "data_lsb": 0, 
           "data_msb": 15, 
           "container_lsb": 0, 
-          "address": 134
+          "address": 135
         }
       ], 
       "tcp.ctrl": [
@@ -2532,18 +2529,11 @@
       ], 
       "udp.length_": [
         {
-          "container_msb": 7, 
-          "data_lsb": 8, 
-          "data_msb": 15, 
-          "container_lsb": 0, 
-          "address": 289
-        }, 
-        {
-          "container_msb": 7, 
+          "container_msb": 31, 
           "data_lsb": 0, 
-          "data_msb": 7, 
-          "container_lsb": 0, 
-          "address": 290
+          "data_msb": 15, 
+          "container_lsb": 16, 
+          "address": 257
         }
       ], 
       "tcp.checksum": [
@@ -2561,30 +2551,23 @@
           "data_lsb": 8, 
           "data_msb": 15, 
           "container_lsb": 0, 
-          "address": 289
+          "address": 65
         }, 
         {
-          "container_msb": 7, 
-          "data_lsb": 0, 
-          "data_msb": 7, 
-          "container_lsb": 0, 
-          "address": 290
-        }
-      ], 
-      "tcp.ackNo": [
-        {
           "container_msb": 15, 
-          "data_lsb": 16, 
-          "data_msb": 31, 
-          "container_lsb": 0, 
-          "address": 324
-        }, 
+          "data_lsb": 0, 
+          "data_msb": 7, 
+          "container_lsb": 8, 
+          "address": 132
+        }
+      ], 
+      "udp.dstPort": [
         {
           "container_msb": 15, 
           "data_lsb": 0, 
           "data_msb": 15, 
           "container_lsb": 0, 
-          "address": 325
+          "address": 322
         }
       ], 
       "ethernet.etherType": [
@@ -2593,7 +2576,7 @@
           "data_lsb": 0, 
           "data_msb": 15, 
           "container_lsb": 0, 
-          "address": 133
+          "address": 134
         }
       ], 
       "packet_in_hdr.ingress_port": [
@@ -2625,18 +2608,18 @@
       ], 
       "tcp.dstPort": [
         {
+          "container_msb": 31, 
+          "data_lsb": 0, 
+          "data_msb": 7, 
+          "container_lsb": 24, 
+          "address": 3
+        }, 
+        {
           "container_msb": 7, 
           "data_lsb": 8, 
           "data_msb": 15, 
           "container_lsb": 0, 
-          "address": 291
-        }, 
-        {
-          "container_msb": 7, 
-          "data_lsb": 0, 
-          "data_msb": 7, 
-          "container_lsb": 0, 
-          "address": 292
+          "address": 132
         }
       ], 
       "ig_intr_md._pad1": [
@@ -2672,7 +2655,7 @@
           "data_lsb": 0, 
           "data_msb": 15, 
           "container_lsb": 0, 
-          "address": 135
+          "address": 136
         }
       ], 
       "ig_intr_md_for_tm.drop_ctl": [
@@ -2681,7 +2664,7 @@
           "data_lsb": 0, 
           "data_msb": 2, 
           "container_lsb": 5, 
-          "address": 68
+          "address": 69
         }
       ], 
       "POV": [
@@ -2697,7 +2680,7 @@
           "data_lsb": 32, 
           "data_msb": 39, 
           "container_lsb": 0, 
-          "address": 67
+          "address": 68
         }
       ], 
       "tcp.res": [
@@ -2715,21 +2698,21 @@
           "data_lsb": 8, 
           "data_msb": 39, 
           "container_lsb": 0, 
-          "address": 3
+          "address": 4
         }, 
         {
           "container_msb": 7, 
           "data_lsb": 40, 
           "data_msb": 47, 
           "container_lsb": 0, 
-          "address": 65
+          "address": 66
         }, 
         {
           "container_msb": 15, 
           "data_lsb": 0, 
           "data_msb": 7, 
           "container_lsb": 8, 
-          "address": 132
+          "address": 133
         }
       ], 
       "ipv4.ihl": [
@@ -2765,21 +2748,21 @@
           "data_lsb": 0, 
           "data_msb": 31, 
           "container_lsb": 0, 
-          "address": 4
+          "address": 5
         }, 
         {
           "container_msb": 7, 
           "data_lsb": 32, 
           "data_msb": 39, 
           "container_lsb": 0, 
-          "address": 66
+          "address": 67
         }, 
         {
           "container_msb": 7, 
           "data_lsb": 40, 
           "data_msb": 47, 
           "container_lsb": 0, 
-          "address": 132
+          "address": 133
         }
       ], 
       "ipv4.diffserv": [
@@ -2856,23 +2839,23 @@
           "data_lsb": 0, 
           "data_msb": 15, 
           "container_lsb": 0, 
-          "address": 322
+          "address": 257
         }
       ], 
       "tcp.seqNo": [
         {
-          "container_msb": 15, 
-          "data_lsb": 16, 
+          "container_msb": 23, 
+          "data_lsb": 8, 
           "data_msb": 31, 
           "container_lsb": 0, 
-          "address": 322
+          "address": 3
         }, 
         {
-          "container_msb": 15, 
+          "container_msb": 7, 
           "data_lsb": 0, 
-          "data_msb": 15, 
+          "data_msb": 7, 
           "container_lsb": 0, 
-          "address": 323
+          "address": 289
         }
       ], 
       "ipv4.ttl": [
@@ -2886,20 +2869,34 @@
       ], 
       "udp.srcPort": [
         {
-          "container_msb": 31, 
+          "container_msb": 7, 
           "data_lsb": 0, 
+          "data_msb": 7, 
+          "container_lsb": 0, 
+          "address": 65
+        }, 
+        {
+          "container_msb": 7, 
+          "data_lsb": 8, 
           "data_msb": 15, 
-          "container_lsb": 16, 
-          "address": 5
+          "container_lsb": 0, 
+          "address": 289
         }
       ], 
-      "udp.dstPort": [
+      "tcp.ackNo": [
+        {
+          "container_msb": 15, 
+          "data_lsb": 16, 
+          "data_msb": 31, 
+          "container_lsb": 0, 
+          "address": 322
+        }, 
         {
           "container_msb": 15, 
           "data_lsb": 0, 
           "data_msb": 15, 
           "container_lsb": 0, 
-          "address": 5
+          "address": 323
         }
       ], 
       "ipv4.version": [
@@ -3005,7 +3002,7 @@
           "data_lsb": 0, 
           "data_msb": 15, 
           "container_lsb": 0, 
-          "address": 264
+          "address": 260
         }
       ], 
       "packet_in_hdr.ingress_port": [
@@ -3014,7 +3011,7 @@
           "data_lsb": 0, 
           "data_msb": 8, 
           "container_lsb": 7, 
-          "address": 340
+          "address": 334
         }
       ], 
       "tcp.srcPort": [
@@ -3023,14 +3020,14 @@
           "data_lsb": 8, 
           "data_msb": 15, 
           "container_lsb": 0, 
-          "address": 298
+          "address": 294
         }, 
         {
           "container_msb": 7, 
           "data_lsb": 0, 
           "data_msb": 7, 
           "container_lsb": 0, 
-          "address": 299
+          "address": 295
         }
       ], 
       "udp.dstPort": [
@@ -3039,7 +3036,7 @@
           "data_lsb": 0, 
           "data_msb": 15, 
           "container_lsb": 0, 
-          "address": 336
+          "address": 329
         }
       ], 
       "ethernet.etherType": [
@@ -3048,7 +3045,7 @@
           "data_lsb": 0, 
           "data_msb": 15, 
           "container_lsb": 0, 
-          "address": 339
+          "address": 333
         }
       ], 
       "tcp.ctrl": [
@@ -3057,7 +3054,7 @@
           "data_lsb": 0, 
           "data_msb": 5, 
           "container_lsb": 16, 
-          "address": 268
+          "address": 264
         }
       ], 
       "packet_out_hdr._padding": [
@@ -3066,7 +3063,7 @@
           "data_lsb": 0, 
           "data_msb": 6, 
           "container_lsb": 0, 
-          "address": 340
+          "address": 334
         }
       ], 
       "tcp.dstPort": [
@@ -3075,7 +3072,7 @@
           "data_lsb": 0, 
           "data_msb": 15, 
           "container_lsb": 0, 
-          "address": 335
+          "address": 329
         }
       ], 
       "eg_intr_md._pad0": [
@@ -3120,7 +3117,7 @@
           "data_lsb": 0, 
           "data_msb": 2, 
           "container_lsb": 25, 
-          "address": 268
+          "address": 264
         }
       ], 
       "ethernet.dstAddr": [
@@ -3129,21 +3126,21 @@
           "data_lsb": 8, 
           "data_msb": 39, 
           "container_lsb": 0, 
-          "address": 270
+          "address": 266
         }, 
         {
           "container_msb": 7, 
           "data_lsb": 40, 
           "data_msb": 47, 
           "container_lsb": 0, 
-          "address": 300
+          "address": 296
         }, 
         {
           "container_msb": 15, 
           "data_lsb": 0, 
           "data_msb": 7, 
           "container_lsb": 8, 
-          "address": 338
+          "address": 332
         }
       ], 
       "ipv4.ihl": [
@@ -3152,7 +3149,7 @@
           "data_lsb": 0, 
           "data_msb": 3, 
           "container_lsb": 0, 
-          "address": 296
+          "address": 292
         }
       ], 
       "ipv4.dstAddr": [
@@ -3161,7 +3158,7 @@
           "data_lsb": 0, 
           "data_msb": 31, 
           "container_lsb": 0, 
-          "address": 266
+          "address": 262
         }
       ], 
       "ipv4.diffserv": [
@@ -3170,7 +3167,7 @@
           "data_lsb": 0, 
           "data_msb": 7, 
           "container_lsb": 0, 
-          "address": 297
+          "address": 293
         }
       ], 
       "ipv4.totalLen": [
@@ -3179,7 +3176,7 @@
           "data_lsb": 0, 
           "data_msb": 15, 
           "container_lsb": 0, 
-          "address": 332
+          "address": 326
         }
       ], 
       "ethernet.srcAddr": [
@@ -3188,21 +3185,21 @@
           "data_lsb": 0, 
           "data_msb": 31, 
           "container_lsb": 0, 
-          "address": 271
+          "address": 267
         }, 
         {
           "container_msb": 7, 
           "data_lsb": 32, 
           "data_msb": 39, 
           "container_lsb": 0, 
-          "address": 301
+          "address": 297
         }, 
         {
           "container_msb": 7, 
           "data_lsb": 40, 
           "data_msb": 47, 
           "container_lsb": 0, 
-          "address": 338
+          "address": 332
         }
       ], 
       "packet_in_hdr._padding": [
@@ -3211,7 +3208,7 @@
           "data_lsb": 0, 
           "data_msb": 6, 
           "container_lsb": 0, 
-          "address": 340
+          "address": 334
         }
       ], 
       "ipv4.flags": [
@@ -3220,7 +3217,7 @@
           "data_lsb": 0, 
           "data_msb": 2, 
           "container_lsb": 13, 
-          "address": 334
+          "address": 328
         }
       ], 
       "ipv4.identification": [
@@ -3229,7 +3226,7 @@
           "data_lsb": 0, 
           "data_msb": 15, 
           "container_lsb": 0, 
-          "address": 333
+          "address": 327
         }
       ], 
       "eg_intr_md.egress_port": [
@@ -3247,7 +3244,7 @@
           "data_lsb": 0, 
           "data_msb": 8, 
           "container_lsb": 7, 
-          "address": 340
+          "address": 334
         }
       ], 
       "ipv4.protocol": [
@@ -3256,7 +3253,7 @@
           "data_lsb": 0, 
           "data_msb": 7, 
           "container_lsb": 16, 
-          "address": 264
+          "address": 260
         }
       ], 
       "udp.checksum": [
@@ -3265,7 +3262,7 @@
           "data_lsb": 0, 
           "data_msb": 15, 
           "container_lsb": 0, 
-          "address": 267
+          "address": 263
         }
       ], 
       "tcp.seqNo": [
@@ -3274,14 +3271,14 @@
           "data_lsb": 16, 
           "data_msb": 31, 
           "container_lsb": 0, 
-          "address": 336
+          "address": 330
         }, 
         {
           "container_msb": 15, 
           "data_lsb": 0, 
           "data_msb": 15, 
           "container_lsb": 0, 
-          "address": 337
+          "address": 331
         }
       ], 
       "udp.length_": [
@@ -3290,7 +3287,7 @@
           "data_lsb": 0, 
           "data_msb": 15, 
           "container_lsb": 16, 
-          "address": 267
+          "address": 263
         }
       ], 
       "udp.srcPort": [
@@ -3299,14 +3296,14 @@
           "data_lsb": 8, 
           "data_msb": 15, 
           "container_lsb": 0, 
-          "address": 298
+          "address": 294
         }, 
         {
           "container_msb": 7, 
           "data_lsb": 0, 
           "data_msb": 7, 
           "container_lsb": 0, 
-          "address": 299
+          "address": 295
         }
       ], 
       "tcp.ackNo": [
@@ -3315,7 +3312,7 @@
           "data_lsb": 0, 
           "data_msb": 31, 
           "container_lsb": 0, 
-          "address": 267
+          "address": 263
         }
       ], 
       "ipv4.version": [
@@ -3324,7 +3321,7 @@
           "data_lsb": 0, 
           "data_msb": 3, 
           "container_lsb": 4, 
-          "address": 296
+          "address": 292
         }
       ], 
       "ipv4.srcAddr": [
@@ -3333,7 +3330,7 @@
           "data_lsb": 0, 
           "data_msb": 31, 
           "container_lsb": 0, 
-          "address": 265
+          "address": 261
         }
       ], 
       "tcp.ecn": [
@@ -3342,7 +3339,7 @@
           "data_lsb": 0, 
           "data_msb": 2, 
           "container_lsb": 22, 
-          "address": 268
+          "address": 264
         }
       ], 
       "tcp.window": [
@@ -3351,7 +3348,7 @@
           "data_lsb": 0, 
           "data_msb": 15, 
           "container_lsb": 0, 
-          "address": 268
+          "address": 264
         }
       ], 
       "tcp.checksum": [
@@ -3360,7 +3357,7 @@
           "data_lsb": 0, 
           "data_msb": 15, 
           "container_lsb": 16, 
-          "address": 269
+          "address": 265
         }
       ], 
       "tcp.dataOffset": [
@@ -3369,7 +3366,7 @@
           "data_lsb": 0, 
           "data_msb": 3, 
           "container_lsb": 28, 
-          "address": 268
+          "address": 264
         }
       ], 
       "ipv4.fragOffset": [
@@ -3378,7 +3375,7 @@
           "data_lsb": 0, 
           "data_msb": 12, 
           "container_lsb": 0, 
-          "address": 334
+          "address": 328
         }
       ], 
       "ipv4.ttl": [
@@ -3387,7 +3384,7 @@
           "data_lsb": 0, 
           "data_msb": 7, 
           "container_lsb": 24, 
-          "address": 264
+          "address": 260
         }
       ], 
       "tcp.urgentPtr": [
@@ -3396,7 +3393,7 @@
           "data_lsb": 0, 
           "data_msb": 15, 
           "container_lsb": 0, 
-          "address": 269
+          "address": 265
         }
       ]
     }
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/ecmp.json b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/ecmp.json
index 6bd3422..c995bf3 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/ecmp.json
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/ecmp.json
@@ -9,10 +9,8 @@
       "name" : "scalars_0",
       "id" : 0,
       "fields" : [
-        ["tmp_0", 104, false],
-        ["tmp", 8, false],
-        ["tmp_1", 32, false],
-        ["tmp_2", 32, false]
+        ["tmp", 32, false],
+        ["tmp_0", 32, false]
       ]
     },
     {
@@ -209,7 +207,7 @@
           "parser_ops" : [],
           "transitions" : [
             {
-              "value" : "0xff",
+              "value" : "0x00ff",
               "mask" : null,
               "next_state" : "parse_pkt_out"
             },
@@ -396,50 +394,10 @@
         {
           "name" : "start",
           "id" : 7,
-          "parser_ops" : [
-            {
-              "parameters" : [
-                {
-                  "type" : "field",
-                  "value" : ["scalars", "tmp_0"]
-                },
-                {
-                  "type" : "lookahead",
-                  "value" : [0, 104]
-                }
-              ],
-              "op" : "set"
-            },
-            {
-              "parameters" : [
-                {
-                  "type" : "field",
-                  "value" : ["scalars", "tmp"]
-                },
-                {
-                  "type" : "expression",
-                  "value" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "&",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "tmp_0"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0xff"
-                      }
-                    }
-                  }
-                }
-              ],
-              "op" : "set"
-            }
-          ],
+          "parser_ops" : [],
           "transitions" : [
             {
-              "value" : "0x00",
+              "value" : "0x00ff",
               "mask" : null,
               "next_state" : "parse_pkt_in"
             },
@@ -452,7 +410,7 @@
           "transition_key" : [
             {
               "type" : "field",
-              "value" : ["scalars", "tmp"]
+              "value" : ["ig_intr_md", "egress_spec"]
             }
           ]
         }
@@ -498,7 +456,7 @@
     {
       "name" : "calc",
       "id" : 0,
-      "algo" : "crc32",
+      "algo" : "crc16",
       "input" : [
         {
           "type" : "field",
@@ -633,7 +591,7 @@
             },
             {
               "type" : "hexstr",
-              "value" : "0x00000000"
+              "value" : "0x0000"
             },
             {
               "type" : "calculation",
@@ -641,7 +599,7 @@
             },
             {
               "type" : "hexstr",
-              "value" : "0x0000000000000002"
+              "value" : "0x00000002"
             }
           ],
           "source_info" : {
@@ -790,7 +748,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "tmp_1"]
+              "value" : ["scalars", "tmp"]
             },
             {
               "type" : "expression",
@@ -820,7 +778,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "tmp_1"]
+              "value" : ["scalars", "tmp"]
             }
           ],
           "source_info" : {
@@ -842,7 +800,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "tmp_2"]
+              "value" : ["scalars", "tmp_0"]
             },
             {
               "type" : "expression",
@@ -872,7 +830,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "tmp_2"]
+              "value" : ["scalars", "tmp_0"]
             }
           ],
           "source_info" : {
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/asm.log b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/asm.log
index feb4272..531e6d1 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/asm.log
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/asm.log
@@ -1,6 +1,6 @@
 +---------------------------------------------------------------------+
 |  Log file: asm.log                                                  |
 |  Compiler version: 5.1.0 (fca32d1)                                  |
-|  Created on: Tue Sep 12 11:16:41 2017                               |
+|  Created on: Wed Sep 13 01:00:26 2017                               |
 +---------------------------------------------------------------------+
 
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/mau.characterize.log b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/mau.characterize.log
index 7507e27..b783c5e 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/mau.characterize.log
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/mau.characterize.log
@@ -1,7 +1,7 @@
 +---------------------------------------------------------------------+
 |  Log file: mau.characterize.log                                     |
 |  Compiler version: 5.1.0 (fca32d1)                                  |
-|  Created on: Tue Sep 12 11:16:41 2017                               |
+|  Created on: Wed Sep 13 01:00:26 2017                               |
 +---------------------------------------------------------------------+
 
 Match+Action Resource Usage
@@ -23,8 +23,8 @@
 |     ecmp_group_table     | ingress |   1   |  exact  | sram |  5 (3/0/2/0/0)  |   0   | 1024 / 3072 (2048) | 32 / 22 (-10) |    0    |   20  |   0/0/0/0/0/0/4/16  | 9 / 16 (7) |   0 / 0 (0)   | 52 / 42 (-10) |   9    |  0 / 0 (0)  | 3 in 1 (128) | 1 in 1 (128) |     - / -     | 96.1% / 29.7% |      - / -      |
 |      stage 1 totals      |    -    |   -   |    -    |  -   |  5 (3/0/2/0/0)  |   0   |         -          |       -       |    -    |   -   |          -          |     -      |       -       |       -       |   -    |      -      |      -       |      -       |       -       |       -       |        -        |
 |                          |         |       |         |      |                 |       |                    |               |         |       |                     |            |               |               |        |             |              |              |               |               |                 |
-| ingress_port_count_table | ingress |   2   |         |  -   |  2 (0/0/2/0/0)  |   0   |  1024 / 1 (-1023)  |   0 / 0 (0)   |    0    |   0   |   0/0/0/0/0/0/0/0   | 0 / 0 (0)  |   0 / 0 (0)   |   0 / 0 (0)   |   0    |  0 / 0 (0)  |  0 in 0 (0)  |  1 in 0 (0)  |     - / -     |     - / -     |      - / -      |
-| egress_port_count_table  | ingress |   2   |         |  -   |  2 (0/0/2/0/0)  |   0   |  1024 / 1 (-1023)  |   0 / 0 (0)   |    0    |   0   |   0/0/0/0/0/0/0/0   | 0 / 0 (0)  |   0 / 0 (0)   |   0 / 0 (0)   |   0    |  0 / 0 (0)  |  0 in 0 (0)  |  1 in 0 (0)  |     - / -     |     - / -     |      - / -      |
+| ingress_port_count_table | ingress |   2   |         |  -   |  2 (0/0/2/0/0)  |   0   |  1024 / 1024 (0)   |   0 / 0 (0)   |    0    |   0   |   0/0/0/0/0/0/0/0   | 0 / 0 (0)  |   0 / 0 (0)   |   0 / 0 (0)   |   0    |  0 / 0 (0)  |  0 in 0 (0)  |  0 in 0 (0)  |     - / -     |     - / -     |      - / -      |
+| egress_port_count_table  | ingress |   2   |         |  -   |  2 (0/0/2/0/0)  |   0   |  1024 / 1024 (0)   |   0 / 0 (0)   |    0    |   0   |   0/0/0/0/0/0/0/0   | 0 / 0 (0)  |   0 / 0 (0)   |   0 / 0 (0)   |   0    |  0 / 0 (0)  |  0 in 0 (0)  |  0 in 0 (0)  |     - / -     |     - / -     |      - / -      |
 |      stage 2 totals      |    -    |   -   |    -    |  -   |  4 (0/0/4/0/0)  |   0   |         -          |       -       |    -    |   -   |          -          |     -      |       -       |       -       |   -    |      -      |      -       |      -       |       -       |       -       |        -        |
 |                          |         |       |         |      |                 |       |                    |               |         |       |                     |            |               |               |        |             |              |              |               |               |                 |
 |      overall totals      |    -    |   -   |    -    |  -   |  13 (3/1/8/0/1) |   3   |         -          |       -       |    -    |   -   |          -          |     -      |       -       |       -       |   -    |      -      |      -       |      -       |       -       |       -       |        -        |
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/mau.config.log b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/mau.config.log
index 0e2f924..0840a7f 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/mau.config.log
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/mau.config.log
@@ -1,7 +1,7 @@
 +---------------------------------------------------------------------+
 |  Log file: mau.config.log                                           |
 |  Compiler version: 5.1.0 (fca32d1)                                  |
-|  Created on: Tue Sep 12 11:16:41 2017                               |
+|  Created on: Wed Sep 13 01:00:26 2017                               |
 +---------------------------------------------------------------------+
 
 Final Stage dependencies are:
@@ -50,11 +50,11 @@
 Configuring rams.match.merge.logical_table_thread[copy_index=2].logical_table_thread_ingress to be 0x1 (previous_value=0x0 OR new_value=0x1).
 Configuring dp.mau_match_input_xbar_exact_match_enable[direction_index=0].mau_match_input_xbar_exact_match_enable to be 0x2.  (old value = 0x0 OR new value = 0x2)
 Configuring dp.xbar_hash.xbar.mau_match_input_xbar_ternary_match_enable[direction_index=0].mau_match_input_xbar_ternary_match_enable to be 0x0.  (old value = 0x0 OR new value = 0x0)
-Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=12].match_input_xbar_816b_ctl_address to be 3.
+Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=12].match_input_xbar_816b_ctl_address to be 4.
 Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=12].match_input_xbar_816b_ctl_enable to be 1.
-Configuring match input crossbar byte 12 to come from 8-bit PHV container 3.
+Configuring match input crossbar byte 12 to come from 8-bit PHV container 4.
   That PHV byte contains {unused[5:0], --validity_check--packet_out_hdr[0:0], unused[0:0]}.
-Configuring dp.match_input_xbar_din_power_ctl[14_byte_group=0][byte_position=4].match_input_xbar_din_power_ctl to be 0x8.  (previous value = 0x0  OR new value = 0x8)
+Configuring dp.match_input_xbar_din_power_ctl[14_byte_group=0][byte_position=4].match_input_xbar_din_power_ctl to be 0x10.  (previous value = 0x0  OR new value = 0x10)
 Configuring dp.xbar_hash.hash.parity_group_mask[parity_group_mask_index=0][byte_number=0].parity_group_mask to be 0x2.  (previous value = 0x0  OR  new value = 0x2)
 Configuring dp.xbar_hash.hash.parity_group_mask[parity_group_mask_index=0][byte_number=1].parity_group_mask to be 0x0.  (previous value = 0x0  OR  new value = 0x0)
 Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=6][hash_bit_index=40].byte0 to be 0x2.
@@ -128,13 +128,13 @@
     Field right_rotate [3:0]   : 0x7   (4 bits in instruction bits [19:16])
     Field low_bit_hi [2:0]     : 0x0   (3 bits in instruction bits [22:20])
 
-Configuring dp.imem.imem_subword8[unit_number=3][vliw_instruction_number=2].imem_subword8_instr to be 0x74d83.
-Configuring dp.imem.imem_subword8[unit_number=3][vliw_instruction_number=2].imem_subword8_color to be 1.
-Configuring dp.imem.imem_subword8[unit_number=3][vliw_instruction_number=2].imem_subword8_parity to be 1.
-Micro instruction added in VLIW 2 for 8-bit position 3 for table process_packet_out_table.
-  Assembled as 0x74d83 (or decimal 478595)
-  Micro Instruction deposit-field for PHV Container 67 has bit width 20
-    Field Src2 [3:0]           : 0x3   (4 bits in instruction bits [3:0])
+Configuring dp.imem.imem_subword8[unit_number=4][vliw_instruction_number=2].imem_subword8_instr to be 0x74d84.
+Configuring dp.imem.imem_subword8[unit_number=4][vliw_instruction_number=2].imem_subword8_color to be 1.
+Configuring dp.imem.imem_subword8[unit_number=4][vliw_instruction_number=2].imem_subword8_parity to be 0.
+Micro instruction added in VLIW 2 for 8-bit position 4 for table process_packet_out_table.
+  Assembled as 0x74d84 (or decimal 478596)
+  Micro Instruction deposit-field for PHV Container 68 has bit width 20
+    Field Src2 [3:0]           : 0x4   (4 bits in instruction bits [3:0])
     Field Src1 [4:0]           : 0x18   (5 bits in instruction bits [8:4])
     Field Src1i [0:0]          : 0x0   (1 bits in instruction bits [9:9])
     Field opcode [0:0]         : 0x1   (1 bits in instruction bits [10:10])
@@ -143,7 +143,7 @@
     Field right_rotate [2:0]   : 0x7   (3 bits in instruction bits [18:16])
     Field low_bit_hi [0:0]     : 0x0   (1 bits in instruction bits [19:19])
 
-Configuring dp.actionmux_din_power_ctl[14_byte_group=0][byte_position=4].actionmux_din_power_ctl to be 0x8.  (previous value = 0x0  OR new value = 0x8)
+Configuring dp.actionmux_din_power_ctl[14_byte_group=0][byte_position=4].actionmux_din_power_ctl to be 0x10.  (previous value = 0x0  OR new value = 0x10)
 Configuring dp.actionmux_din_power_ctl[14_byte_group=0][byte_position=8].actionmux_din_power_ctl to be 0x6.  (previous value = 0x0  OR new value = 0x6)
 --> Stage Gateway Table for condition process_packet_out_table_always_true_condition in stage 0
 Configuring rams.match.merge.predication_ctl[direction_index=0].table_thread to be 0x3 (previous_value=0x3 OR new_value=0x2).
@@ -215,72 +215,71 @@
 ---- Hash Distribution Units for table table0__action__ ----
 Configuring dp.mau_match_input_xbar_exact_match_enable[direction_index=0].mau_match_input_xbar_exact_match_enable to be 0x3.  (old value = 0x2 OR new value = 0x3)
 Configuring dp.xbar_hash.xbar.mau_match_input_xbar_ternary_match_enable[direction_index=0].mau_match_input_xbar_ternary_match_enable to be 0x0.  (old value = 0x0 OR new value = 0x0)
-Configuring dp.xbar_hash.xbar.match_input_xbar_32b_ctl[word_group=0][output_byte=0].match_input_xbar_32b_ctl_address to be 5.
+Configuring dp.xbar_hash.xbar.match_input_xbar_32b_ctl[word_group=0][output_byte=0].match_input_xbar_32b_ctl_address to be 2.
 Configuring dp.xbar_hash.xbar.match_input_xbar_32b_ctl[word_group=0][output_byte=0].match_input_xbar_32b_ctl_lo_enable to be 1.
-Configuring match input crossbar byte 0 to come from 32-bit PHV container 5.
-  That PHV byte contains {udp.dstPort[7:0]}.
-Configuring dp.xbar_hash.xbar.match_input_xbar_32b_ctl[word_group=0][output_byte=1].match_input_xbar_32b_ctl_address to be 5.
-Configuring dp.xbar_hash.xbar.match_input_xbar_32b_ctl[word_group=0][output_byte=1].match_input_xbar_32b_ctl_lo_enable to be 1.
-Configuring match input crossbar byte 1 to come from 32-bit PHV container 5.
-  That PHV byte contains {udp.dstPort[15:8]}.
-Configuring dp.xbar_hash.xbar.match_input_xbar_32b_ctl[word_group=0][output_byte=2].match_input_xbar_32b_ctl_address to be 5.
-Configuring dp.xbar_hash.xbar.match_input_xbar_32b_ctl[word_group=0][output_byte=2].match_input_xbar_32b_ctl_lo_enable to be 1.
-Configuring match input crossbar byte 2 to come from 32-bit PHV container 5.
-  That PHV byte contains {udp.srcPort[7:0]}.
-Configuring dp.xbar_hash.xbar.match_input_xbar_32b_ctl[word_group=0][output_byte=3].match_input_xbar_32b_ctl_address to be 5.
-Configuring dp.xbar_hash.xbar.match_input_xbar_32b_ctl[word_group=0][output_byte=3].match_input_xbar_32b_ctl_lo_enable to be 1.
-Configuring match input crossbar byte 3 to come from 32-bit PHV container 5.
-  That PHV byte contains {udp.srcPort[15:8]}.
-Configuring dp.xbar_hash.xbar.match_input_xbar_32b_ctl[word_group=0][output_byte=4].match_input_xbar_32b_ctl_address to be 2.
-Configuring dp.xbar_hash.xbar.match_input_xbar_32b_ctl[word_group=0][output_byte=4].match_input_xbar_32b_ctl_lo_enable to be 1.
-Configuring match input crossbar byte 4 to come from 32-bit PHV container 2.
+Configuring match input crossbar byte 0 to come from 32-bit PHV container 2.
   That PHV byte contains {ipv4.dstAddr[7:0]}.
-Configuring dp.xbar_hash.xbar.match_input_xbar_32b_ctl[word_group=0][output_byte=5].match_input_xbar_32b_ctl_address to be 2.
-Configuring dp.xbar_hash.xbar.match_input_xbar_32b_ctl[word_group=0][output_byte=5].match_input_xbar_32b_ctl_lo_enable to be 1.
-Configuring match input crossbar byte 5 to come from 32-bit PHV container 2.
+Configuring dp.xbar_hash.xbar.match_input_xbar_32b_ctl[word_group=0][output_byte=1].match_input_xbar_32b_ctl_address to be 2.
+Configuring dp.xbar_hash.xbar.match_input_xbar_32b_ctl[word_group=0][output_byte=1].match_input_xbar_32b_ctl_lo_enable to be 1.
+Configuring match input crossbar byte 1 to come from 32-bit PHV container 2.
   That PHV byte contains {ipv4.dstAddr[15:8]}.
-Configuring dp.xbar_hash.xbar.match_input_xbar_32b_ctl[word_group=0][output_byte=6].match_input_xbar_32b_ctl_address to be 2.
-Configuring dp.xbar_hash.xbar.match_input_xbar_32b_ctl[word_group=0][output_byte=6].match_input_xbar_32b_ctl_lo_enable to be 1.
-Configuring match input crossbar byte 6 to come from 32-bit PHV container 2.
+Configuring dp.xbar_hash.xbar.match_input_xbar_32b_ctl[word_group=0][output_byte=2].match_input_xbar_32b_ctl_address to be 2.
+Configuring dp.xbar_hash.xbar.match_input_xbar_32b_ctl[word_group=0][output_byte=2].match_input_xbar_32b_ctl_lo_enable to be 1.
+Configuring match input crossbar byte 2 to come from 32-bit PHV container 2.
   That PHV byte contains {ipv4.dstAddr[23:16]}.
+Configuring dp.xbar_hash.xbar.match_input_xbar_32b_ctl[word_group=0][output_byte=3].match_input_xbar_32b_ctl_address to be 3.
+Configuring dp.xbar_hash.xbar.match_input_xbar_32b_ctl[word_group=0][output_byte=3].match_input_xbar_32b_ctl_lo_enable to be 1.
+Configuring match input crossbar byte 3 to come from 32-bit PHV container 3.
+  That PHV byte contains {tcp.dstPort[7:0]}.
+Configuring dp.xbar_hash.xbar.match_input_xbar_32b_ctl[word_group=0][output_byte=4].match_input_xbar_32b_ctl_address to be 1.
+Configuring dp.xbar_hash.xbar.match_input_xbar_32b_ctl[word_group=0][output_byte=4].match_input_xbar_32b_ctl_lo_enable to be 1.
+Configuring match input crossbar byte 4 to come from 32-bit PHV container 1.
+  That PHV byte contains {ipv4.srcAddr[31:24]}.
+Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=5].match_input_xbar_816b_ctl_address to be 20.
+Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=5].match_input_xbar_816b_ctl_enable to be 1.
+Configuring match input crossbar byte 5 to come from 16-bit PHV container 4.
+  That PHV byte contains {tcp.srcPort[7:0]}.
+Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=6].match_input_xbar_816b_ctl_address to be 20.
+Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=6].match_input_xbar_816b_ctl_enable to be 1.
+Configuring match input crossbar byte 6 to come from 16-bit PHV container 4.
+  That PHV byte contains {tcp.dstPort[15:8]}.
 Configuring dp.xbar_hash.xbar.match_input_xbar_32b_ctl[word_group=0][output_byte=7].match_input_xbar_32b_ctl_address to be 2.
 Configuring dp.xbar_hash.xbar.match_input_xbar_32b_ctl[word_group=0][output_byte=7].match_input_xbar_32b_ctl_lo_enable to be 1.
 Configuring match input crossbar byte 7 to come from 32-bit PHV container 2.
   That PHV byte contains {ipv4.dstAddr[31:24]}.
-Configuring dp.xbar_hash.xbar.match_input_xbar_32b_ctl[word_group=0][output_byte=8].match_input_xbar_32b_ctl_address to be 1.
-Configuring dp.xbar_hash.xbar.match_input_xbar_32b_ctl[word_group=0][output_byte=8].match_input_xbar_32b_ctl_lo_enable to be 1.
-Configuring match input crossbar byte 8 to come from 32-bit PHV container 1.
-  That PHV byte contains {ipv4.srcAddr[31:24]}.
+Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=8].match_input_xbar_816b_ctl_address to be 19.
+Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=8].match_input_xbar_816b_ctl_enable to be 1.
+Configuring match input crossbar byte 8 to come from 16-bit PHV container 3.
+  That PHV byte contains {ipv4.srcAddr[7:0]}.
 Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=9].match_input_xbar_816b_ctl_address to be 19.
 Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=9].match_input_xbar_816b_ctl_enable to be 1.
 Configuring match input crossbar byte 9 to come from 16-bit PHV container 3.
   That PHV byte contains {ipv4.srcAddr[15:8]}.
-Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=10].match_input_xbar_816b_ctl_address to be 19.
+Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=10].match_input_xbar_816b_ctl_address to be 1.
 Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=10].match_input_xbar_816b_ctl_enable to be 1.
-Configuring match input crossbar byte 10 to come from 16-bit PHV container 3.
-  That PHV byte contains {ipv4.srcAddr[7:0]}.
+Configuring match input crossbar byte 10 to come from 8-bit PHV container 1.
+  That PHV byte contains {tcp.srcPort[15:8]}.
 Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=11].match_input_xbar_816b_ctl_address to be 0.
 Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=11].match_input_xbar_816b_ctl_enable to be 1.
 Configuring match input crossbar byte 11 to come from 8-bit PHV container 0.
   That PHV byte contains {ipv4.srcAddr[23:16]}.
-Configuring dp.match_input_xbar_din_power_ctl[14_byte_group=0][byte_position=0].match_input_xbar_din_power_ctl to be 0x26.  (previous value = 0x0  OR new value = 0x26)
-Configuring dp.match_input_xbar_din_power_ctl[14_byte_group=0][byte_position=4].match_input_xbar_din_power_ctl to be 0x9.  (previous value = 0x8  OR new value = 0x1)
-Configuring dp.match_input_xbar_din_power_ctl[14_byte_group=0][byte_position=8].match_input_xbar_din_power_ctl to be 0x8.  (previous value = 0x0  OR new value = 0x8)
-Configuring dp.xbar_hash.hash.hash_seed[output_bit=0].hash_seed to be 0x1 (previous value = 0x0  OR  new value = 0x1)
+Configuring dp.match_input_xbar_din_power_ctl[14_byte_group=0][byte_position=0].match_input_xbar_din_power_ctl to be 0xe.  (previous value = 0x0  OR new value = 0xe)
+Configuring dp.match_input_xbar_din_power_ctl[14_byte_group=0][byte_position=4].match_input_xbar_din_power_ctl to be 0x13.  (previous value = 0x10  OR new value = 0x3)
+Configuring dp.match_input_xbar_din_power_ctl[14_byte_group=0][byte_position=8].match_input_xbar_din_power_ctl to be 0x18.  (previous value = 0x0  OR new value = 0x18)
 Configuring dp.xbar_hash.hash.parity_group_mask[parity_group_mask_index=0][byte_number=0].parity_group_mask to be 0x3.  (previous value = 0x2  OR  new value = 0x3)
 Configuring dp.xbar_hash.hash.parity_group_mask[parity_group_mask_index=0][byte_number=1].parity_group_mask to be 0x0.  (previous value = 0x0  OR  new value = 0x0)
-Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=0][hash_bit_index=0].byte0 to be 0x4.
-Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=0][hash_bit_index=0].byte1 to be 0xd1.
-Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=1][hash_bit_index=0].byte0 to be 0x1.
-Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=1][hash_bit_index=0].byte1 to be 0xdf.
-Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=2][hash_bit_index=0].byte0 to be 0x48.
-Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=2][hash_bit_index=0].byte1 to be 0x1b.
-Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=3][hash_bit_index=0].byte0 to be 0x4e.
-Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=3][hash_bit_index=0].byte1 to be 0x5a.
-Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=4][hash_bit_index=0].byte0 to be 0x7.
-Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=4][hash_bit_index=0].byte1 to be 0x82.
-Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=5][hash_bit_index=0].byte0 to be 0xf1.
-Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=5][hash_bit_index=0].byte1 to be 0xfa.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=0][hash_bit_index=0].byte0 to be 0xff.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=0][hash_bit_index=0].byte1 to be 0xaf.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=1][hash_bit_index=0].byte0 to be 0xfe.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=1][hash_bit_index=0].byte1 to be 0xff.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=2][hash_bit_index=0].byte0 to be 0x7f.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=2][hash_bit_index=0].byte1 to be 0xff.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=3][hash_bit_index=0].byte0 to be 0xfb.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=3][hash_bit_index=0].byte1 to be 0x1f.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=4][hash_bit_index=0].byte0 to be 0xfb.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=4][hash_bit_index=0].byte1 to be 0xbf.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=5][hash_bit_index=0].byte0 to be 0xe7.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=5][hash_bit_index=0].byte1 to be 0xe6.
 Configuring dp.hashout_ctl.hash_group_ingress_enable to be 0x1.  (previous value = 0x1 OR new value = 0x1)
 Configuring rams.match.merge.mau_hash_group_config.hash_group_enable to be 1. (old value = 0 OR new value = 1).
 Configuring rams.match.merge.mau_hash_group_config.hash_group_sel to be 8. (old value = 0 OR new value = 8).
@@ -325,69 +324,69 @@
 Configuring match input crossbar byte 133 to come from 16-bit PHV container 0.
   That PHV byte contains version/valid
 {unused[6:0], ig_intr_md.ingress_port[8:8]}.
-Configuring dp.xbar_hash.xbar.match_input_xbar_32b_ctl[word_group=0][output_byte=128].match_input_xbar_32b_ctl_address to be 4.
+Configuring dp.xbar_hash.xbar.match_input_xbar_32b_ctl[word_group=0][output_byte=128].match_input_xbar_32b_ctl_address to be 5.
 Configuring dp.xbar_hash.xbar.match_input_xbar_32b_ctl[word_group=0][output_byte=128].match_input_xbar_32b_ctl_lo_enable to be 1.
-Configuring match input crossbar byte 128 to come from 32-bit PHV container 4.
+Configuring match input crossbar byte 128 to come from 32-bit PHV container 5.
   That PHV byte contains {ethernet.srcAddr[7:0]}.
-Configuring dp.xbar_hash.xbar.match_input_xbar_32b_ctl[word_group=0][output_byte=129].match_input_xbar_32b_ctl_address to be 4.
+Configuring dp.xbar_hash.xbar.match_input_xbar_32b_ctl[word_group=0][output_byte=129].match_input_xbar_32b_ctl_address to be 5.
 Configuring dp.xbar_hash.xbar.match_input_xbar_32b_ctl[word_group=0][output_byte=129].match_input_xbar_32b_ctl_lo_enable to be 1.
-Configuring match input crossbar byte 129 to come from 32-bit PHV container 4.
+Configuring match input crossbar byte 129 to come from 32-bit PHV container 5.
   That PHV byte contains {ethernet.srcAddr[15:8]}.
-Configuring dp.xbar_hash.xbar.match_input_xbar_32b_ctl[word_group=0][output_byte=130].match_input_xbar_32b_ctl_address to be 4.
+Configuring dp.xbar_hash.xbar.match_input_xbar_32b_ctl[word_group=0][output_byte=130].match_input_xbar_32b_ctl_address to be 5.
 Configuring dp.xbar_hash.xbar.match_input_xbar_32b_ctl[word_group=0][output_byte=130].match_input_xbar_32b_ctl_lo_enable to be 1.
-Configuring match input crossbar byte 130 to come from 32-bit PHV container 4.
+Configuring match input crossbar byte 130 to come from 32-bit PHV container 5.
   That PHV byte contains {ethernet.srcAddr[23:16]}.
-Configuring dp.xbar_hash.xbar.match_input_xbar_32b_ctl[word_group=0][output_byte=131].match_input_xbar_32b_ctl_address to be 4.
+Configuring dp.xbar_hash.xbar.match_input_xbar_32b_ctl[word_group=0][output_byte=131].match_input_xbar_32b_ctl_address to be 5.
 Configuring dp.xbar_hash.xbar.match_input_xbar_32b_ctl[word_group=0][output_byte=131].match_input_xbar_32b_ctl_lo_enable to be 1.
-Configuring match input crossbar byte 131 to come from 32-bit PHV container 4.
+Configuring match input crossbar byte 131 to come from 32-bit PHV container 5.
   That PHV byte contains {ethernet.srcAddr[31:24]}.
-Configuring dp.xbar_hash.xbar.match_input_xbar_32b_ctl[word_group=0][output_byte=132].match_input_xbar_32b_ctl_address to be 3.
+Configuring dp.xbar_hash.xbar.match_input_xbar_32b_ctl[word_group=0][output_byte=132].match_input_xbar_32b_ctl_address to be 4.
 Configuring dp.xbar_hash.xbar.match_input_xbar_32b_ctl[word_group=0][output_byte=132].match_input_xbar_32b_ctl_lo_enable to be 1.
-Configuring match input crossbar byte 132 to come from 32-bit PHV container 3.
+Configuring match input crossbar byte 132 to come from 32-bit PHV container 4.
   That PHV byte contains {ethernet.dstAddr[15:8]}.
-Configuring dp.xbar_hash.xbar.match_input_xbar_32b_ctl[word_group=0][output_byte=134].match_input_xbar_32b_ctl_address to be 3.
+Configuring dp.xbar_hash.xbar.match_input_xbar_32b_ctl[word_group=0][output_byte=134].match_input_xbar_32b_ctl_address to be 4.
 Configuring dp.xbar_hash.xbar.match_input_xbar_32b_ctl[word_group=0][output_byte=134].match_input_xbar_32b_ctl_lo_enable to be 1.
-Configuring match input crossbar byte 134 to come from 32-bit PHV container 3.
+Configuring match input crossbar byte 134 to come from 32-bit PHV container 4.
   That PHV byte contains {ethernet.dstAddr[31:24]}.
-Configuring dp.xbar_hash.xbar.match_input_xbar_32b_ctl[word_group=0][output_byte=135].match_input_xbar_32b_ctl_address to be 3.
+Configuring dp.xbar_hash.xbar.match_input_xbar_32b_ctl[word_group=0][output_byte=135].match_input_xbar_32b_ctl_address to be 4.
 Configuring dp.xbar_hash.xbar.match_input_xbar_32b_ctl[word_group=0][output_byte=135].match_input_xbar_32b_ctl_lo_enable to be 1.
-Configuring match input crossbar byte 135 to come from 32-bit PHV container 3.
+Configuring match input crossbar byte 135 to come from 32-bit PHV container 4.
   That PHV byte contains {ethernet.dstAddr[39:32]}.
-Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=136].match_input_xbar_816b_ctl_address to be 21.
+Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=136].match_input_xbar_816b_ctl_address to be 22.
 Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=136].match_input_xbar_816b_ctl_enable to be 1.
-Configuring match input crossbar byte 136 to come from 16-bit PHV container 5.
+Configuring match input crossbar byte 136 to come from 16-bit PHV container 6.
   That PHV byte contains {ethernet.etherType[7:0]}.
-Configuring dp.xbar_hash.xbar.match_input_xbar_32b_ctl[word_group=0][output_byte=137].match_input_xbar_32b_ctl_address to be 3.
+Configuring dp.xbar_hash.xbar.match_input_xbar_32b_ctl[word_group=0][output_byte=137].match_input_xbar_32b_ctl_address to be 4.
 Configuring dp.xbar_hash.xbar.match_input_xbar_32b_ctl[word_group=0][output_byte=137].match_input_xbar_32b_ctl_lo_enable to be 1.
-Configuring match input crossbar byte 137 to come from 32-bit PHV container 3.
+Configuring match input crossbar byte 137 to come from 32-bit PHV container 4.
   That PHV byte contains {ethernet.dstAddr[23:16]}.
-Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=138].match_input_xbar_816b_ctl_address to be 20.
+Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=138].match_input_xbar_816b_ctl_address to be 21.
 Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=138].match_input_xbar_816b_ctl_enable to be 1.
-Configuring match input crossbar byte 138 to come from 16-bit PHV container 4.
+Configuring match input crossbar byte 138 to come from 16-bit PHV container 5.
   That PHV byte contains {ethernet.srcAddr[47:40]}.
-Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=139].match_input_xbar_816b_ctl_address to be 21.
+Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=139].match_input_xbar_816b_ctl_address to be 22.
 Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=139].match_input_xbar_816b_ctl_enable to be 1.
-Configuring match input crossbar byte 139 to come from 16-bit PHV container 5.
+Configuring match input crossbar byte 139 to come from 16-bit PHV container 6.
   That PHV byte contains {ethernet.etherType[15:8]}.
 Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=140].match_input_xbar_816b_ctl_address to be 16.
 Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=140].match_input_xbar_816b_ctl_enable to be 1.
 Configuring match input crossbar byte 140 to come from 16-bit PHV container 0.
   That PHV byte contains {ig_intr_md.ingress_port[7:0]}.
-Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=141].match_input_xbar_816b_ctl_address to be 20.
+Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=141].match_input_xbar_816b_ctl_address to be 21.
 Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=141].match_input_xbar_816b_ctl_enable to be 1.
-Configuring match input crossbar byte 141 to come from 16-bit PHV container 4.
+Configuring match input crossbar byte 141 to come from 16-bit PHV container 5.
   That PHV byte contains {ethernet.dstAddr[7:0]}.
-Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=142].match_input_xbar_816b_ctl_address to be 2.
+Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=142].match_input_xbar_816b_ctl_address to be 3.
 Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=142].match_input_xbar_816b_ctl_enable to be 1.
-Configuring match input crossbar byte 142 to come from 8-bit PHV container 2.
+Configuring match input crossbar byte 142 to come from 8-bit PHV container 3.
   That PHV byte contains {ethernet.srcAddr[39:32]}.
-Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=143].match_input_xbar_816b_ctl_address to be 1.
+Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=143].match_input_xbar_816b_ctl_address to be 2.
 Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=143].match_input_xbar_816b_ctl_enable to be 1.
-Configuring match input crossbar byte 143 to come from 8-bit PHV container 1.
+Configuring match input crossbar byte 143 to come from 8-bit PHV container 2.
   That PHV byte contains {ethernet.dstAddr[47:40]}.
-Configuring dp.match_input_xbar_din_power_ctl[14_byte_group=0][byte_position=0].match_input_xbar_din_power_ctl to be 0x3e.  (previous value = 0x26  OR new value = 0x18)
-Configuring dp.match_input_xbar_din_power_ctl[14_byte_group=0][byte_position=4].match_input_xbar_din_power_ctl to be 0xf.  (previous value = 0x9  OR new value = 0x6)
-Configuring dp.match_input_xbar_din_power_ctl[14_byte_group=0][byte_position=8].match_input_xbar_din_power_ctl to be 0x39.  (previous value = 0x8  OR new value = 0x31)
+Configuring dp.match_input_xbar_din_power_ctl[14_byte_group=0][byte_position=0].match_input_xbar_din_power_ctl to be 0x3e.  (previous value = 0xe  OR new value = 0x30)
+Configuring dp.match_input_xbar_din_power_ctl[14_byte_group=0][byte_position=4].match_input_xbar_din_power_ctl to be 0x1f.  (previous value = 0x13  OR new value = 0xc)
+Configuring dp.match_input_xbar_din_power_ctl[14_byte_group=0][byte_position=8].match_input_xbar_din_power_ctl to be 0x79.  (previous value = 0x18  OR new value = 0x61)
 
 --> Idletime Table for match table table0 in stage 0
 Looking at Map RAM: Row 7 Unit 0
@@ -447,25 +446,25 @@
     Field low_bit_hi [2:0]     : 0x0   (3 bits in instruction bits [22:20])
 
 Configuring dp.actionmux_din_power_ctl[14_byte_group=0][byte_position=8].actionmux_din_power_ctl to be 0x6.  (previous value = 0x6  OR new value = 0x4)
-Configuring dp.imem.imem_subword16[unit_number=6][vliw_instruction_number=1].imem_subword16_instr to be 0xc7a06.
-Configuring dp.imem.imem_subword16[unit_number=6][vliw_instruction_number=1].imem_subword16_color to be 0.
-Configuring dp.imem.imem_subword16[unit_number=6][vliw_instruction_number=1].imem_subword16_parity to be 1.
-Micro instruction added in VLIW 1 for 16-bit position 6 for table table0.
-  Assembled as 0xc7a06 (or decimal 817670)
-  Micro Instruction alu_a for PHV Container 134 has bit width 23
-    Field Src2 [3:0]     : 0x6   (4 bits in instruction bits [3:0])
+Configuring dp.imem.imem_subword16[unit_number=7][vliw_instruction_number=1].imem_subword16_instr to be 0xc7a07.
+Configuring dp.imem.imem_subword16[unit_number=7][vliw_instruction_number=1].imem_subword16_color to be 0.
+Configuring dp.imem.imem_subword16[unit_number=7][vliw_instruction_number=1].imem_subword16_parity to be 0.
+Micro instruction added in VLIW 1 for 16-bit position 7 for table table0.
+  Assembled as 0xc7a07 (or decimal 817671)
+  Micro Instruction alu_a for PHV Container 135 has bit width 23
+    Field Src2 [3:0]     : 0x7   (4 bits in instruction bits [3:0])
     Field Src1 [4:0]     : 0x0   (5 bits in instruction bits [8:4])
     Field Src1i [0:0]    : 0x1   (1 bits in instruction bits [9:9])
     Field opcode [9:0]   : 0x31e   (10 bits in instruction bits [19:10])
     Field unused [2:0]   : 0x0   (3 bits in instruction bits [22:20])
 
-Configuring dp.imem.imem_subword16[unit_number=7][vliw_instruction_number=1].imem_subword16_instr to be 0xc7a27.
-Configuring dp.imem.imem_subword16[unit_number=7][vliw_instruction_number=1].imem_subword16_color to be 0.
-Configuring dp.imem.imem_subword16[unit_number=7][vliw_instruction_number=1].imem_subword16_parity to be 1.
-Micro instruction added in VLIW 1 for 16-bit position 7 for table table0.
-  Assembled as 0xc7a27 (or decimal 817703)
-  Micro Instruction alu_a for PHV Container 135 has bit width 23
-    Field Src2 [3:0]     : 0x7   (4 bits in instruction bits [3:0])
+Configuring dp.imem.imem_subword16[unit_number=8][vliw_instruction_number=1].imem_subword16_instr to be 0xc7a28.
+Configuring dp.imem.imem_subword16[unit_number=8][vliw_instruction_number=1].imem_subword16_color to be 0.
+Configuring dp.imem.imem_subword16[unit_number=8][vliw_instruction_number=1].imem_subword16_parity to be 1.
+Micro instruction added in VLIW 1 for 16-bit position 8 for table table0.
+  Assembled as 0xc7a28 (or decimal 817704)
+  Micro Instruction alu_a for PHV Container 136 has bit width 23
+    Field Src2 [3:0]     : 0x8   (4 bits in instruction bits [3:0])
     Field Src1 [4:0]     : 0x2   (5 bits in instruction bits [8:4])
     Field Src1i [0:0]    : 0x1   (1 bits in instruction bits [9:9])
     Field opcode [9:0]   : 0x31e   (10 bits in instruction bits [19:10])
@@ -486,13 +485,13 @@
     Field right_rotate [3:0]   : 0x0   (4 bits in instruction bits [19:16])
     Field low_bit_hi [2:0]     : 0x0   (3 bits in instruction bits [22:20])
 
-Configuring dp.imem.imem_subword8[unit_number=3][vliw_instruction_number=1].imem_subword8_instr to be 0x593.
-Configuring dp.imem.imem_subword8[unit_number=3][vliw_instruction_number=1].imem_subword8_color to be 1.
-Configuring dp.imem.imem_subword8[unit_number=3][vliw_instruction_number=1].imem_subword8_parity to be 1.
-Micro instruction added in VLIW 1 for 8-bit position 3 for table table0.
-  Assembled as 0x593 (or decimal 1427)
-  Micro Instruction deposit-field for PHV Container 67 has bit width 20
-    Field Src2 [3:0]           : 0x3   (4 bits in instruction bits [3:0])
+Configuring dp.imem.imem_subword8[unit_number=4][vliw_instruction_number=1].imem_subword8_instr to be 0x594.
+Configuring dp.imem.imem_subword8[unit_number=4][vliw_instruction_number=1].imem_subword8_color to be 1.
+Configuring dp.imem.imem_subword8[unit_number=4][vliw_instruction_number=1].imem_subword8_parity to be 0.
+Micro instruction added in VLIW 1 for 8-bit position 4 for table table0.
+  Assembled as 0x594 (or decimal 1428)
+  Micro Instruction deposit-field for PHV Container 68 has bit width 20
+    Field Src2 [3:0]           : 0x4   (4 bits in instruction bits [3:0])
     Field Src1 [4:0]           : 0x19   (5 bits in instruction bits [8:4])
     Field Src1i [0:0]          : 0x0   (1 bits in instruction bits [9:9])
     Field opcode [0:0]         : 0x1   (1 bits in instruction bits [10:10])
@@ -516,15 +515,15 @@
     Field right_rotate [3:0]   : 0x9   (4 bits in instruction bits [19:16])
     Field low_bit_hi [2:0]     : 0x3   (3 bits in instruction bits [22:20])
 
-Configuring dp.actionmux_din_power_ctl[14_byte_group=0][byte_position=4].actionmux_din_power_ctl to be 0x8.  (previous value = 0x8  OR new value = 0x8)
+Configuring dp.actionmux_din_power_ctl[14_byte_group=0][byte_position=4].actionmux_din_power_ctl to be 0x10.  (previous value = 0x10  OR new value = 0x10)
 Configuring dp.actionmux_din_power_ctl[14_byte_group=0][byte_position=8].actionmux_din_power_ctl to be 0x7.  (previous value = 0x6  OR new value = 0x7)
-Configuring dp.imem.imem_subword8[unit_number=4][vliw_instruction_number=2].imem_subword8_instr to be 0xb7d94.
-Configuring dp.imem.imem_subword8[unit_number=4][vliw_instruction_number=2].imem_subword8_color to be 0.
-Configuring dp.imem.imem_subword8[unit_number=4][vliw_instruction_number=2].imem_subword8_parity to be 0.
-Micro instruction added in VLIW 2 for 8-bit position 4 for table table0.
-  Assembled as 0xb7d94 (or decimal 753044)
-  Micro Instruction deposit-field for PHV Container 68 has bit width 20
-    Field Src2 [3:0]           : 0x4   (4 bits in instruction bits [3:0])
+Configuring dp.imem.imem_subword8[unit_number=5][vliw_instruction_number=2].imem_subword8_instr to be 0xb7d95.
+Configuring dp.imem.imem_subword8[unit_number=5][vliw_instruction_number=2].imem_subword8_color to be 0.
+Configuring dp.imem.imem_subword8[unit_number=5][vliw_instruction_number=2].imem_subword8_parity to be 1.
+Micro instruction added in VLIW 2 for 8-bit position 5 for table table0.
+  Assembled as 0xb7d95 (or decimal 753045)
+  Micro Instruction deposit-field for PHV Container 69 has bit width 20
+    Field Src2 [3:0]           : 0x5   (4 bits in instruction bits [3:0])
     Field Src1 [4:0]           : 0x19   (5 bits in instruction bits [8:4])
     Field Src1i [0:0]          : 0x0   (1 bits in instruction bits [9:9])
     Field opcode [0:0]         : 0x1   (1 bits in instruction bits [10:10])
@@ -533,7 +532,7 @@
     Field right_rotate [2:0]   : 0x3   (3 bits in instruction bits [18:16])
     Field low_bit_hi [0:0]     : 0x1   (1 bits in instruction bits [19:19])
 
-Configuring dp.actionmux_din_power_ctl[14_byte_group=0][byte_position=4].actionmux_din_power_ctl to be 0x18.  (previous value = 0x8  OR new value = 0x10)
+Configuring dp.actionmux_din_power_ctl[14_byte_group=0][byte_position=4].actionmux_din_power_ctl to be 0x30.  (previous value = 0x10  OR new value = 0x20)
 Configuring rams.match.merge.mau_payload_shifter_enable[table_type=1][result_bus=0].idletime_adr_payload_shifter_en to be 1.
 Configuring rams.match.merge.mau_payload_shifter_enable[table_type=1][result_bus=0].stats_adr_payload_shifter_en to be 1.
 Configuring rams.match.merge.mau_payload_shifter_enable[table_type=1][result_bus=0].actiondata_adr_payload_shifter_en to be 1.
@@ -773,12 +772,15 @@
 Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=0].phv_ingress_thread to be 0x3f.
 Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=0].phv_ingress_thread_alu to be 0x3f.
 Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=0].phv_ingress_thread_imem to be 0x3f.
-Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=4].phv_ingress_thread to be 0x1f.
-Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=4].phv_ingress_thread_alu to be 0x1f.
-Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=4].phv_ingress_thread_imem to be 0x1f.
+Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=4].phv_ingress_thread to be 0x3f.
+Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=4].phv_ingress_thread_alu to be 0x3f.
+Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=4].phv_ingress_thread_imem to be 0x3f.
 Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=8].phv_ingress_thread to be 0xff.
 Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=8].phv_ingress_thread_alu to be 0xff.
 Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=8].phv_ingress_thread_imem to be 0xff.
+Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=9].phv_ingress_thread to be 0x1.
+Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=9].phv_ingress_thread_alu to be 0x1.
+Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=9].phv_ingress_thread_imem to be 0x1.
 Configuring dp.phv_egress_thread[14_byte_group=0][byte_position=6].phv_egress_thread to be 0x3.
 Configuring dp.phv_egress_thread_alu[14_byte_group=0][byte_position=6].phv_egress_thread_alu to be 0x3.
 Configuring dp.phv_egress_thread_imem[14_byte_group=0][byte_position=6].phv_egress_thread_imem to be 0x3.
@@ -853,23 +855,24 @@
 Configuring rams.match.merge.mau_stats_adr_default[table_type_index=0][result_bus_number=14].mau_stats_adr_default to be 0x80000.
 Configuring dp.mau_match_input_xbar_exact_match_enable[direction_index=0].mau_match_input_xbar_exact_match_enable to be 0x1.  (old value = 0x0 OR new value = 0x1)
 Configuring dp.xbar_hash.xbar.mau_match_input_xbar_ternary_match_enable[direction_index=0].mau_match_input_xbar_ternary_match_enable to be 0x0.  (old value = 0x0 OR new value = 0x0)
-Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=0].match_input_xbar_816b_ctl_address to be 23.
+Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=0].match_input_xbar_816b_ctl_address to be 24.
 Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=0].match_input_xbar_816b_ctl_enable to be 1.
-Configuring match input crossbar byte 0 to come from 16-bit PHV container 7.
+Configuring match input crossbar byte 0 to come from 16-bit PHV container 8.
   That PHV byte contains {ecmp_metadata.selector[7:0]}.
-Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=1].match_input_xbar_816b_ctl_address to be 23.
+Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=1].match_input_xbar_816b_ctl_address to be 24.
 Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=1].match_input_xbar_816b_ctl_enable to be 1.
-Configuring match input crossbar byte 1 to come from 16-bit PHV container 7.
+Configuring match input crossbar byte 1 to come from 16-bit PHV container 8.
   That PHV byte contains {ecmp_metadata.selector[15:8]}.
-Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=2].match_input_xbar_816b_ctl_address to be 22.
+Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=2].match_input_xbar_816b_ctl_address to be 23.
 Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=2].match_input_xbar_816b_ctl_enable to be 1.
-Configuring match input crossbar byte 2 to come from 16-bit PHV container 6.
+Configuring match input crossbar byte 2 to come from 16-bit PHV container 7.
   That PHV byte contains {ecmp_metadata.group_id[7:0]}.
-Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=3].match_input_xbar_816b_ctl_address to be 22.
+Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=3].match_input_xbar_816b_ctl_address to be 23.
 Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=3].match_input_xbar_816b_ctl_enable to be 1.
-Configuring match input crossbar byte 3 to come from 16-bit PHV container 6.
+Configuring match input crossbar byte 3 to come from 16-bit PHV container 7.
   That PHV byte contains {ecmp_metadata.group_id[15:8]}.
-Configuring dp.match_input_xbar_din_power_ctl[14_byte_group=0][byte_position=8].match_input_xbar_din_power_ctl to be 0xc0.  (previous value = 0x0  OR new value = 0xc0)
+Configuring dp.match_input_xbar_din_power_ctl[14_byte_group=0][byte_position=8].match_input_xbar_din_power_ctl to be 0x80.  (previous value = 0x0  OR new value = 0x80)
+Configuring dp.match_input_xbar_din_power_ctl[14_byte_group=0][byte_position=9].match_input_xbar_din_power_ctl to be 0x1.  (previous value = 0x0  OR new value = 0x1)
 Configuring dp.xbar_hash.hash.hash_seed[output_bit=2].hash_seed to be 0x1 (previous value = 0x0  OR  new value = 0x1)
 Configuring dp.xbar_hash.hash.hash_seed[output_bit=3].hash_seed to be 0x1 (previous value = 0x0  OR  new value = 0x1)
 Configuring dp.xbar_hash.hash.hash_seed[output_bit=5].hash_seed to be 0x1 (previous value = 0x0  OR  new value = 0x1)
@@ -1765,12 +1768,15 @@
 Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=0].phv_ingress_thread to be 0x3f.
 Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=0].phv_ingress_thread_alu to be 0x3f.
 Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=0].phv_ingress_thread_imem to be 0x3f.
-Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=4].phv_ingress_thread to be 0x1f.
-Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=4].phv_ingress_thread_alu to be 0x1f.
-Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=4].phv_ingress_thread_imem to be 0x1f.
+Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=4].phv_ingress_thread to be 0x3f.
+Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=4].phv_ingress_thread_alu to be 0x3f.
+Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=4].phv_ingress_thread_imem to be 0x3f.
 Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=8].phv_ingress_thread to be 0xff.
 Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=8].phv_ingress_thread_alu to be 0xff.
 Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=8].phv_ingress_thread_imem to be 0xff.
+Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=9].phv_ingress_thread to be 0x1.
+Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=9].phv_ingress_thread_alu to be 0x1.
+Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=9].phv_ingress_thread_imem to be 0x1.
 Configuring dp.phv_egress_thread[14_byte_group=0][byte_position=6].phv_egress_thread to be 0x3.
 Configuring dp.phv_egress_thread_alu[14_byte_group=0][byte_position=6].phv_egress_thread_alu to be 0x3.
 Configuring dp.phv_egress_thread_imem[14_byte_group=0][byte_position=6].phv_egress_thread_imem to be 0x3.
@@ -1821,26 +1827,26 @@
 Configuring rams.match.merge.logical_table_thread[copy_index=2].logical_table_thread_ingress to be 0x1 (previous_value=0x0 OR new_value=0x1).
 Configuring dp.mau_match_input_xbar_exact_match_enable[direction_index=0].mau_match_input_xbar_exact_match_enable to be 0x1.  (old value = 0x0 OR new value = 0x1)
 Configuring dp.xbar_hash.xbar.mau_match_input_xbar_ternary_match_enable[direction_index=0].mau_match_input_xbar_ternary_match_enable to be 0x0.  (old value = 0x0 OR new value = 0x0)
-Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=0].match_input_xbar_816b_ctl_address to be 18.
-Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=0].match_input_xbar_816b_ctl_enable to be 1.
-Configuring match input crossbar byte 0 to come from 16-bit PHV container 2.
+Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=2].match_input_xbar_816b_ctl_address to be 18.
+Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=2].match_input_xbar_816b_ctl_enable to be 1.
+Configuring match input crossbar byte 2 to come from 16-bit PHV container 2.
   That PHV byte contains {ig_intr_md_for_tm.ucast_egress_port[7:0]}.
-Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=1].match_input_xbar_816b_ctl_address to be 18.
-Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=1].match_input_xbar_816b_ctl_enable to be 1.
-Configuring match input crossbar byte 1 to come from 16-bit PHV container 2.
+Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=3].match_input_xbar_816b_ctl_address to be 18.
+Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=3].match_input_xbar_816b_ctl_enable to be 1.
+Configuring match input crossbar byte 3 to come from 16-bit PHV container 2.
   That PHV byte contains {unused[6:0], ig_intr_md_for_tm.ucast_egress_port[8:8]}.
 Configuring dp.match_input_xbar_din_power_ctl[14_byte_group=0][byte_position=8].match_input_xbar_din_power_ctl to be 0x4.  (previous value = 0x0  OR new value = 0x4)
 Configuring dp.xbar_hash.hash.parity_group_mask[parity_group_mask_index=0][byte_number=0].parity_group_mask to be 0x1.  (previous value = 0x0  OR  new value = 0x1)
 Configuring dp.xbar_hash.hash.parity_group_mask[parity_group_mask_index=0][byte_number=1].parity_group_mask to be 0x0.  (previous value = 0x0  OR  new value = 0x0)
-Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=0][hash_bit_index=40].byte1 to be 0x1.
-Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=0][hash_bit_index=41].byte0 to be 0x1.
-Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=0][hash_bit_index=42].byte0 to be 0x2.
-Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=0][hash_bit_index=43].byte0 to be 0x4.
-Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=0][hash_bit_index=44].byte0 to be 0x8.
-Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=0][hash_bit_index=45].byte0 to be 0x10.
-Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=0][hash_bit_index=46].byte0 to be 0x20.
-Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=0][hash_bit_index=47].byte0 to be 0x40.
-Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=0][hash_bit_index=48].byte0 to be 0x80.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=1][hash_bit_index=40].byte1 to be 0x1.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=1][hash_bit_index=41].byte0 to be 0x1.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=1][hash_bit_index=42].byte0 to be 0x2.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=1][hash_bit_index=43].byte0 to be 0x4.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=1][hash_bit_index=44].byte0 to be 0x8.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=1][hash_bit_index=45].byte0 to be 0x10.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=1][hash_bit_index=46].byte0 to be 0x20.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=1][hash_bit_index=47].byte0 to be 0x40.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=1][hash_bit_index=48].byte0 to be 0x80.
 Configuring dp.hashout_ctl.hash_group_ingress_enable to be 0x1.  (previous value = 0x0 OR new value = 0x1)
 Configuring rams.array.row[row=7].vh_xbar[search_bus_index=0].exactmatch_row_vh_xbar_ctl.exactmatch_row_vh_xbar_select to be 0.
 Configuring rams.array.row[row=7].vh_xbar[search_bus_index=0].exactmatch_row_vh_xbar_ctl.exactmatch_row_vh_xbar_enable to be 1.
@@ -1858,23 +1864,23 @@
 Configuring rams.array.row[7].gateway_table[1].gateway_table_entry_matchdata[3][0] to be 0xffffffff
 Configuring rams.array.row[7].gateway_table[1].gateway_table_entry_matchdata[3][1] to be 0xffffffff
 Configuring rams.array.row[7].gateway_table[1].gateway_table_ctl.gateway_table_mode to be 0x2
-Configuring rams.array.row[7].gateway_table[1].gateway_table_data_entry[3][0] to be 0xffffff
-Configuring rams.array.row[7].gateway_table[1].gateway_table_data_entry[3][1] to be 0xffff3f
+Configuring rams.array.row[7].gateway_table[1].gateway_table_data_entry[3][0] to be 0xffff00
+Configuring rams.array.row[7].gateway_table[1].gateway_table_data_entry[3][1] to be 0xffff00
 Configuring rams.match.merge.gateway_inhibit_lut[0] to be 0x8
 Configuring rams.match.merge.gateway_next_table_lut[0][3] to be 0x21
 Configuring rams.array.row[7].gateway_table[1].gateway_table_vv_entry[2].gateway_table_entry_versionvalid0 to be 0x3
 Configuring rams.array.row[7].gateway_table[1].gateway_table_vv_entry[2].gateway_table_entry_versionvalid1 to be 0x3
 Configuring rams.array.row[7].gateway_table[1].gateway_table_entry_matchdata[2][0] to be 0xffffffff
 Configuring rams.array.row[7].gateway_table[1].gateway_table_entry_matchdata[2][1] to be 0xffffffff
-Configuring rams.array.row[7].gateway_table[1].gateway_table_data_entry[2][0] to be 0xffffff
-Configuring rams.array.row[7].gateway_table[1].gateway_table_data_entry[2][1] to be 0xff7fff
+Configuring rams.array.row[7].gateway_table[1].gateway_table_data_entry[2][0] to be 0xff00ff
+Configuring rams.array.row[7].gateway_table[1].gateway_table_data_entry[2][1] to be 0xff00ff
 Configuring rams.match.merge.gateway_inhibit_lut[0] to be 0xc (previous value 0x8 OR new value 0x4)
 Configuring rams.match.merge.gateway_next_table_lut[0][2] to be 0x21
 Configuring rams.array.row[7].gateway_table[1].gateway_table_vv_entry[1].gateway_table_entry_versionvalid0 to be 0x3
 Configuring rams.array.row[7].gateway_table[1].gateway_table_vv_entry[1].gateway_table_entry_versionvalid1 to be 0x3
 Configuring rams.array.row[7].gateway_table[1].gateway_table_entry_matchdata[1][0] to be 0xffffffff
 Configuring rams.array.row[7].gateway_table[1].gateway_table_entry_matchdata[1][1] to be 0xffffffff
-Configuring rams.array.row[7].gateway_table[1].gateway_table_data_entry[1][0] to be 0x1ffff
+Configuring rams.array.row[7].gateway_table[1].gateway_table_data_entry[1][0] to be 0x3ffff
 Configuring rams.array.row[7].gateway_table[1].gateway_table_data_entry[1][1] to be 0xffff
 Configuring rams.match.merge.gateway_inhibit_lut[0] to be 0xe (previous value 0xc OR new value 0x2)
 Configuring rams.match.merge.gateway_next_table_lut[0][1] to be 0x21
@@ -1900,7 +1906,7 @@
 +------------------------------------------------------------------------
 |  Working on table ingress_port_count_table in stage 2 ---
 +------------------------------------------------------------------------
---> Match Table with no key ingress_port_count_table with logical_table_id 0
+--> Hash Action Table ingress_port_count_table with logical_table_id 0
 allocated_result_bus = Ram Data Bus MatchResult2R 0 left_and_right is 83 bits
 Configuring rams.match.merge.predication_ctl[direction_index=0].table_thread to be 0x1 (previous_value=0x1 OR new_value=0x1).
 Configuring rams.match.merge.logical_table_thread[copy_index=0].logical_table_thread_ingress to be 0x1 (previous_value=0x1 OR new_value=0x1).
@@ -1920,6 +1926,37 @@
 Configuring rams.match.merge.mau_action_instruction_adr_map_en[table_type_index=0].mau_action_instruction_adr_map_en to be 0x1 (previous_value=0x0 OR new_value=0x1).
 Configuring rams.match.merge.mau_action_instruction_adr_map_data[table_type_index=0][logical_table=0][entry_index=0].mau_action_instruction_adr_map_data to be 0x2000.
 Configuring rams.match.merge.mau_action_instruction_adr_map_data[table_type_index=0][logical_table=0][entry_index=1].mau_action_instruction_adr_map_data to be 0x0.
+
+---- Hash Distribution Units for table ingress_port_count_table ----
+Configuring dp.mau_match_input_xbar_exact_match_enable[direction_index=0].mau_match_input_xbar_exact_match_enable to be 0x1.  (old value = 0x1 OR new value = 0x1)
+Configuring dp.xbar_hash.xbar.mau_match_input_xbar_ternary_match_enable[direction_index=0].mau_match_input_xbar_ternary_match_enable to be 0x0.  (old value = 0x0 OR new value = 0x0)
+Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=0].match_input_xbar_816b_ctl_address to be 16.
+Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=0].match_input_xbar_816b_ctl_enable to be 1.
+Configuring match input crossbar byte 0 to come from 16-bit PHV container 0.
+  That PHV byte contains {ig_intr_md.ingress_port[7:0]}.
+Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=1].match_input_xbar_816b_ctl_address to be 16.
+Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=1].match_input_xbar_816b_ctl_enable to be 1.
+Configuring match input crossbar byte 1 to come from 16-bit PHV container 0.
+  That PHV byte contains {unused[6:0], ig_intr_md.ingress_port[8:8]}.
+Configuring dp.match_input_xbar_din_power_ctl[14_byte_group=0][byte_position=8].match_input_xbar_din_power_ctl to be 0x5.  (previous value = 0x4  OR new value = 0x1)
+Configuring dp.xbar_hash.hash.parity_group_mask[parity_group_mask_index=0][byte_number=0].parity_group_mask to be 0x1.  (previous value = 0x1  OR  new value = 0x1)
+Configuring dp.xbar_hash.hash.parity_group_mask[parity_group_mask_index=0][byte_number=1].parity_group_mask to be 0x0.  (previous value = 0x0  OR  new value = 0x0)
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=0][hash_bit_index=0].byte0 to be 0x1.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=0][hash_bit_index=1].byte0 to be 0x2.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=0][hash_bit_index=2].byte0 to be 0x4.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=0][hash_bit_index=3].byte0 to be 0x8.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=0][hash_bit_index=4].byte0 to be 0x10.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=0][hash_bit_index=5].byte0 to be 0x20.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=0][hash_bit_index=6].byte0 to be 0x40.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=0][hash_bit_index=7].byte0 to be 0x80.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=0][hash_bit_index=8].byte1 to be 0x1.
+Configuring dp.hashout_ctl.hash_group_ingress_enable to be 0x1.  (previous value = 0x1 OR new value = 0x1)
+Configuring rams.match.merge.mau_hash_group_config.hash_group_enable to be 1. (old value = 0 OR new value = 1).
+Configuring rams.match.merge.mau_hash_group_config.hash_group_sel to be 8. (old value = 0 OR new value = 8).
+Configuring rams.match.merge.mau_hash_group_config.hash_group_ctl to be 1. (old value = 0 OR new value = 1).
+Configuring rams.match.merge.mau_hash_group_shiftcount.mau_hash_group_shiftcount to be 0x1. (old value = 0x0 OR new value = 0x1).
+Configuring rams.match.merge.mau_hash_group_mask[which_16=0].mau_hash_group_mask to be 0x3ff.  (previous value = 0x0  OR new value = 0x3ff)
+Configuring rams.match.merge.mau_hash_group_xbar_ctl[output_type_index=3][control_group_index=0].mau_hash_group_xbar_ctl to be 0x8 (old value = 0x0 OR new value = 0x8).
 Configuring rams.match.merge.mau_payload_shifter_enable[table_type=0][result_bus=1].stats_adr_payload_shifter_en to be 1.
 Configuring rams.match.merge.mau_payload_shifter_enable[table_type=0][result_bus=1].action_instruction_adr_payload_shifter_en to be 1.
 
@@ -1931,7 +1968,7 @@
 +------------------------------------------------------------------------
 |  Working on table egress_port_count_table in stage 2 ---
 +------------------------------------------------------------------------
---> Match Table with no key egress_port_count_table with logical_table_id 1
+--> Hash Action Table egress_port_count_table with logical_table_id 1
 allocated_result_bus = Ram Data Bus MatchResult1R 0 left_and_right is 83 bits
 Configuring rams.match.merge.predication_ctl[direction_index=0].table_thread to be 0x3 (previous_value=0x1 OR new_value=0x2).
 Configuring rams.match.merge.logical_table_thread[copy_index=0].logical_table_thread_ingress to be 0x3 (previous_value=0x1 OR new_value=0x2).
@@ -1951,6 +1988,37 @@
 Configuring rams.match.merge.mau_action_instruction_adr_map_en[table_type_index=0].mau_action_instruction_adr_map_en to be 0x3 (previous_value=0x1 OR new_value=0x2).
 Configuring rams.match.merge.mau_action_instruction_adr_map_data[table_type_index=0][logical_table=1][entry_index=0].mau_action_instruction_adr_map_data to be 0x40.
 Configuring rams.match.merge.mau_action_instruction_adr_map_data[table_type_index=0][logical_table=1][entry_index=1].mau_action_instruction_adr_map_data to be 0x0.
+
+---- Hash Distribution Units for table egress_port_count_table ----
+Configuring dp.mau_match_input_xbar_exact_match_enable[direction_index=0].mau_match_input_xbar_exact_match_enable to be 0x3.  (old value = 0x1 OR new value = 0x2)
+Configuring dp.xbar_hash.xbar.mau_match_input_xbar_ternary_match_enable[direction_index=0].mau_match_input_xbar_ternary_match_enable to be 0x0.  (old value = 0x0 OR new value = 0x0)
+Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=8].match_input_xbar_816b_ctl_address to be 18.
+Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=8].match_input_xbar_816b_ctl_enable to be 1.
+Configuring match input crossbar byte 8 to come from 16-bit PHV container 2.
+  That PHV byte contains {ig_intr_md_for_tm.ucast_egress_port[7:0]}.
+Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=9].match_input_xbar_816b_ctl_address to be 18.
+Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=9].match_input_xbar_816b_ctl_enable to be 1.
+Configuring match input crossbar byte 9 to come from 16-bit PHV container 2.
+  That PHV byte contains {unused[6:0], ig_intr_md_for_tm.ucast_egress_port[8:8]}.
+Configuring dp.match_input_xbar_din_power_ctl[14_byte_group=0][byte_position=8].match_input_xbar_din_power_ctl to be 0x5.  (previous value = 0x5  OR new value = 0x4)
+Configuring dp.xbar_hash.hash.parity_group_mask[parity_group_mask_index=1][byte_number=0].parity_group_mask to be 0x2.  (previous value = 0x0  OR  new value = 0x2)
+Configuring dp.xbar_hash.hash.parity_group_mask[parity_group_mask_index=1][byte_number=1].parity_group_mask to be 0x0.  (previous value = 0x0  OR  new value = 0x0)
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=4][hash_bit_index=0].byte0 to be 0x1.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=4][hash_bit_index=1].byte0 to be 0x2.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=4][hash_bit_index=2].byte0 to be 0x4.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=4][hash_bit_index=3].byte0 to be 0x8.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=4][hash_bit_index=4].byte0 to be 0x10.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=4][hash_bit_index=5].byte0 to be 0x20.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=4][hash_bit_index=6].byte0 to be 0x40.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=4][hash_bit_index=7].byte0 to be 0x80.
+Configuring dp.xbar_hash.hash.galois_field_matrix[byte_pair_index=4][hash_bit_index=8].byte1 to be 0x1.
+Configuring dp.hashout_ctl.hash_group_ingress_enable to be 0x3.  (previous value = 0x1 OR new value = 0x2)
+Configuring rams.match.merge.mau_hash_group_config.hash_group_enable to be 9. (old value = 1 OR new value = 8).
+Configuring rams.match.merge.mau_hash_group_config.hash_group_sel to be 152. (old value = 8 OR new value = 144).
+Configuring rams.match.merge.mau_hash_group_config.hash_group_ctl to be 65. (old value = 1 OR new value = 64).
+Configuring rams.match.merge.mau_hash_group_shiftcount.mau_hash_group_shiftcount to be 0x201. (old value = 0x1 OR new value = 0x200).
+Configuring rams.match.merge.mau_hash_group_mask[which_16=3].mau_hash_group_mask to be 0x3ff.  (previous value = 0x0  OR new value = 0x3ff)
+Configuring rams.match.merge.mau_hash_group_xbar_ctl[output_type_index=3][control_group_index=0].mau_hash_group_xbar_ctl to be 0xb8 (old value = 0x8 OR new value = 0xb0).
 --> Stage Gateway Table for condition egress_port_count_table_always_true_condition in stage 2
 Configuring rams.match.merge.predication_ctl[direction_index=0].table_thread to be 0x3 (previous_value=0x3 OR new_value=0x2).
 Configuring rams.match.adrdist.adr_dist_table_thread[direction_index=0][copy_index=0].adr_dist_table_thread to be 0x3 (previous_value=0x3 OR new_value=0x2).
@@ -1958,11 +2026,11 @@
 Configuring rams.match.merge.logical_table_thread[copy_index=0].logical_table_thread_ingress to be 0x3 (previous_value=0x3 OR new_value=0x2).
 Configuring rams.match.merge.logical_table_thread[copy_index=1].logical_table_thread_ingress to be 0x3 (previous_value=0x3 OR new_value=0x2).
 Configuring rams.match.merge.logical_table_thread[copy_index=2].logical_table_thread_ingress to be 0x3 (previous_value=0x3 OR new_value=0x2).
-Configuring dp.mau_match_input_xbar_exact_match_enable[direction_index=0].mau_match_input_xbar_exact_match_enable to be 0x1.  (old value = 0x1 OR new value = 0x0)
+Configuring dp.mau_match_input_xbar_exact_match_enable[direction_index=0].mau_match_input_xbar_exact_match_enable to be 0x3.  (old value = 0x3 OR new value = 0x0)
 Configuring dp.xbar_hash.xbar.mau_match_input_xbar_ternary_match_enable[direction_index=0].mau_match_input_xbar_ternary_match_enable to be 0x0.  (old value = 0x0 OR new value = 0x0)
 Configuring dp.xbar_hash.hash.parity_group_mask[parity_group_mask_index=0][byte_number=0].parity_group_mask to be 0x1.  (previous value = 0x1  OR  new value = 0x0)
 Configuring dp.xbar_hash.hash.parity_group_mask[parity_group_mask_index=0][byte_number=1].parity_group_mask to be 0x0.  (previous value = 0x0  OR  new value = 0x0)
-Configuring dp.hashout_ctl.hash_group_ingress_enable to be 0x1.  (previous value = 0x1 OR new value = 0x1)
+Configuring dp.hashout_ctl.hash_group_ingress_enable to be 0x3.  (previous value = 0x3 OR new value = 0x1)
 Configuring rams.array.row[7].gateway_table[0].gateway_table_ctl.gateway_table_input_data0_select to be 0x1
 Configuring rams.array.row[7].gateway_table[0].gateway_table_ctl.gateway_table_input_data1_select to be 0x0
 Configuring rams.array.row[7].gateway_table[0].gateway_table_ctl.gateway_table_input_hash0_select to be 0x1
@@ -2199,12 +2267,15 @@
 Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=0].phv_ingress_thread to be 0x3f.
 Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=0].phv_ingress_thread_alu to be 0x3f.
 Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=0].phv_ingress_thread_imem to be 0x3f.
-Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=4].phv_ingress_thread to be 0x1f.
-Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=4].phv_ingress_thread_alu to be 0x1f.
-Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=4].phv_ingress_thread_imem to be 0x1f.
+Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=4].phv_ingress_thread to be 0x3f.
+Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=4].phv_ingress_thread_alu to be 0x3f.
+Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=4].phv_ingress_thread_imem to be 0x3f.
 Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=8].phv_ingress_thread to be 0xff.
 Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=8].phv_ingress_thread_alu to be 0xff.
 Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=8].phv_ingress_thread_imem to be 0xff.
+Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=9].phv_ingress_thread to be 0x1.
+Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=9].phv_ingress_thread_alu to be 0x1.
+Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=9].phv_ingress_thread_imem to be 0x1.
 Configuring dp.phv_egress_thread[14_byte_group=0][byte_position=6].phv_egress_thread to be 0x3.
 Configuring dp.phv_egress_thread_alu[14_byte_group=0][byte_position=6].phv_egress_thread_alu to be 0x3.
 Configuring dp.phv_egress_thread_imem[14_byte_group=0][byte_position=6].phv_egress_thread_imem to be 0x3.
@@ -2281,12 +2352,15 @@
 Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=0].phv_ingress_thread to be 0x3f.
 Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=0].phv_ingress_thread_alu to be 0x3f.
 Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=0].phv_ingress_thread_imem to be 0x3f.
-Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=4].phv_ingress_thread to be 0x1f.
-Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=4].phv_ingress_thread_alu to be 0x1f.
-Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=4].phv_ingress_thread_imem to be 0x1f.
+Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=4].phv_ingress_thread to be 0x3f.
+Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=4].phv_ingress_thread_alu to be 0x3f.
+Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=4].phv_ingress_thread_imem to be 0x3f.
 Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=8].phv_ingress_thread to be 0xff.
 Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=8].phv_ingress_thread_alu to be 0xff.
 Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=8].phv_ingress_thread_imem to be 0xff.
+Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=9].phv_ingress_thread to be 0x1.
+Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=9].phv_ingress_thread_alu to be 0x1.
+Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=9].phv_ingress_thread_imem to be 0x1.
 Configuring dp.phv_egress_thread[14_byte_group=0][byte_position=6].phv_egress_thread to be 0x3.
 Configuring dp.phv_egress_thread_alu[14_byte_group=0][byte_position=6].phv_egress_thread_alu to be 0x3.
 Configuring dp.phv_egress_thread_imem[14_byte_group=0][byte_position=6].phv_egress_thread_imem to be 0x3.
@@ -2363,12 +2437,15 @@
 Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=0].phv_ingress_thread to be 0x3f.
 Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=0].phv_ingress_thread_alu to be 0x3f.
 Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=0].phv_ingress_thread_imem to be 0x3f.
-Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=4].phv_ingress_thread to be 0x1f.
-Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=4].phv_ingress_thread_alu to be 0x1f.
-Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=4].phv_ingress_thread_imem to be 0x1f.
+Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=4].phv_ingress_thread to be 0x3f.
+Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=4].phv_ingress_thread_alu to be 0x3f.
+Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=4].phv_ingress_thread_imem to be 0x3f.
 Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=8].phv_ingress_thread to be 0xff.
 Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=8].phv_ingress_thread_alu to be 0xff.
 Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=8].phv_ingress_thread_imem to be 0xff.
+Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=9].phv_ingress_thread to be 0x1.
+Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=9].phv_ingress_thread_alu to be 0x1.
+Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=9].phv_ingress_thread_imem to be 0x1.
 Configuring dp.phv_egress_thread[14_byte_group=0][byte_position=6].phv_egress_thread to be 0x3.
 Configuring dp.phv_egress_thread_alu[14_byte_group=0][byte_position=6].phv_egress_thread_alu to be 0x3.
 Configuring dp.phv_egress_thread_imem[14_byte_group=0][byte_position=6].phv_egress_thread_imem to be 0x3.
@@ -2445,12 +2522,15 @@
 Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=0].phv_ingress_thread to be 0x3f.
 Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=0].phv_ingress_thread_alu to be 0x3f.
 Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=0].phv_ingress_thread_imem to be 0x3f.
-Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=4].phv_ingress_thread to be 0x1f.
-Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=4].phv_ingress_thread_alu to be 0x1f.
-Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=4].phv_ingress_thread_imem to be 0x1f.
+Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=4].phv_ingress_thread to be 0x3f.
+Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=4].phv_ingress_thread_alu to be 0x3f.
+Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=4].phv_ingress_thread_imem to be 0x3f.
 Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=8].phv_ingress_thread to be 0xff.
 Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=8].phv_ingress_thread_alu to be 0xff.
 Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=8].phv_ingress_thread_imem to be 0xff.
+Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=9].phv_ingress_thread to be 0x1.
+Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=9].phv_ingress_thread_alu to be 0x1.
+Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=9].phv_ingress_thread_imem to be 0x1.
 Configuring dp.phv_egress_thread[14_byte_group=0][byte_position=6].phv_egress_thread to be 0x3.
 Configuring dp.phv_egress_thread_alu[14_byte_group=0][byte_position=6].phv_egress_thread_alu to be 0x3.
 Configuring dp.phv_egress_thread_imem[14_byte_group=0][byte_position=6].phv_egress_thread_imem to be 0x3.
@@ -2527,12 +2607,15 @@
 Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=0].phv_ingress_thread to be 0x3f.
 Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=0].phv_ingress_thread_alu to be 0x3f.
 Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=0].phv_ingress_thread_imem to be 0x3f.
-Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=4].phv_ingress_thread to be 0x1f.
-Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=4].phv_ingress_thread_alu to be 0x1f.
-Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=4].phv_ingress_thread_imem to be 0x1f.
+Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=4].phv_ingress_thread to be 0x3f.
+Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=4].phv_ingress_thread_alu to be 0x3f.
+Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=4].phv_ingress_thread_imem to be 0x3f.
 Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=8].phv_ingress_thread to be 0xff.
 Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=8].phv_ingress_thread_alu to be 0xff.
 Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=8].phv_ingress_thread_imem to be 0xff.
+Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=9].phv_ingress_thread to be 0x1.
+Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=9].phv_ingress_thread_alu to be 0x1.
+Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=9].phv_ingress_thread_imem to be 0x1.
 Configuring dp.phv_egress_thread[14_byte_group=0][byte_position=6].phv_egress_thread to be 0x3.
 Configuring dp.phv_egress_thread_alu[14_byte_group=0][byte_position=6].phv_egress_thread_alu to be 0x3.
 Configuring dp.phv_egress_thread_imem[14_byte_group=0][byte_position=6].phv_egress_thread_imem to be 0x3.
@@ -2609,12 +2692,15 @@
 Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=0].phv_ingress_thread to be 0x3f.
 Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=0].phv_ingress_thread_alu to be 0x3f.
 Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=0].phv_ingress_thread_imem to be 0x3f.
-Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=4].phv_ingress_thread to be 0x1f.
-Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=4].phv_ingress_thread_alu to be 0x1f.
-Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=4].phv_ingress_thread_imem to be 0x1f.
+Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=4].phv_ingress_thread to be 0x3f.
+Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=4].phv_ingress_thread_alu to be 0x3f.
+Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=4].phv_ingress_thread_imem to be 0x3f.
 Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=8].phv_ingress_thread to be 0xff.
 Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=8].phv_ingress_thread_alu to be 0xff.
 Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=8].phv_ingress_thread_imem to be 0xff.
+Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=9].phv_ingress_thread to be 0x1.
+Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=9].phv_ingress_thread_alu to be 0x1.
+Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=9].phv_ingress_thread_imem to be 0x1.
 Configuring dp.phv_egress_thread[14_byte_group=0][byte_position=6].phv_egress_thread to be 0x3.
 Configuring dp.phv_egress_thread_alu[14_byte_group=0][byte_position=6].phv_egress_thread_alu to be 0x3.
 Configuring dp.phv_egress_thread_imem[14_byte_group=0][byte_position=6].phv_egress_thread_imem to be 0x3.
@@ -2691,12 +2777,15 @@
 Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=0].phv_ingress_thread to be 0x3f.
 Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=0].phv_ingress_thread_alu to be 0x3f.
 Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=0].phv_ingress_thread_imem to be 0x3f.
-Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=4].phv_ingress_thread to be 0x1f.
-Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=4].phv_ingress_thread_alu to be 0x1f.
-Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=4].phv_ingress_thread_imem to be 0x1f.
+Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=4].phv_ingress_thread to be 0x3f.
+Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=4].phv_ingress_thread_alu to be 0x3f.
+Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=4].phv_ingress_thread_imem to be 0x3f.
 Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=8].phv_ingress_thread to be 0xff.
 Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=8].phv_ingress_thread_alu to be 0xff.
 Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=8].phv_ingress_thread_imem to be 0xff.
+Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=9].phv_ingress_thread to be 0x1.
+Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=9].phv_ingress_thread_alu to be 0x1.
+Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=9].phv_ingress_thread_imem to be 0x1.
 Configuring dp.phv_egress_thread[14_byte_group=0][byte_position=6].phv_egress_thread to be 0x3.
 Configuring dp.phv_egress_thread_alu[14_byte_group=0][byte_position=6].phv_egress_thread_alu to be 0x3.
 Configuring dp.phv_egress_thread_imem[14_byte_group=0][byte_position=6].phv_egress_thread_imem to be 0x3.
@@ -2773,12 +2862,15 @@
 Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=0].phv_ingress_thread to be 0x3f.
 Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=0].phv_ingress_thread_alu to be 0x3f.
 Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=0].phv_ingress_thread_imem to be 0x3f.
-Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=4].phv_ingress_thread to be 0x1f.
-Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=4].phv_ingress_thread_alu to be 0x1f.
-Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=4].phv_ingress_thread_imem to be 0x1f.
+Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=4].phv_ingress_thread to be 0x3f.
+Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=4].phv_ingress_thread_alu to be 0x3f.
+Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=4].phv_ingress_thread_imem to be 0x3f.
 Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=8].phv_ingress_thread to be 0xff.
 Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=8].phv_ingress_thread_alu to be 0xff.
 Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=8].phv_ingress_thread_imem to be 0xff.
+Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=9].phv_ingress_thread to be 0x1.
+Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=9].phv_ingress_thread_alu to be 0x1.
+Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=9].phv_ingress_thread_imem to be 0x1.
 Configuring dp.phv_egress_thread[14_byte_group=0][byte_position=6].phv_egress_thread to be 0x3.
 Configuring dp.phv_egress_thread_alu[14_byte_group=0][byte_position=6].phv_egress_thread_alu to be 0x3.
 Configuring dp.phv_egress_thread_imem[14_byte_group=0][byte_position=6].phv_egress_thread_imem to be 0x3.
@@ -2855,12 +2947,15 @@
 Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=0].phv_ingress_thread to be 0x3f.
 Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=0].phv_ingress_thread_alu to be 0x3f.
 Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=0].phv_ingress_thread_imem to be 0x3f.
-Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=4].phv_ingress_thread to be 0x1f.
-Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=4].phv_ingress_thread_alu to be 0x1f.
-Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=4].phv_ingress_thread_imem to be 0x1f.
+Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=4].phv_ingress_thread to be 0x3f.
+Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=4].phv_ingress_thread_alu to be 0x3f.
+Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=4].phv_ingress_thread_imem to be 0x3f.
 Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=8].phv_ingress_thread to be 0xff.
 Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=8].phv_ingress_thread_alu to be 0xff.
 Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=8].phv_ingress_thread_imem to be 0xff.
+Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=9].phv_ingress_thread to be 0x1.
+Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=9].phv_ingress_thread_alu to be 0x1.
+Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=9].phv_ingress_thread_imem to be 0x1.
 Configuring dp.phv_egress_thread[14_byte_group=0][byte_position=6].phv_egress_thread to be 0x3.
 Configuring dp.phv_egress_thread_alu[14_byte_group=0][byte_position=6].phv_egress_thread_alu to be 0x3.
 Configuring dp.phv_egress_thread_imem[14_byte_group=0][byte_position=6].phv_egress_thread_imem to be 0x3.
@@ -2937,12 +3032,15 @@
 Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=0].phv_ingress_thread to be 0x3f.
 Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=0].phv_ingress_thread_alu to be 0x3f.
 Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=0].phv_ingress_thread_imem to be 0x3f.
-Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=4].phv_ingress_thread to be 0x1f.
-Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=4].phv_ingress_thread_alu to be 0x1f.
-Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=4].phv_ingress_thread_imem to be 0x1f.
+Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=4].phv_ingress_thread to be 0x3f.
+Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=4].phv_ingress_thread_alu to be 0x3f.
+Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=4].phv_ingress_thread_imem to be 0x3f.
 Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=8].phv_ingress_thread to be 0xff.
 Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=8].phv_ingress_thread_alu to be 0xff.
 Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=8].phv_ingress_thread_imem to be 0xff.
+Configuring dp.phv_ingress_thread[14_byte_group=0][byte_position=9].phv_ingress_thread to be 0x1.
+Configuring dp.phv_ingress_thread_alu[14_byte_group=0][byte_position=9].phv_ingress_thread_alu to be 0x1.
+Configuring dp.phv_ingress_thread_imem[14_byte_group=0][byte_position=9].phv_ingress_thread_imem to be 0x1.
 Configuring dp.phv_egress_thread[14_byte_group=0][byte_position=6].phv_egress_thread to be 0x3.
 Configuring dp.phv_egress_thread_alu[14_byte_group=0][byte_position=6].phv_egress_thread_alu to be 0x3.
 Configuring dp.phv_egress_thread_imem[14_byte_group=0][byte_position=6].phv_egress_thread_imem to be 0x3.
@@ -2978,7 +3076,7 @@
 Configuring dp.phv_fifo_enable.phv_fifo_egress_final_output_enable to be 0.
 
 +------------------------------------------------------------------------
-|  Number of configuration field values set in Match-Action Stages: 2100
+|  Number of configuration field values set in Match-Action Stages: 2186
 +------------------------------------------------------------------------
 
 +------------------------------------------------------------------------
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/mau.gateway.log b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/mau.gateway.log
index e39e190..0af5f70 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/mau.gateway.log
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/mau.gateway.log
@@ -1,7 +1,7 @@
 +---------------------------------------------------------------------+
 |  Log file: mau.gateway.log                                          |
 |  Compiler version: 5.1.0 (fca32d1)                                  |
-|  Created on: Tue Sep 12 11:16:41 2017                               |
+|  Created on: Wed Sep 13 01:00:26 2017                               |
 +---------------------------------------------------------------------+
 
 
@@ -135,13 +135,13 @@
 Call to _place_fields_for_constant_comparison
 constant_match_key_partition is:
 Byte Position 0
-  (67, 0)
+  (68, 0)
 Byte Position 1
-  (67, 0)
+  (68, 0)
 Byte Position 2
-  (67, 0)
+  (68, 0)
 Byte Position 3
-  (67, 0)
+  (68, 0)
 
 Available bytes in ram word is [0, 1, 2, 3, 4, 5, 6, 7]
 Available data bytes for constants are [0, 1, 2, 3]
@@ -366,13 +366,13 @@
 Call to _place_fields_for_constant_comparison
 constant_match_key_partition is:
 Byte Position 0
-  (67, 0)
+  (68, 0)
 Byte Position 1
-  (67, 0)
+  (68, 0)
 Byte Position 2
-  (67, 0)
+  (68, 0)
 Byte Position 3
-  (67, 0)
+  (68, 0)
 
 Available bytes in ram word is [0, 1, 2, 3, 4, 5, 6, 7]
 Available data bytes for constants are [0, 1, 2, 3]
@@ -610,13 +610,13 @@
 Call to _place_fields_for_constant_comparison
 constant_match_key_partition is:
 Byte Position 0
-  (67, 0)
+  (68, 0)
 Byte Position 1
-  (67, 0)
+  (68, 0)
 Byte Position 2
-  (67, 0)
+  (68, 0)
 Byte Position 3
-  (67, 0)
+  (68, 0)
 
 Available bytes in ram word is [0, 1, 2, 3, 4, 5, 6, 7]
 Available data bytes for constants are [0, 1, 2, 3]
@@ -757,7 +757,7 @@
 Gateway 14
 ------- Phase 0 -------------
 Looking at gateway table 14
-match_groups_attached_to_gateway = OrderedDict([(0, (0, [1], 0, [0], [(<p4c_tofino.target.tofino.device.pipeline.mau.match_keys.packed_gateway_key.PackedGatewayKey object at 0x7f7446718210>, 0)])), (1, (None, [], None, [], []))])
+match_groups_attached_to_gateway = OrderedDict([(0, (0, [1], 0, [0], [(<p4c_tofino.target.tofino.device.pipeline.mau.match_keys.packed_gateway_key.PackedGatewayKey object at 0x7f1961006f50>, 0)])), (1, (None, [], None, [], []))])
 Search bus 0 on row 7
 ----------------------------
  Trying to place Gateway Resource Request for table process_packet_out_table_always_true_condition needs access to 0 input bits in exact match group 0 (parity groups [1]) and hash group 0 for gateway 14.
@@ -979,13 +979,13 @@
 Call to _place_fields_for_constant_comparison
 constant_match_key_partition is:
 Byte Position 0
-  (67, 0)
+  (68, 0)
 Byte Position 1
-  (67, 0)
+  (68, 0)
 Byte Position 2
-  (67, 0)
+  (68, 0)
 Byte Position 3
-  (67, 0)
+  (68, 0)
 
 Available bytes in ram word is [0, 1, 2, 3, 4, 5, 6, 7]
 Available data bytes for constants are [0, 1, 2, 3]
@@ -1126,7 +1126,7 @@
 Gateway 14
 ------- Phase 0 -------------
 Looking at gateway table 14
-match_groups_attached_to_gateway = OrderedDict([(0, (0, [1], 0, [0], [(<p4c_tofino.target.tofino.device.pipeline.mau.match_keys.packed_gateway_key.PackedGatewayKey object at 0x7f74466ffbd0>, 0)])), (1, (None, [], None, [], []))])
+match_groups_attached_to_gateway = OrderedDict([(0, (0, [1], 0, [0], [(<p4c_tofino.target.tofino.device.pipeline.mau.match_keys.packed_gateway_key.PackedGatewayKey object at 0x7f1960a1a950>, 0)])), (1, (None, [], None, [], []))])
 Search bus 0 on row 7
 ----------------------------
  Trying to place Gateway Resource Request for table process_packet_out_table_always_true_condition needs access to 0 input bits in exact match group 0 (parity groups [1]) and hash group 0 for gateway 14.
@@ -1510,15 +1510,15 @@
   [42] = None
   [43] = None
  Hash Bit Mapping:
-   (1, 0) --> 40
-   (0, 0) --> 41
-   (0, 1) --> 42
-   (0, 2) --> 43
-   (0, 3) --> 44
-   (0, 4) --> 45
-   (0, 5) --> 46
-   (0, 6) --> 47
-   (0, 7) --> 48
+   (3, 0) --> 40
+   (2, 0) --> 41
+   (2, 1) --> 42
+   (2, 2) --> 43
+   (2, 3) --> 44
+   (2, 4) --> 45
+   (2, 5) --> 46
+   (2, 6) --> 47
+   (2, 7) --> 48
 
 Allocating: Ram Data Bus MatchSearch1 7 left_and_right is 128 bits in stage 2 for gateway
 Allocating: Gateway 15 in stage 2 for _condition_2.
@@ -1757,15 +1757,15 @@
   [42] = None
   [43] = None
  Hash Bit Mapping:
-   (1, 0) --> 40
-   (0, 0) --> 41
-   (0, 1) --> 42
-   (0, 2) --> 43
-   (0, 3) --> 44
-   (0, 4) --> 45
-   (0, 5) --> 46
-   (0, 6) --> 47
-   (0, 7) --> 48
+   (3, 0) --> 40
+   (2, 0) --> 41
+   (2, 1) --> 42
+   (2, 2) --> 43
+   (2, 3) --> 44
+   (2, 4) --> 45
+   (2, 5) --> 46
+   (2, 6) --> 47
+   (2, 7) --> 48
 
 Allocating: Ram Data Bus MatchSearch1 7 left_and_right is 128 bits in stage 2 for gateway
 Allocating: Gateway 15 in stage 2 for _condition_2.
@@ -1861,7 +1861,7 @@
 match_groups_attached_to_gateway = OrderedDict([(0, (None, [], None, [], [])), (1, (None, [], None, [], []))])
 Search bus 0 on row 7
 
- final_parity_group_ids = [(0, []), (1, [])] 
+ final_parity_group_ids = [(0, [0]), (1, [])] 
 
  open_parity_group_ids = [0, 1] 
 ----------------------------
@@ -2004,15 +2004,15 @@
   [42] = None
   [43] = None
  Hash Bit Mapping:
-   (1, 0) --> 40
-   (0, 0) --> 41
-   (0, 1) --> 42
-   (0, 2) --> 43
-   (0, 3) --> 44
-   (0, 4) --> 45
-   (0, 5) --> 46
-   (0, 6) --> 47
-   (0, 7) --> 48
+   (3, 0) --> 40
+   (2, 0) --> 41
+   (2, 1) --> 42
+   (2, 2) --> 43
+   (2, 3) --> 44
+   (2, 4) --> 45
+   (2, 5) --> 46
+   (2, 6) --> 47
+   (2, 7) --> 48
 
 Allocating: Ram Data Bus MatchSearch1 7 left_and_right is 128 bits in stage 2 for gateway
 Allocating: Gateway 15 in stage 2 for _condition_2.
@@ -2121,7 +2121,7 @@
 match_groups_attached_to_gateway = OrderedDict([(0, (None, [], None, [], [])), (1, (None, [], None, [], []))])
 Search bus 0 on row 7
 
- final_parity_group_ids = [(0, []), (1, [])] 
+ final_parity_group_ids = [(0, [0]), (1, [])] 
 
  open_parity_group_ids = [0, 1] 
 ----------------------------
@@ -2264,15 +2264,15 @@
   [42] = None
   [43] = None
  Hash Bit Mapping:
-   (1, 0) --> 40
-   (0, 0) --> 41
-   (0, 1) --> 42
-   (0, 2) --> 43
-   (0, 3) --> 44
-   (0, 4) --> 45
-   (0, 5) --> 46
-   (0, 6) --> 47
-   (0, 7) --> 48
+   (3, 0) --> 40
+   (2, 0) --> 41
+   (2, 1) --> 42
+   (2, 2) --> 43
+   (2, 3) --> 44
+   (2, 4) --> 45
+   (2, 5) --> 46
+   (2, 6) --> 47
+   (2, 7) --> 48
 
 Allocating: Ram Data Bus MatchSearch1 7 left_and_right is 128 bits in stage 2 for gateway
 Allocating: Gateway 15 in stage 2 for _condition_2.
@@ -2294,7 +2294,7 @@
 Gateway 14
 ------- Phase 0 -------------
 Looking at gateway table 14
-match_groups_attached_to_gateway = OrderedDict([(0, (0, [0], 0, [0], [(<p4c_tofino.target.tofino.device.pipeline.mau.match_keys.packed_gateway_key.PackedGatewayKey object at 0x7f744a26a2d0>, 0)])), (1, (None, [], None, [], []))])
+match_groups_attached_to_gateway = OrderedDict([(0, (0, [0], 0, [0], [(<p4c_tofino.target.tofino.device.pipeline.mau.match_keys.packed_gateway_key.PackedGatewayKey object at 0x7f1964aa7290>, 0)])), (1, (None, [], None, [], []))])
 Search bus 0 on row 7
 ----------------------------
  Trying to place Gateway Resource Request for table egress_port_count_table_always_true_condition needs access to 0 input bits in exact match group 0 (parity groups [0]) and hash group 0 for gateway 14.
@@ -2506,7 +2506,7 @@
 match_groups_attached_to_gateway = OrderedDict([(0, (None, [], None, [], [])), (1, (None, [], None, [], []))])
 Search bus 0 on row 7
 
- final_parity_group_ids = [(0, []), (1, [])] 
+ final_parity_group_ids = [(0, [0]), (1, [])] 
 
  open_parity_group_ids = [0, 1] 
 ----------------------------
@@ -2649,15 +2649,15 @@
   [42] = None
   [43] = None
  Hash Bit Mapping:
-   (1, 0) --> 40
-   (0, 0) --> 41
-   (0, 1) --> 42
-   (0, 2) --> 43
-   (0, 3) --> 44
-   (0, 4) --> 45
-   (0, 5) --> 46
-   (0, 6) --> 47
-   (0, 7) --> 48
+   (3, 0) --> 40
+   (2, 0) --> 41
+   (2, 1) --> 42
+   (2, 2) --> 43
+   (2, 3) --> 44
+   (2, 4) --> 45
+   (2, 5) --> 46
+   (2, 6) --> 47
+   (2, 7) --> 48
 
 Allocating: Ram Data Bus MatchSearch1 7 left_and_right is 128 bits in stage 2 for gateway
 Allocating: Gateway 15 in stage 2 for _condition_2.
@@ -2679,7 +2679,7 @@
 Gateway 14
 ------- Phase 0 -------------
 Looking at gateway table 14
-match_groups_attached_to_gateway = OrderedDict([(0, (0, [0], 0, [0], [(<p4c_tofino.target.tofino.device.pipeline.mau.match_keys.packed_gateway_key.PackedGatewayKey object at 0x7f7446a9aa50>, 0)])), (1, (None, [], None, [], []))])
+match_groups_attached_to_gateway = OrderedDict([(0, (0, [0], 0, [0], [(<p4c_tofino.target.tofino.device.pipeline.mau.match_keys.packed_gateway_key.PackedGatewayKey object at 0x7f1960def7d0>, 0)])), (1, (None, [], None, [], []))])
 Search bus 0 on row 7
 ----------------------------
  Trying to place Gateway Resource Request for table egress_port_count_table_always_true_condition needs access to 0 input bits in exact match group 0 (parity groups [0]) and hash group 0 for gateway 14.
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/mau.gw.log b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/mau.gw.log
index 2a00faa..8d1cfa2 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/mau.gw.log
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/mau.gw.log
@@ -1,7 +1,7 @@
 +---------------------------------------------------------------------+
 |  Log file: mau.gw.log                                               |
 |  Compiler version: 5.1.0 (fca32d1)                                  |
-|  Created on: Tue Sep 12 11:16:41 2017                               |
+|  Created on: Wed Sep 13 01:00:26 2017                               |
 +---------------------------------------------------------------------+
 
 cond _condition_0: not valid packet_out_hdr
@@ -10,13 +10,13 @@
 cond _condition_0 can be gateway (1+0)x1
 cond !_condition_0 can be gateway (1+0)x1
 _condition_0 is gateway for table0
-cond _condition_2: ig_intr_md_for_tm.ucast_egress_port < 510
-     ig_intr_md_for_tm.ucast_egress_port < 510
-   ! ig_intr_md_for_tm.ucast_egress_port >= 510
+cond _condition_2: ig_intr_md_for_tm.ucast_egress_port < 512
+     ig_intr_md_for_tm.ucast_egress_port < 512
+   ! ig_intr_md_for_tm.ucast_egress_port >= 512
 cond _condition_2 can be gateway (9+0)x1
 cond !_condition_2 can be gateway (9+0)x1
 _condition_2 is gateway for ingress_port_count_table
-fields = OrderedSet([<p4_hlir.hlir.p4_headers.p4_field object at 0x7f744ad95cd0>]) and and xor_fields is OrderedSet()
+fields = OrderedSet([<p4_hlir.hlir.p4_headers.p4_field object at 0x7f19655c8c90>]) and and xor_fields is OrderedSet()
 fields = OrderedSet() and and xor_fields is OrderedSet()
 cond _condition_0: not valid packet_out_hdr
      not valid packet_out_hdr
@@ -24,13 +24,13 @@
 cond _condition_0 can be gateway (1+0)x1
 cond !_condition_0 can be gateway (1+0)x1
 _condition_0 is gateway for table0
-cond _condition_2: ig_intr_md_for_tm.ucast_egress_port < 510
-     ig_intr_md_for_tm.ucast_egress_port < 510
-   ! ig_intr_md_for_tm.ucast_egress_port >= 510
+cond _condition_2: ig_intr_md_for_tm.ucast_egress_port < 512
+     ig_intr_md_for_tm.ucast_egress_port < 512
+   ! ig_intr_md_for_tm.ucast_egress_port >= 512
 cond _condition_2 can be gateway (9+0)x1
 cond !_condition_2 can be gateway (9+0)x1
 _condition_2 is gateway for ingress_port_count_table
-fields = OrderedSet([<p4_hlir.hlir.p4_headers.p4_field object at 0x7f744ad95cd0>]) and and xor_fields is OrderedSet()
+fields = OrderedSet([<p4_hlir.hlir.p4_headers.p4_field object at 0x7f19655c8c90>]) and and xor_fields is OrderedSet()
 fields = OrderedSet() and and xor_fields is OrderedSet()
 cond _condition_0: not valid packet_out_hdr
      not valid packet_out_hdr
@@ -38,13 +38,13 @@
 cond _condition_0 can be gateway (1+0)x1
 cond !_condition_0 can be gateway (1+0)x1
 _condition_0 is gateway for table0
-cond _condition_2: ig_intr_md_for_tm.ucast_egress_port < 510
-     ig_intr_md_for_tm.ucast_egress_port < 510
-   ! ig_intr_md_for_tm.ucast_egress_port >= 510
+cond _condition_2: ig_intr_md_for_tm.ucast_egress_port < 512
+     ig_intr_md_for_tm.ucast_egress_port < 512
+   ! ig_intr_md_for_tm.ucast_egress_port >= 512
 cond _condition_2 can be gateway (9+0)x1
 cond !_condition_2 can be gateway (9+0)x1
 _condition_2 is gateway for ingress_port_count_table
-fields = OrderedSet([<p4_hlir.hlir.p4_headers.p4_field object at 0x7f744ad95cd0>]) and and xor_fields is OrderedSet()
+fields = OrderedSet([<p4_hlir.hlir.p4_headers.p4_field object at 0x7f19655c8c90>]) and and xor_fields is OrderedSet()
 fields = OrderedSet() and and xor_fields is OrderedSet()
 cond _always_true: True == True
      True
@@ -66,12 +66,12 @@
 final.tcam: [(match=0 mask=0 T)], miss=False
 --> Stage Gateway Table for condition _condition_2 in stage 2
 T -> ingress_port_count_table(32),  F -> None(255)
-building tcam for GatewayTest('ig_intr_md_for_tm.ucast_egress_port < 510')
-  adding line (range=[ffff ffff 3fff] match=0 mask=0 T)
-  adding line (range=[ffff 7fff ffff] match=0 mask=0 T)
-  adding line (range=[1 ffff ffff] match=0 mask=0 T)
-tcam data: [(range=[ffff ffff 3fff] match=0 mask=0 T), (range=[ffff 7fff ffff] match=0 mask=0 T), (range=[1 ffff ffff] match=0 mask=0 T)]
-final.tcam: [(range=[ffff ffff 3fff] match=0 mask=0 T), (range=[ffff 7fff ffff] match=0 mask=0 T), (range=[1 ffff ffff] match=0 mask=0 T)], miss=False
+building tcam for GatewayTest('ig_intr_md_for_tm.ucast_egress_port < 512')
+  adding line (range=[ffff ffff 0] match=0 mask=0 T)
+  adding line (range=[ffff 0 ffff] match=0 mask=0 T)
+  adding line (range=[3 ffff ffff] match=0 mask=0 T)
+tcam data: [(range=[ffff ffff 0] match=0 mask=0 T), (range=[ffff 0 ffff] match=0 mask=0 T), (range=[3 ffff ffff] match=0 mask=0 T)]
+final.tcam: [(range=[ffff ffff 0] match=0 mask=0 T), (range=[ffff 0 ffff] match=0 mask=0 T), (range=[3 ffff ffff] match=0 mask=0 T)], miss=False
 --> Stage Gateway Table for condition egress_port_count_table_always_true_condition in stage 2
 T -> egress_port_count_table(33),  F -> egress_port_count_table(33)
 building tcam for GatewayTest('True')
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/mau.log b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/mau.log
index 3494ab0..b5a583e 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/mau.log
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/mau.log
@@ -1,7 +1,7 @@
 +---------------------------------------------------------------------+
 |  Log file: mau.log                                                  |
 |  Compiler version: 5.1.0 (fca32d1)                                  |
-|  Created on: Tue Sep 12 11:16:41 2017                               |
+|  Created on: Wed Sep 13 01:00:26 2017                               |
 +---------------------------------------------------------------------+
 
 Match Table table0 did not specify the number of entries required. A default value (512) will be used.
@@ -21,129 +21,7 @@
 Match Entry Table table0 has already been associated with stat Table table0_counter.
 Match Entry Table ecmp_group_table has already been associated with stat Table ecmp_group_table_counter.
 Match table ingress_port_count_table has no match key fields
-Cannot use hash-action for table ingress_port_count_table with no key because the number of entries required by side-effect table ingress_port_counter is not a power of 2 -- 510.
-
-##########################################
-  Call to decide_action_data_placement(stage=0, table=ingress_port_count_table)
-##########################################
-
-
-Max immediate bits used in any action is 0 bits.
-Overhead bit width for table ingress_port_count_table is 22 bits.
-Bits available in overhead for non-essential immediate data is 32 bits.
-~~~~~~~~~~~~~~~~~~~~~
- Examining placing 0 bits in match overhead
-Overhead bit width for table ingress_port_count_table is 22 bits.
-Overhead SRAMs to use = 97
-  Entries requested = 1024  and match entries get = 0
-ram_size_matrix = 
- (8, 8, False)  (8, 8, True)  (8, 32, False)  (16, 16, False)  (16, 16, True)  (16, 32, False)  (32, 32, False)  (32, 32, True) 
-       0              0              0               0                0               0                0                0        # 0
-
-immediate_size_matrix = 
- (8, 8, False)  (8, 8, True)  (8, 32, False)  (16, 16, False)  (16, 16, True)  (16, 32, False)  (32, 32, False)  (32, 32, True) 
-       0              0              0               0                0               0                0                0        # 0
-
-hash_to_phv_matrix = 
- (8, 8, False)  (8, 8, True)  (8, 32, False)  (16, 16, False)  (16, 16, True)  (16, 32, False)  (32, 32, False)  (32, 32, True) 
-       0              0              0               0                0               0                0                0        # 0
-
-total action ram packing size = [0, 0, 0]
-action_ram_packing:
-  action count_ingress has []
-total action ram packing size = [0, 0, 0]
-action_ram_packing:
-  action count_ingress has []
-total action ram packing size = [0, 0, 0]
-action_ram_packing:
-  action count_ingress has []
-byte_enables = []
-After allocation of 32s, available_slots is []
-final packing is []
-byte_enables = []
-After allocation of 32s, available_slots is []
-final packing is []
-byte_enables = []
-After allocation of 32s, available_slots is []
-final packing is []
-Action Data SRAMs to use = 0
-TODO: Total RAMs use when put 0 bits in match overhead: 97
-TODO: Total RAMs use when put 0 bits in match overhead: 97
-~~~~~~~~~~~~~~~~~~~~~
- Examining placing 8 bits in match overhead
-~~~~~~~~~~~~~~~~~~~~~
- Examining placing 16 bits in match overhead
-~~~~~~~~~~~~~~~~~~~~~
- Examining placing 24 bits in match overhead
-~~~~~~~~~~~~~~~~~~~~~
- Examining placing 32 bits in match overhead
-
-##########################################
-
-Best Ram Usage is 97 rams
-Best Immediate placement is 0 bits
 Match table egress_port_count_table has no match key fields
-Cannot use hash-action for table egress_port_count_table with no key because the number of entries required by side-effect table egress_port_counter is not a power of 2 -- 510.
-
-##########################################
-  Call to decide_action_data_placement(stage=0, table=egress_port_count_table)
-##########################################
-
-
-Max immediate bits used in any action is 0 bits.
-Overhead bit width for table egress_port_count_table is 20 bits.
-Bits available in overhead for non-essential immediate data is 32 bits.
-~~~~~~~~~~~~~~~~~~~~~
- Examining placing 0 bits in match overhead
-Overhead bit width for table egress_port_count_table is 20 bits.
-Overhead SRAMs to use = 97
-  Entries requested = 1024  and match entries get = 0
-ram_size_matrix = 
- (8, 8, False)  (8, 8, True)  (8, 32, False)  (16, 16, False)  (16, 16, True)  (16, 32, False)  (32, 32, False)  (32, 32, True) 
-       0              0              0               0                0               0                0                0        # 0
-
-immediate_size_matrix = 
- (8, 8, False)  (8, 8, True)  (8, 32, False)  (16, 16, False)  (16, 16, True)  (16, 32, False)  (32, 32, False)  (32, 32, True) 
-       0              0              0               0                0               0                0                0        # 0
-
-hash_to_phv_matrix = 
- (8, 8, False)  (8, 8, True)  (8, 32, False)  (16, 16, False)  (16, 16, True)  (16, 32, False)  (32, 32, False)  (32, 32, True) 
-       0              0              0               0                0               0                0                0        # 0
-
-total action ram packing size = [0, 0, 0]
-action_ram_packing:
-  action count_egress has []
-total action ram packing size = [0, 0, 0]
-action_ram_packing:
-  action count_egress has []
-total action ram packing size = [0, 0, 0]
-action_ram_packing:
-  action count_egress has []
-byte_enables = []
-After allocation of 32s, available_slots is []
-final packing is []
-byte_enables = []
-After allocation of 32s, available_slots is []
-final packing is []
-byte_enables = []
-After allocation of 32s, available_slots is []
-final packing is []
-Action Data SRAMs to use = 0
-TODO: Total RAMs use when put 0 bits in match overhead: 97
-TODO: Total RAMs use when put 0 bits in match overhead: 97
-~~~~~~~~~~~~~~~~~~~~~
- Examining placing 8 bits in match overhead
-~~~~~~~~~~~~~~~~~~~~~
- Examining placing 16 bits in match overhead
-~~~~~~~~~~~~~~~~~~~~~
- Examining placing 24 bits in match overhead
-~~~~~~~~~~~~~~~~~~~~~
- Examining placing 32 bits in match overhead
-
-##########################################
-
-Best Ram Usage is 97 rams
-Best Immediate placement is 0 bits
 
 ##########################################
   Call to decide_action_data_placement(stage=0, table=process_packet_out_table)
@@ -515,8 +393,8 @@
 final packing is [(16, 0, False)]
 ----------------------------------------------
  Call to allocate_hash_distribution_units with
-    hash_algorithm = crc32
-    hash_output_width = 32
+    hash_algorithm = crc16
+    hash_output_width = 16
     hash_bits_need = 1
     output_hash_bit_start = 0
     immediate_bit_positions = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]
@@ -525,17 +403,17 @@
 available_tuples_sorted_by_parity_bytes_available = [(0, 3, 0), (1, 3, 0)]
 available_tuples_split_sorted_by_parity_bytes_available = []
 Allocate fresh exact match group / hash group
-Allocating: Byte 0 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {udp.dstPort[7:0]}.
-Allocating: Byte 1 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {udp.dstPort[15:8]}.
-Allocating: Byte 2 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {udp.srcPort[7:0]}.
-Allocating: Byte 3 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {udp.srcPort[15:8]}.
-Allocating: Byte 4 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ipv4.dstAddr[7:0]}.
-Allocating: Byte 5 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ipv4.dstAddr[15:8]}.
-Allocating: Byte 6 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ipv4.dstAddr[23:16]}.
+Allocating: Byte 0 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ipv4.dstAddr[7:0]}.
+Allocating: Byte 1 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ipv4.dstAddr[15:8]}.
+Allocating: Byte 2 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ipv4.dstAddr[23:16]}.
+Allocating: Byte 3 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {tcp.dstPort[7:0]}.
+Allocating: Byte 4 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ipv4.srcAddr[31:24]}.
+Allocating: Byte 5 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {tcp.srcPort[7:0]}.
+Allocating: Byte 6 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {tcp.dstPort[15:8]}.
 Allocating: Byte 7 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ipv4.dstAddr[31:24]}.
-Allocating: Byte 8 is of type exact and member of group 0 (parity group 1) with 16 bytes. for {ipv4.srcAddr[31:24]}.
+Allocating: Byte 8 is of type exact and member of group 0 (parity group 1) with 16 bytes. for {ipv4.srcAddr[7:0]}.
 Allocating: Byte 9 is of type exact and member of group 0 (parity group 1) with 16 bytes. for {ipv4.srcAddr[15:8]}.
-Allocating: Byte 10 is of type exact and member of group 0 (parity group 1) with 16 bytes. for {ipv4.srcAddr[7:0]}.
+Allocating: Byte 10 is of type exact and member of group 0 (parity group 1) with 16 bytes. for {tcp.srcPort[15:8]}.
 Allocating: Byte 11 is of type exact and member of group 0 (parity group 1) with 16 bytes. for {ipv4.srcAddr[23:16]}.
 -------------------
 Call to _allocate_hash_distribution_and_hash_bits
@@ -548,10 +426,12 @@
 -------------------
 Allocating Hash Distribution Group 0/0 for table table0__action__ in stage 0.
 Allocating Hash Bit 0 in hash match group 0 for table table0__action__ in stage 0.
-seed = 0x7bd5c66f
-set the seed to be [1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
+total_hash_result_bits = 16
+polynomial_as_hex_int = 0x18005
+seed = 0x0
+set the seed to be [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
 Hash Function 0
-hash_bit_0 = udp.dstPort[2] ^ udp.dstPort[8] ^ udp.dstPort[12] ^ udp.dstPort[14] ^ udp.dstPort[15] ^ udp.srcPort[0] ^ udp.srcPort[8] ^ udp.srcPort[9] ^ udp.srcPort[10] ^ udp.srcPort[11] ^ udp.srcPort[12] ^ udp.srcPort[14] ^ udp.srcPort[15] ^ ipv4.dstAddr[3] ^ ipv4.dstAddr[6] ^ ipv4.dstAddr[8] ^ ipv4.dstAddr[9] ^ ipv4.dstAddr[11] ^ ipv4.dstAddr[12] ^ ipv4.dstAddr[17] ^ ipv4.dstAddr[18] ^ ipv4.dstAddr[19] ^ ipv4.dstAddr[22] ^ ipv4.dstAddr[25] ^ ipv4.dstAddr[27] ^ ipv4.dstAddr[28] ^ ipv4.dstAddr[30] ^ ipv4.srcAddr[24] ^ ipv4.srcAddr[25] ^ ipv4.srcAddr[26] ^ ipv4.srcAddr[9] ^ ipv4.srcAddr[15] ^ ipv4.srcAddr[0] ^ ipv4.srcAddr[4] ^ ipv4.srcAddr[5] ^ ipv4.srcAddr[6] ^ ipv4.srcAddr[7] ^ ipv4.srcAddr[17] ^ ipv4.srcAddr[19] ^ ipv4.srcAddr[20] ^ ipv4.srcAddr[21] ^ ipv4.srcAddr[22] ^ ipv4.srcAddr[23] ^ 1
+hash_bit_0 = ipv4.dstAddr[0] ^ ipv4.dstAddr[1] ^ ipv4.dstAddr[2] ^ ipv4.dstAddr[3] ^ ipv4.dstAddr[4] ^ ipv4.dstAddr[5] ^ ipv4.dstAddr[6] ^ ipv4.dstAddr[7] ^ ipv4.dstAddr[8] ^ ipv4.dstAddr[9] ^ ipv4.dstAddr[10] ^ ipv4.dstAddr[11] ^ ipv4.dstAddr[13] ^ ipv4.dstAddr[15] ^ ipv4.dstAddr[17] ^ ipv4.dstAddr[18] ^ ipv4.dstAddr[19] ^ ipv4.dstAddr[20] ^ ipv4.dstAddr[21] ^ ipv4.dstAddr[22] ^ ipv4.dstAddr[23] ^ tcp.dstPort[0] ^ tcp.dstPort[1] ^ tcp.dstPort[2] ^ tcp.dstPort[3] ^ tcp.dstPort[4] ^ tcp.dstPort[5] ^ tcp.dstPort[6] ^ tcp.dstPort[7] ^ ipv4.srcAddr[24] ^ ipv4.srcAddr[25] ^ ipv4.srcAddr[26] ^ ipv4.srcAddr[27] ^ ipv4.srcAddr[28] ^ ipv4.srcAddr[29] ^ ipv4.srcAddr[30] ^ tcp.srcPort[0] ^ tcp.srcPort[1] ^ tcp.srcPort[2] ^ tcp.srcPort[3] ^ tcp.srcPort[4] ^ tcp.srcPort[5] ^ tcp.srcPort[6] ^ tcp.srcPort[7] ^ tcp.dstPort[8] ^ tcp.dstPort[9] ^ tcp.dstPort[11] ^ tcp.dstPort[12] ^ tcp.dstPort[13] ^ tcp.dstPort[14] ^ tcp.dstPort[15] ^ ipv4.dstAddr[24] ^ ipv4.dstAddr[25] ^ ipv4.dstAddr[26] ^ ipv4.dstAddr[27] ^ ipv4.dstAddr[28] ^ ipv4.srcAddr[0] ^ ipv4.srcAddr[1] ^ ipv4.srcAddr[3] ^ ipv4.srcAddr[4] ^ ipv4.srcAddr[5] ^ ipv4.srcAddr[6] ^ ipv4.srcAddr[7] ^ ipv4.srcAddr[8] ^ ipv4.srcAddr[9] ^ ipv4.srcAddr[10] ^ ipv4.srcAddr[11] ^ ipv4.srcAddr[12] ^ ipv4.srcAddr[13] ^ ipv4.srcAddr[15] ^ tcp.srcPort[8] ^ tcp.srcPort[9] ^ tcp.srcPort[10] ^ tcp.srcPort[13] ^ tcp.srcPort[14] ^ tcp.srcPort[15] ^ ipv4.srcAddr[17] ^ ipv4.srcAddr[18] ^ ipv4.srcAddr[21] ^ ipv4.srcAddr[22] ^ ipv4.srcAddr[23] ^ 0
 hash_bit_1 = 0
 hash_bit_2 = 0
 hash_bit_3 = 0
@@ -710,23 +590,23 @@
 Allocating Action ALU 2 (16 bits) in stage 0 for match table table0's action set_egress_port
 Allocating VLIW Instruction : 0 in stage 0 for match table table0's action set_egress_port
 For action ecmp_group, formed micro_instruction:
-Micro Instruction alu_a for PHV Container 134 has bit width 23
-  Field Src2 [3:0]     : 0x6   (4 bits in instruction bits [3:0])
+Micro Instruction alu_a for PHV Container 135 has bit width 23
+  Field Src2 [3:0]     : 0x7   (4 bits in instruction bits [3:0])
   Field Src1 [4:0]     : 0x0   (5 bits in instruction bits [8:4])
   Field Src1i [0:0]    : 0x1   (1 bits in instruction bits [9:9])
   Field opcode [9:0]   : 0x31e   (10 bits in instruction bits [19:10])
   Field unused [2:0]   : 0x0   (3 bits in instruction bits [22:20])
 
 For action ecmp_group, formed micro_instruction:
-Micro Instruction alu_a for PHV Container 135 has bit width 23
-  Field Src2 [3:0]     : 0x7   (4 bits in instruction bits [3:0])
+Micro Instruction alu_a for PHV Container 136 has bit width 23
+  Field Src2 [3:0]     : 0x8   (4 bits in instruction bits [3:0])
   Field Src1 [4:0]     : 0x2   (5 bits in instruction bits [8:4])
   Field Src1i [0:0]    : 0x1   (1 bits in instruction bits [9:9])
   Field opcode [9:0]   : 0x31e   (10 bits in instruction bits [19:10])
   Field unused [2:0]   : 0x0   (3 bits in instruction bits [22:20])
 
-Allocating Action ALU 6 (16 bits) in stage 0 for match table table0's action ecmp_group
 Allocating Action ALU 7 (16 bits) in stage 0 for match table table0's action ecmp_group
+Allocating Action ALU 8 (16 bits) in stage 0 for match table table0's action ecmp_group
 Allocating VLIW Instruction : 1 in stage 0 for match table table0's action ecmp_group
 For action send_to_cpu, formed micro_instruction:
 Micro Instruction deposit-field for PHV Container 130 has bit width 23
@@ -740,8 +620,8 @@
   Field low_bit_hi [2:0]     : 0x0   (3 bits in instruction bits [22:20])
 
 For action send_to_cpu, formed micro_instruction:
-Micro Instruction deposit-field for PHV Container 67 has bit width 20
-  Field Src2 [3:0]           : 0x3   (4 bits in instruction bits [3:0])
+Micro Instruction deposit-field for PHV Container 68 has bit width 20
+  Field Src2 [3:0]           : 0x4   (4 bits in instruction bits [3:0])
   Field Src1 [4:0]           : 0x19   (5 bits in instruction bits [8:4])
   Field Src1i [0:0]          : 0x0   (1 bits in instruction bits [9:9])
   Field opcode [0:0]         : 0x1   (1 bits in instruction bits [10:10])
@@ -762,12 +642,12 @@
   Field low_bit_hi [2:0]     : 0x3   (3 bits in instruction bits [22:20])
 
 Allocating Action ALU 2 (16 bits) in stage 0 for match table table0's action send_to_cpu
-Allocating Action ALU 3 (8 bits) in stage 0 for match table table0's action send_to_cpu
+Allocating Action ALU 4 (8 bits) in stage 0 for match table table0's action send_to_cpu
 Allocating Action ALU 1 (16 bits) in stage 0 for match table table0's action send_to_cpu
 Allocating VLIW Instruction : 1 in stage 0 for match table table0's action send_to_cpu
 For action _drop, formed micro_instruction:
-Micro Instruction deposit-field for PHV Container 68 has bit width 20
-  Field Src2 [3:0]           : 0x4   (4 bits in instruction bits [3:0])
+Micro Instruction deposit-field for PHV Container 69 has bit width 20
+  Field Src2 [3:0]           : 0x5   (4 bits in instruction bits [3:0])
   Field Src1 [4:0]           : 0x19   (5 bits in instruction bits [8:4])
   Field Src1i [0:0]          : 0x0   (1 bits in instruction bits [9:9])
   Field opcode [0:0]         : 0x1   (1 bits in instruction bits [10:10])
@@ -776,7 +656,7 @@
   Field right_rotate [2:0]   : 0x3   (3 bits in instruction bits [18:16])
   Field low_bit_hi [0:0]     : 0x1   (1 bits in instruction bits [19:19])
 
-Allocating Action ALU 4 (8 bits) in stage 0 for match table table0's action _drop
+Allocating Action ALU 5 (8 bits) in stage 0 for match table table0's action _drop
 Allocating VLIW Instruction : 2 in stage 0 for match table table0's action _drop
 Ternary table Pack Format = 
 Pack Format:
@@ -880,8 +760,8 @@
   Field low_bit_hi [2:0]     : 0x0   (3 bits in instruction bits [22:20])
 
 For action _process_packet_out, formed micro_instruction:
-Micro Instruction deposit-field for PHV Container 67 has bit width 20
-  Field Src2 [3:0]           : 0x3   (4 bits in instruction bits [3:0])
+Micro Instruction deposit-field for PHV Container 68 has bit width 20
+  Field Src2 [3:0]           : 0x4   (4 bits in instruction bits [3:0])
   Field Src1 [4:0]           : 0x18   (5 bits in instruction bits [8:4])
   Field Src1i [0:0]          : 0x0   (1 bits in instruction bits [9:9])
   Field opcode [0:0]         : 0x1   (1 bits in instruction bits [10:10])
@@ -891,7 +771,7 @@
   Field low_bit_hi [0:0]     : 0x0   (1 bits in instruction bits [19:19])
 
 Allocating Action ALU 2 (16 bits) in stage 0 for match table process_packet_out_table's action _process_packet_out
-Allocating Action ALU 3 (8 bits) in stage 0 for match table process_packet_out_table's action _process_packet_out
+Allocating Action ALU 4 (8 bits) in stage 0 for match table process_packet_out_table's action _process_packet_out
 Allocating VLIW Instruction : 2 in stage 0 for match table process_packet_out_table's action _process_packet_out
 
 ----------------------------------------------
@@ -1143,7 +1023,7 @@
 Allocating Action Logical Table ID 0 in stage 2
 
 ----------------------------------------------
-Call to Allocate P4 Table with table ingress_port_counter, number_entries = 510, table id = None, and match type = exact
+Call to Allocate P4 Table with table ingress_port_counter, number_entries = 512, table id = None, and match type = exact
   Allocating in stage 2
 ----------------------------------------------
 
@@ -1172,23 +1052,185 @@
 Logical Table ID in stage 2 was not supplied by table placement for table ingress_port_count_table.
 Allocating Logical Table ID 0 in stage 2
 Allocating Table Type ID 0 of type exact in stage 2
-Match Overhead:
-  Field --version_valid-- [3:0] (4 bits)
-  Field --instruction_address-- [1:0] (2 bits)
-  Field --statistics_pointer-- [19:0] (20 bits)
+Too few bits (9) specified to address ingress_port_counter from table ingress_port_count_table.  10 are needed.
+The most significant 1 bit will be padded with zeros.
+----------------------------------------------
+ Call to allocate_hash_distribution_units with
+    hash_algorithm = identity
+    hash_output_width = 10
+    hash_bits_need = 10
+    output_hash_bit_start = 0
+    immediate_bit_positions = None
+    used_for = Statistics Address
+----------------------------------------------
+available_tuples_sorted_by_parity_bytes_available = [(0, 3, 0), (1, 3, 0)]
+available_tuples_split_sorted_by_parity_bytes_available = []
+Allocate fresh exact match group / hash group
+Allocating: Byte 0 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ig_intr_md.ingress_port[7:0]}.
+Allocating: Byte 1 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {unused[6:0], ig_intr_md.ingress_port[8:8]}.
+-------------------
+Call to _allocate_hash_distribution_and_hash_bits
+    p4_table = ingress_port_count_table
+    used_for = Statistics Address
+    hash_distribution_hash_id = 0
+    hash_group_id = 0
+    hash_bits_in_units = OrderedDict([(0, [0, 1, 2, 3, 4, 5, 6, 7, 8, 9])])
+    address_left_shift = 1
+-------------------
+Allocating Hash Distribution Group 0/0 for table ingress_port_count_table in stage 2.
+Allocating Hash Bit 0 in hash match group 0 for table ingress_port_count_table in stage 2.
+Allocating Hash Bit 1 in hash match group 0 for table ingress_port_count_table in stage 2.
+Allocating Hash Bit 2 in hash match group 0 for table ingress_port_count_table in stage 2.
+Allocating Hash Bit 3 in hash match group 0 for table ingress_port_count_table in stage 2.
+Allocating Hash Bit 4 in hash match group 0 for table ingress_port_count_table in stage 2.
+Allocating Hash Bit 5 in hash match group 0 for table ingress_port_count_table in stage 2.
+Allocating Hash Bit 6 in hash match group 0 for table ingress_port_count_table in stage 2.
+Allocating Hash Bit 7 in hash match group 0 for table ingress_port_count_table in stage 2.
+Allocating Hash Bit 8 in hash match group 0 for table ingress_port_count_table in stage 2.
+Allocating Hash Bit 9 in hash match group 0 for table ingress_port_count_table in stage 2.
+seed = 0x0
+set the seed to be [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
+Hash Function 0
+hash_bit_0 = ig_intr_md.ingress_port[0] ^ 0
+hash_bit_1 = ig_intr_md.ingress_port[1] ^ 0
+hash_bit_2 = ig_intr_md.ingress_port[2] ^ 0
+hash_bit_3 = ig_intr_md.ingress_port[3] ^ 0
+hash_bit_4 = ig_intr_md.ingress_port[4] ^ 0
+hash_bit_5 = ig_intr_md.ingress_port[5] ^ 0
+hash_bit_6 = ig_intr_md.ingress_port[6] ^ 0
+hash_bit_7 = ig_intr_md.ingress_port[7] ^ 0
+hash_bit_8 = ig_intr_md.ingress_port[8] ^ 0
+hash_bit_9 = 0
+hash_bit_10 = 0
+hash_bit_11 = 0
+hash_bit_12 = 0
+hash_bit_13 = 0
+hash_bit_14 = 0
+hash_bit_15 = 0
+hash_bit_16 = 0
+hash_bit_17 = 0
+hash_bit_18 = 0
+hash_bit_19 = 0
+hash_bit_20 = 0
+hash_bit_21 = 0
+hash_bit_22 = 0
+hash_bit_23 = 0
+hash_bit_24 = 0
+hash_bit_25 = 0
+hash_bit_26 = 0
+hash_bit_27 = 0
+hash_bit_28 = 0
+hash_bit_29 = 0
+hash_bit_30 = 0
+hash_bit_31 = 0
+hash_bit_32 = 0
+hash_bit_33 = 0
+hash_bit_34 = 0
+hash_bit_35 = 0
+hash_bit_36 = 0
+hash_bit_37 = 0
+hash_bit_38 = 0
+hash_bit_39 = 0
+hash_bit_40 = 0
+hash_bit_41 = 0
+hash_bit_42 = 0
+hash_bit_43 = 0
+hash_bit_44 = 0
+hash_bit_45 = 0
+hash_bit_46 = 0
+hash_bit_47 = 0
+hash_bit_48 = 0
+hash_bit_49 = 0
+hash_bit_50 = 0
+hash_bit_51 = 0
 
-Logical Table ID in stage 2 was not supplied by table placement for table ingress_port_count_table.
-Allocating Logical Table ID 0 in stage 2
-Allocating Table Type ID 0 of type exact in stage 2
-Allocating: Byte 0 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ig_intr_md_for_tm.ucast_egress_port[7:0]}.
-Allocating: Byte 1 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {unused[6:0], ig_intr_md_for_tm.ucast_egress_port[8:8]}.
+Allocating: Byte 2 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ig_intr_md_for_tm.ucast_egress_port[7:0]}.
+Allocating: Byte 3 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {unused[6:0], ig_intr_md_for_tm.ucast_egress_port[8:8]}.
 Match Table Resource Request is:
 SRAM Resource Request for table ingress_port_count_table (of type match), with 0 ways wants 0 rams.
-Allocating: Byte 0 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ig_intr_md_for_tm.ucast_egress_port[7:0]}.
-Allocating: Byte 1 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {unused[6:0], ig_intr_md_for_tm.ucast_egress_port[8:8]}.
+Allocating: Byte 2 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ig_intr_md_for_tm.ucast_egress_port[7:0]}.
+Allocating: Byte 3 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {unused[6:0], ig_intr_md_for_tm.ucast_egress_port[8:8]}.
 No micro instructions needed for action count_ingress executed from table ingress_port_count_table.
 Allocating Action ALU 0 (32 bits) in stage 2 for match table ingress_port_count_table's action count_ingress
 Allocating VLIW Instruction : 0 in stage 2 for match table ingress_port_count_table's action count_ingress
+My hash-action stage table is 
+StageHashActionTable
+  stage_number: 2
+  number_entries 1024
+  pack_format:
+    Pack Format:
+  table_word_width: 0
+  memory_word_width: 0
+  entries_per_table_word: 0
+  number_memory_units_per_table_word: 0
+  entry_list: [
+]
+
+  p4_table: 'ingress_port_count_table'
+  stage_table_handle: 0
+  stage_table_type_handle: 0
+  stage_gateway_table: StageGatewayTable
+  stage_number: 2
+  number_entries 0
+  memory_resource_allocation GatewayMemoryResourceAllocation:
+  memory_type: gateway
+  memory_units: [[15]]
+  home_row: -1
+  stateful_action_bus_output: None
+
+  p4_table: '_condition_2'
+
+  match_group_resource_allocation:
+  vliw_resource_allocation:
+   action handle 536870914 maps to:
+VliwResourceAllocation:
+  match_table_name: ingress_port_count_table
+  p4_action: count_ingress
+  address_to_use: 1
+  full_address: 64
+  vliw_instruction_number: 0
+  color: 0
+  direction: ingress
+  micro_instructions:
+
+  action_to_vliw_mapping:
+    action handle 536870914 maps to vliw instruction 0, color 0, and direction ingress and is found in instruction address 1
+  hash_distribution_usages:
+    MAU Hash Distribution Resource Usage for P4 table ingress_port_count_table
+  exact_match_group_resource_allocation : HashMatchGroupResourceAllocation:
+  match_groups: [(0, 16)]
+  match_group_key_bit_width: 9
+  match_group_phv_bit_scrambling: OrderedDict([(('ig_intr_md.ingress_port', 0), 0), (('ig_intr_md.ingress_port', 1), 1), (('ig_intr_md.ingress_port', 2), 2), (('ig_intr_md.ingress_port', 3), 3), (('ig_intr_md.ingress_port', 4), 4), (('ig_intr_md.ingress_port', 5), 5), (('ig_intr_md.ingress_port', 6), 6), (('ig_intr_md.ingress_port', 7), 7), (('ig_intr_md.ingress_port', 8), 8)])
+    ('ig_intr_md.ingress_port', 0) -> 0
+    ('ig_intr_md.ingress_port', 1) -> 1
+    ('ig_intr_md.ingress_port', 2) -> 2
+    ('ig_intr_md.ingress_port', 3) -> 3
+    ('ig_intr_md.ingress_port', 4) -> 4
+    ('ig_intr_md.ingress_port', 5) -> 5
+    ('ig_intr_md.ingress_port', 6) -> 6
+    ('ig_intr_md.ingress_port', 7) -> 7
+    ('ig_intr_md.ingress_port', 8) -> 8
+  hash_function_dictionary: OrderedDict([(0, <p4c_tofino.target.tofino.llir.mau.stage.resources.hash_function.HashFunction object at 0x7f1960def790>)])
+  hash_group_id: 0
+  seed: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
+  table_direction: ingress
+
+  hash_distribution_resource_allocations :
+Hash Distribution:
+  source_hash_group : 0
+  hash_distribution_hash_id : 0
+  hash_distribution_group_id : 0
+  hash_distribution_used_for : Statistics Address
+  table_direction : ingress
+  bits_to_use : [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+  left_shift : 1
+  expanded_lo : False
+  expanded_hi : False
+  expanded_bit_width : 0
+  immediate_position : unused
+
+
+
 
 ----------------------------------------------
 Call to Allocate P4 Table with table egress_port_count_table__action__, number_entries = 1024, table id = None, and match type = exact
@@ -1228,7 +1270,7 @@
 Allocating Action Logical Table ID 1 in stage 2
 
 ----------------------------------------------
-Call to Allocate P4 Table with table egress_port_counter, number_entries = 510, table id = None, and match type = exact
+Call to Allocate P4 Table with table egress_port_counter, number_entries = 512, table id = None, and match type = exact
   Allocating in stage 2
 ----------------------------------------------
 
@@ -1248,8 +1290,8 @@
       ram_word_select_bits : 0
       ram_enable_select_bits : 0
 
-Allocating: Byte 0 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ig_intr_md_for_tm.ucast_egress_port[7:0]}.
-Allocating: Byte 1 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {unused[6:0], ig_intr_md_for_tm.ucast_egress_port[8:8]}.
+Allocating: Byte 2 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ig_intr_md_for_tm.ucast_egress_port[7:0]}.
+Allocating: Byte 3 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {unused[6:0], ig_intr_md_for_tm.ucast_egress_port[8:8]}.
 
 ----------------------------------------------
 Call to Allocate P4 Table with table egress_port_count_table, number_entries = 1024, table id = None, and match type = exact
@@ -1259,22 +1301,185 @@
 Logical Table ID in stage 2 was not supplied by table placement for table egress_port_count_table.
 Allocating Logical Table ID 1 in stage 2
 Allocating Table Type ID 1 of type exact in stage 2
-Match Overhead:
-  Field --version_valid-- [3:0] (4 bits)
-  Field --statistics_pointer-- [19:0] (20 bits)
+Too few bits (9) specified to address egress_port_counter from table egress_port_count_table.  10 are needed.
+The most significant 1 bit will be padded with zeros.
+----------------------------------------------
+ Call to allocate_hash_distribution_units with
+    hash_algorithm = identity
+    hash_output_width = 10
+    hash_bits_need = 10
+    output_hash_bit_start = 0
+    immediate_bit_positions = None
+    used_for = Statistics Address
+----------------------------------------------
+available_tuples_sorted_by_parity_bytes_available = [(1, 3, 0), (0, 2, 4)]
+available_tuples_split_sorted_by_parity_bytes_available = []
+Allocate fresh exact match group / hash group
+Allocating: Byte 8 is of type exact and member of group 0 (parity group 1) with 16 bytes. for {ig_intr_md_for_tm.ucast_egress_port[7:0]}.
+Allocating: Byte 9 is of type exact and member of group 0 (parity group 1) with 16 bytes. for {unused[6:0], ig_intr_md_for_tm.ucast_egress_port[8:8]}.
+-------------------
+Call to _allocate_hash_distribution_and_hash_bits
+    p4_table = egress_port_count_table
+    used_for = Statistics Address
+    hash_distribution_hash_id = 1
+    hash_group_id = 1
+    hash_bits_in_units = OrderedDict([(0, [0, 1, 2, 3, 4, 5, 6, 7, 8, 9])])
+    address_left_shift = 1
+-------------------
+Allocating Hash Distribution Group 1/0 for table egress_port_count_table in stage 2.
+Allocating Hash Bit 0 in hash match group 1 for table egress_port_count_table in stage 2.
+Allocating Hash Bit 1 in hash match group 1 for table egress_port_count_table in stage 2.
+Allocating Hash Bit 2 in hash match group 1 for table egress_port_count_table in stage 2.
+Allocating Hash Bit 3 in hash match group 1 for table egress_port_count_table in stage 2.
+Allocating Hash Bit 4 in hash match group 1 for table egress_port_count_table in stage 2.
+Allocating Hash Bit 5 in hash match group 1 for table egress_port_count_table in stage 2.
+Allocating Hash Bit 6 in hash match group 1 for table egress_port_count_table in stage 2.
+Allocating Hash Bit 7 in hash match group 1 for table egress_port_count_table in stage 2.
+Allocating Hash Bit 8 in hash match group 1 for table egress_port_count_table in stage 2.
+Allocating Hash Bit 9 in hash match group 1 for table egress_port_count_table in stage 2.
+seed = 0x0
+set the seed to be [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
+Hash Function 0
+hash_bit_0 = ig_intr_md_for_tm.ucast_egress_port[0] ^ 0
+hash_bit_1 = ig_intr_md_for_tm.ucast_egress_port[1] ^ 0
+hash_bit_2 = ig_intr_md_for_tm.ucast_egress_port[2] ^ 0
+hash_bit_3 = ig_intr_md_for_tm.ucast_egress_port[3] ^ 0
+hash_bit_4 = ig_intr_md_for_tm.ucast_egress_port[4] ^ 0
+hash_bit_5 = ig_intr_md_for_tm.ucast_egress_port[5] ^ 0
+hash_bit_6 = ig_intr_md_for_tm.ucast_egress_port[6] ^ 0
+hash_bit_7 = ig_intr_md_for_tm.ucast_egress_port[7] ^ 0
+hash_bit_8 = ig_intr_md_for_tm.ucast_egress_port[8] ^ 0
+hash_bit_9 = 0
+hash_bit_10 = 0
+hash_bit_11 = 0
+hash_bit_12 = 0
+hash_bit_13 = 0
+hash_bit_14 = 0
+hash_bit_15 = 0
+hash_bit_16 = 0
+hash_bit_17 = 0
+hash_bit_18 = 0
+hash_bit_19 = 0
+hash_bit_20 = 0
+hash_bit_21 = 0
+hash_bit_22 = 0
+hash_bit_23 = 0
+hash_bit_24 = 0
+hash_bit_25 = 0
+hash_bit_26 = 0
+hash_bit_27 = 0
+hash_bit_28 = 0
+hash_bit_29 = 0
+hash_bit_30 = 0
+hash_bit_31 = 0
+hash_bit_32 = 0
+hash_bit_33 = 0
+hash_bit_34 = 0
+hash_bit_35 = 0
+hash_bit_36 = 0
+hash_bit_37 = 0
+hash_bit_38 = 0
+hash_bit_39 = 0
+hash_bit_40 = 0
+hash_bit_41 = 0
+hash_bit_42 = 0
+hash_bit_43 = 0
+hash_bit_44 = 0
+hash_bit_45 = 0
+hash_bit_46 = 0
+hash_bit_47 = 0
+hash_bit_48 = 0
+hash_bit_49 = 0
+hash_bit_50 = 0
+hash_bit_51 = 0
 
-Logical Table ID in stage 2 was not supplied by table placement for table egress_port_count_table.
-Allocating Logical Table ID 1 in stage 2
-Allocating Table Type ID 1 of type exact in stage 2
-Allocating: Byte 0 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ig_intr_md_for_tm.ucast_egress_port[7:0]}.
-Allocating: Byte 1 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {unused[6:0], ig_intr_md_for_tm.ucast_egress_port[8:8]}.
+Allocating: Byte 2 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ig_intr_md_for_tm.ucast_egress_port[7:0]}.
+Allocating: Byte 3 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {unused[6:0], ig_intr_md_for_tm.ucast_egress_port[8:8]}.
 Match Table Resource Request is:
 SRAM Resource Request for table egress_port_count_table (of type match), with 0 ways wants 0 rams.
-Allocating: Byte 0 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ig_intr_md_for_tm.ucast_egress_port[7:0]}.
-Allocating: Byte 1 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {unused[6:0], ig_intr_md_for_tm.ucast_egress_port[8:8]}.
+Allocating: Byte 2 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ig_intr_md_for_tm.ucast_egress_port[7:0]}.
+Allocating: Byte 3 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {unused[6:0], ig_intr_md_for_tm.ucast_egress_port[8:8]}.
 No micro instructions needed for action count_egress executed from table egress_port_count_table.
 Allocating Action ALU 0 (32 bits) in stage 2 for match table egress_port_count_table's action count_egress
 Allocating VLIW Instruction : 0 in stage 2 for match table egress_port_count_table's action count_egress
+My hash-action stage table is 
+StageHashActionTable
+  stage_number: 2
+  number_entries 1024
+  pack_format:
+    Pack Format:
+  table_word_width: 0
+  memory_word_width: 0
+  entries_per_table_word: 0
+  number_memory_units_per_table_word: 0
+  entry_list: [
+]
+
+  p4_table: 'egress_port_count_table'
+  stage_table_handle: 1
+  stage_table_type_handle: 1
+  stage_gateway_table: StageGatewayTable
+  stage_number: 2
+  number_entries 0
+  memory_resource_allocation GatewayMemoryResourceAllocation:
+  memory_type: gateway
+  memory_units: [[14]]
+  home_row: -1
+  stateful_action_bus_output: None
+
+  p4_table: 'egress_port_count_table_always_true_condition'
+
+  match_group_resource_allocation:
+  vliw_resource_allocation:
+   action handle 536870916 maps to:
+VliwResourceAllocation:
+  match_table_name: egress_port_count_table
+  p4_action: count_egress
+  address_to_use: 0
+  full_address: 64
+  vliw_instruction_number: 0
+  color: 0
+  direction: ingress
+  micro_instructions:
+
+  action_to_vliw_mapping:
+    action handle 536870916 maps to vliw instruction 0, color 0, and direction ingress and is found in instruction address 0
+  hash_distribution_usages:
+    MAU Hash Distribution Resource Usage for P4 table egress_port_count_table
+  exact_match_group_resource_allocation : HashMatchGroupResourceAllocation:
+  match_groups: [(0, 16)]
+  match_group_key_bit_width: 73
+  match_group_phv_bit_scrambling: OrderedDict([(('ig_intr_md_for_tm.ucast_egress_port', 0), 64), (('ig_intr_md_for_tm.ucast_egress_port', 1), 65), (('ig_intr_md_for_tm.ucast_egress_port', 2), 66), (('ig_intr_md_for_tm.ucast_egress_port', 3), 67), (('ig_intr_md_for_tm.ucast_egress_port', 4), 68), (('ig_intr_md_for_tm.ucast_egress_port', 5), 69), (('ig_intr_md_for_tm.ucast_egress_port', 6), 70), (('ig_intr_md_for_tm.ucast_egress_port', 7), 71), (('ig_intr_md_for_tm.ucast_egress_port', 8), 72)])
+    ('ig_intr_md_for_tm.ucast_egress_port', 0) -> 64
+    ('ig_intr_md_for_tm.ucast_egress_port', 1) -> 65
+    ('ig_intr_md_for_tm.ucast_egress_port', 2) -> 66
+    ('ig_intr_md_for_tm.ucast_egress_port', 3) -> 67
+    ('ig_intr_md_for_tm.ucast_egress_port', 4) -> 68
+    ('ig_intr_md_for_tm.ucast_egress_port', 5) -> 69
+    ('ig_intr_md_for_tm.ucast_egress_port', 6) -> 70
+    ('ig_intr_md_for_tm.ucast_egress_port', 7) -> 71
+    ('ig_intr_md_for_tm.ucast_egress_port', 8) -> 72
+  hash_function_dictionary: OrderedDict([(0, <p4c_tofino.target.tofino.llir.mau.stage.resources.hash_function.HashFunction object at 0x7f1960df4450>)])
+  hash_group_id: 1
+  seed: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
+  table_direction: ingress
+
+  hash_distribution_resource_allocations :
+Hash Distribution:
+  source_hash_group : 1
+  hash_distribution_hash_id : 1
+  hash_distribution_group_id : 0
+  hash_distribution_used_for : Statistics Address
+  table_direction : ingress
+  bits_to_use : [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+  left_shift : 1
+  expanded_lo : False
+  expanded_hi : False
+  expanded_bit_width : 0
+  immediate_position : unused
+
+
+
 Cannot find table object for 'process_packet_out_table_always_true_condition'.
 Cannot find table object for 'process_packet_out_table_always_true_condition'.
 Cannot find table object for 'egress_port_count_table_always_true_condition'.
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/mau.resources.log b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/mau.resources.log
index f845959..04bc42d 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/mau.resources.log
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/mau.resources.log
@@ -1,7 +1,7 @@
 +---------------------------------------------------------------------+
 |  Log file: mau.resources.log                                        |
 |  Compiler version: 5.1.0 (fca32d1)                                  |
-|  Created on: Tue Sep 12 11:16:41 2017                               |
+|  Created on: Wed Sep 13 01:00:26 2017                               |
 +---------------------------------------------------------------------+
 
 
@@ -10,7 +10,7 @@
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 |      0       |           13           |            16            |    2     |       1        |    2    |  4   |    3    |  3   |     3      |     0     |     1     |   0   |           8           |         0          |          4          |          2          |        2        |
 |      1       |           4            |            0             |    30    |       0        |    0    |  5   |    2    |  0   |     1      |     0     |     1     |   0   |           4           |         0          |          2          |          1          |        1        |
-|      2       |           2            |            0             |    9     |       0        |    2    |  4   |    4    |  0   |     1      |     0     |     2     |   0   |           0           |         0          |          0          |          0          |        2        |
+|      2       |           6            |            0             |    29    |       2        |    2    |  4   |    4    |  0   |     1      |     0     |     2     |   0   |           0           |         0          |          0          |          0          |        2        |
 |      3       |           0            |            0             |    0     |       0        |    0    |  0   |    0    |  0   |     0      |     0     |     0     |   0   |           0           |         0          |          0          |          0          |        0        |
 |      4       |           0            |            0             |    0     |       0        |    0    |  0   |    0    |  0   |     0      |     0     |     0     |   0   |           0           |         0          |          0          |          0          |        0        |
 |      5       |           0            |            0             |    0     |       0        |    0    |  0   |    0    |  0   |     0      |     0     |     0     |   0   |           0           |         0          |          0          |          0          |        0        |
@@ -21,7 +21,7 @@
 |      10      |           0            |            0             |    0     |       0        |    0    |  0   |    0    |  0   |     0      |     0     |     0     |   0   |           0           |         0          |          0          |          0          |        0        |
 |      11      |           0            |            0             |    0     |       0        |    0    |  0   |    0    |  0   |     0      |     0     |     0     |   0   |           0           |         0          |          0          |          0          |        0        |
 |              |                        |                          |          |                |         |      |         |      |            |           |           |       |                       |                    |                     |                     |                 |
-|    Totals    |           19           |            16            |    41    |       1        |    4    |  13  |    9    |  3   |     5      |     0     |     4     |   0   |           12          |         0          |          6          |          3          |        5        |
+|    Totals    |           23           |            16            |    61    |       3        |    4    |  13  |    9    |  3   |     5      |     0     |     4     |   0   |           12          |         0          |          6          |          3          |        5        |
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 
 
@@ -30,7 +30,7 @@
 ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 |      0       |         10.16%         |          24.24%          |  0.48%   |     16.67%     |  12.50% | 5.00% |  6.25%  | 12.50% |   9.38%    |   0.00%   |   25.00%  | 0.00% |         6.25%         |       0.00%        |        12.50%       |        6.25%        |      12.50%     |
 |      1       |         3.12%          |          0.00%           |  7.21%   |     0.00%      |  0.00%  | 6.25% |  4.17%  | 0.00%  |   3.12%    |   0.00%   |   25.00%  | 0.00% |         3.12%         |       0.00%        |        6.25%        |        3.12%        |      6.25%      |
-|      2       |         1.56%          |          0.00%           |  2.16%   |     0.00%      |  12.50% | 5.00% |  8.33%  | 0.00%  |   3.12%    |   0.00%   |   50.00%  | 0.00% |         0.00%         |       0.00%        |        0.00%        |        0.00%        |      12.50%     |
+|      2       |         4.69%          |          0.00%           |  6.97%   |     33.33%     |  12.50% | 5.00% |  8.33%  | 0.00%  |   3.12%    |   0.00%   |   50.00%  | 0.00% |         0.00%         |       0.00%        |        0.00%        |        0.00%        |      12.50%     |
 |      3       |         0.00%          |          0.00%           |  0.00%   |     0.00%      |  0.00%  | 0.00% |  0.00%  | 0.00%  |   0.00%    |   0.00%   |   0.00%   | 0.00% |         0.00%         |       0.00%        |        0.00%        |        0.00%        |      0.00%      |
 |      4       |         0.00%          |          0.00%           |  0.00%   |     0.00%      |  0.00%  | 0.00% |  0.00%  | 0.00%  |   0.00%    |   0.00%   |   0.00%   | 0.00% |         0.00%         |       0.00%        |        0.00%        |        0.00%        |      0.00%      |
 |      5       |         0.00%          |          0.00%           |  0.00%   |     0.00%      |  0.00%  | 0.00% |  0.00%  | 0.00%  |   0.00%    |   0.00%   |   0.00%   | 0.00% |         0.00%         |       0.00%        |        0.00%        |        0.00%        |      0.00%      |
@@ -41,7 +41,7 @@
 |      10      |         0.00%          |          0.00%           |  0.00%   |     0.00%      |  0.00%  | 0.00% |  0.00%  | 0.00%  |   0.00%    |   0.00%   |   0.00%   | 0.00% |         0.00%         |       0.00%        |        0.00%        |        0.00%        |      0.00%      |
 |      11      |         0.00%          |          0.00%           |  0.00%   |     0.00%      |  0.00%  | 0.00% |  0.00%  | 0.00%  |   0.00%    |   0.00%   |   0.00%   | 0.00% |         0.00%         |       0.00%        |        0.00%        |        0.00%        |      0.00%      |
 |              |                        |                          |          |                |         |       |         |        |            |           |           |       |                       |                    |                     |                     |                 |
-|   Average    |         1.24%          |          2.02%           |  0.82%   |     1.39%      |  2.08%  | 1.35% |  1.56%  | 1.04%  |   1.30%    |   0.00%   |   8.33%   | 0.00% |         0.78%         |       0.00%        |        1.56%        |        0.78%        |      2.60%      |
+|   Average    |         1.50%          |          2.02%           |  1.22%   |     4.17%      |  2.08%  | 1.35% |  1.56%  | 1.04%  |   1.30%    |   0.00%   |   8.33%   | 0.00% |         0.78%         |       0.00%        |        1.56%        |        0.78%        |      2.60%      |
 ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 
 
@@ -63,9 +63,9 @@
 |      ecmp_group_table_counter      |   1    |    0     |  0   |    0     |  2   |   0   |  2   |   0    |   0   |
 |            _condition_2            |   2    |    2     |  9   |    1     |  0   |   0   |  0   |   0    |   0   |
 | ingress_port_count_table__action__ |   2    |    0     |  0   |    0     |  0   |   0   |  0   |   0    |   0   |
-|      ingress_port_count_table      |   2    |    0     |  0   |    0     |  0   |   0   |  0   |   0    |   1   |
+|      ingress_port_count_table      |   2    |    2     |  10  |    0     |  0   |   0   |  0   |   0    |   1   |
 | egress_port_count_table__action__  |   2    |    0     |  0   |    0     |  0   |   0   |  0   |   0    |   0   |
-|      egress_port_count_table       |   2    |    0     |  0   |    1     |  0   |   0   |  0   |   0    |   1   |
+|      egress_port_count_table       |   2    |    2     |  10  |    1     |  0   |   0   |  0   |   0    |   1   |
 |        ingress_port_counter        |   2    |    0     |  0   |    0     |  2   |   0   |  2   |   0    |   0   |
 |        egress_port_counter         |   2    |    0     |  0   |    0     |  2   |   0   |  2   |   0    |   0   |
 --------------------------------------------------------------------------------------------------------------------
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/mau.rf.log b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/mau.rf.log
index 92054d9..a33304f 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/mau.rf.log
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/mau.rf.log
@@ -1,6 +1,6 @@
 +---------------------------------------------------------------------+
 |  Log file: mau.rf.log                                               |
 |  Compiler version: 5.1.0 (fca32d1)                                  |
-|  Created on: Tue Sep 12 11:16:41 2017                               |
+|  Created on: Wed Sep 13 01:00:26 2017                               |
 +---------------------------------------------------------------------+
 
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/mau.sram.log b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/mau.sram.log
index 52527ff..5a4f373 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/mau.sram.log
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/mau.sram.log
@@ -1,7 +1,7 @@
 +---------------------------------------------------------------------+
 |  Log file: mau.sram.log                                             |
 |  Compiler version: 5.1.0 (fca32d1)                                  |
-|  Created on: Tue Sep 12 11:16:41 2017                               |
+|  Created on: Wed Sep 13 01:00:26 2017                               |
 +---------------------------------------------------------------------+
 
 
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/mau.tcam.log b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/mau.tcam.log
index cd4e13b..395d98f 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/mau.tcam.log
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/mau.tcam.log
@@ -1,7 +1,7 @@
 +---------------------------------------------------------------------+
 |  Log file: mau.tcam.log                                             |
 |  Compiler version: 5.1.0 (fca32d1)                                  |
-|  Created on: Tue Sep 12 11:16:41 2017                               |
+|  Created on: Wed Sep 13 01:00:26 2017                               |
 +---------------------------------------------------------------------+
 
 
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/mau.tp.log b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/mau.tp.log
index b314530..13edc9e 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/mau.tp.log
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/mau.tp.log
@@ -1,7 +1,7 @@
 +---------------------------------------------------------------------+
 |  Log file: mau.tp.log                                               |
 |  Compiler version: 5.1.0 (fca32d1)                                  |
-|  Created on: Tue Sep 12 11:16:41 2017                               |
+|  Created on: Wed Sep 13 01:00:26 2017                               |
 +---------------------------------------------------------------------+
 
 ----- Stage 0 ------
@@ -37,10 +37,10 @@
 ------------------------------------------
  Running Table Placement 4
 ------------------------------------------
-Cannot use hash action for table ingress_port_count_table.
-Cannot use hash-action for table ingress_port_count_table with no key because the number of entries required by side-effect table ingress_port_counter is not a power of 2 -- 510.
-Cannot use hash action for table egress_port_count_table.
-Cannot use hash-action for table egress_port_count_table with no key because the number of entries required by side-effect table egress_port_counter is not a power of 2 -- 510.
+Can use hash action for table ingress_port_count_table???  True
+Decided that match table ingress_port_count_table is more efficiently allocated using hash-action to ingress_port_counter.
+Can use hash action for table egress_port_count_table???  True
+Decided that match table egress_port_count_table is more efficiently allocated using hash-action to egress_port_counter.
 Cannot use hash action for table process_packet_out_table.
 Table process_packet_out_table has no side effect tables.
 User requested to not attempt to place action data parameters in the match overhead.
@@ -51,8 +51,8 @@
 ------------------------------------------
  Table Groups
 ------------------------------------------
-Table Grouping (ingress) with match table ingress_port_count_table (1024) [ingress_port_count_table__action__ (1024), ingress_port_counter (510)]
-Table Grouping (ingress) with match table egress_port_count_table (1024) [egress_port_count_table__action__ (1024), egress_port_counter (510)]
+Table Grouping (ingress) with match table ingress_port_count_table (1024) [ingress_port_count_table__action__ (1024), ingress_port_counter (512)]
+Table Grouping (ingress) with match table egress_port_count_table (1024) [egress_port_count_table__action__ (1024), egress_port_counter (512)]
 Table Grouping (ingress) with match table process_packet_out_table (1024) [process_packet_out_table__action__ (1024)]
 Table Grouping (ingress) with match table table0 (512) [table0__action__ (512), table0_counter (512)]
 Table Grouping (ingress) with match table ecmp_group_table (1024) [ecmp_group_table__action__ (1024), ecmp_group_table_counter (1024)]
@@ -108,13 +108,13 @@
 
 Nodes could place:
   _condition_2 (4)
->> choose Table Grouping (ingress) with match table ingress_port_count_table (1024) [ingress_port_count_table__action__ (1024), ingress_port_counter (510)]
+>> choose Table Grouping (ingress) with match table ingress_port_count_table (1024) [ingress_port_count_table__action__ (1024), ingress_port_counter (512)]
 Earliest stage can place: 2
 Placing table: ingress_port_count_table__action__ with 1024 entries
-Placing table: ingress_port_counter with 510 entries
+Placing table: ingress_port_counter with 512 entries
 Table ingress_port_count_table__action__ with 0 entries is directly referenced
 Table ingress_port_counter with 4096 entries is indirectly referenced
-Match Table ingress_port_count_table has a total of 1 entries in stage 2
+Match Table ingress_port_count_table has a total of 1024 entries in stage 2
   Direct mapped table ingress_port_count_table__action__ has 0 entries
 >> set ingress_port_count_table (5) to placed
 >> set _condition_2 (4) to placed
@@ -123,15 +123,15 @@
   egress_port_count_table (6)
 egress_port_count_table and _condition_2 not mutually exclusive
 egress_port_count_table and ingress_port_count_table not mutually exclusive
->> choose Table Grouping (ingress) with match table egress_port_count_table (1024) [egress_port_count_table__action__ (1024), egress_port_counter (510)]
+>> choose Table Grouping (ingress) with match table egress_port_count_table (1024) [egress_port_count_table__action__ (1024), egress_port_counter (512)]
 Earliest stage can place: 2
 egress_port_count_table and _condition_2 not mutually exclusive
 egress_port_count_table and ingress_port_count_table not mutually exclusive
 Placing table: egress_port_count_table__action__ with 1024 entries
-Placing table: egress_port_counter with 510 entries
+Placing table: egress_port_counter with 512 entries
 Table egress_port_count_table__action__ with 0 entries is directly referenced
 Table egress_port_counter with 4096 entries is indirectly referenced
-Match Table egress_port_count_table has a total of 1 entries in stage 2
+Match Table egress_port_count_table has a total of 1024 entries in stage 2
   Direct mapped table egress_port_count_table__action__ has 0 entries
 >> set egress_port_count_table (6) to placed
 
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/pa.characterize.log b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/pa.characterize.log
index 55dbc6a..d7a5067 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/pa.characterize.log
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/pa.characterize.log
@@ -1,7 +1,7 @@
 +---------------------------------------------------------------------+
 |  Log file: pa.characterize.log                                      |
 |  Compiler version: 5.1.0 (fca32d1)                                  |
-|  Created on: Tue Sep 12 11:16:41 2017                               |
+|  Created on: Wed Sep 13 01:00:26 2017                               |
 +---------------------------------------------------------------------+
 
 Program: ecmp
@@ -17,13 +17,13 @@
 |    [7:0]  | ingress |           ipv4.srcAddr[31:24]            |  pkt  |  | W | R  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
 |    phv2   | ingress |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
 |   [31:0]  | ingress |            ipv4.dstAddr[31:0]            |  pkt  |  | W | R  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
-|    phv3   | ingress |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
-|   [31:0]  | ingress |          ethernet.dstAddr[39:8]          |  pkt  |  | W | R  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
+|    phv3   | ingress |                                          |   SH  |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
+|   [31:24] | ingress |             tcp.dstPort[7:0]             |  pkt  |  | W | R  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
+|   [23:0]  | ingress |             tcp.seqNo[31:8]              |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
 |    phv4   | ingress |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
+|   [31:0]  | ingress |          ethernet.dstAddr[39:8]          |  pkt  |  | W | R  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
+|    phv5   | ingress |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
 |   [31:0]  | ingress |          ethernet.srcAddr[31:0]          |  pkt  |  | W | R  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
-|    phv5   | ingress |                                          |   SH  |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
-|   [31:16] | ingress |            udp.srcPort[15:0]             |  pkt  |  | W | R  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
-|   [15:0]  | ingress |            udp.dstPort[15:0]             |  pkt  |  | W | R  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
 |    phv6   |    -    |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
 |    phv7   |    -    |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
 |    phv8   |    -    |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
@@ -88,11 +88,14 @@
 |           |         |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
 |   phv64   | ingress |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
 |    [7:0]  | ingress |           ipv4.srcAddr[23:16]            |  pkt  |  | W | R  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
-|   phv65   | ingress |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
-|    [7:0]  | ingress |         ethernet.dstAddr[47:40]          |  pkt  |  | W | R  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
+|   phv65   | ingress |                                          | OL,SH |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
+|    [7:0]  | ingress |            tcp.srcPort[15:8]             |  pkt  |  | W | R  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
+|    [7:0]  | ingress |             udp.srcPort[7:0]             |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
 |   phv66   | ingress |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
+|    [7:0]  | ingress |         ethernet.dstAddr[47:40]          |  pkt  |  | W | R  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
+|   phv67   | ingress |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
 |    [7:0]  | ingress |         ethernet.srcAddr[39:32]          |  pkt  |  | W | R  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
-|   phv67   | ingress |                                          |   SH  |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
+|   phv68   | ingress |                                          |   SH  |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
 |    [6:6]  | ingress |  --validity_check--metadata_bridge[0:0]  |  pov  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
 |    [5:5]  | ingress |        --validity_check--udp[0:0]        |  pov  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
 |    [4:4]  | ingress |        --validity_check--tcp[0:0]        |  pov  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
@@ -100,9 +103,8 @@
 |    [2:2]  | ingress |     --validity_check--ethernet[0:0]      |  pov  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
 |    [1:1]  | ingress |  --validity_check--packet_out_hdr[0:0]   |  pov  |  | W | RW | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
 |    [0:0]  | ingress |   --validity_check--packet_in_hdr[0:0]   |  pov  |  | W | W  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
-|   phv68   | ingress |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
+|   phv69   | ingress |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
 |    [7:5]  | ingress |     ig_intr_md_for_tm.drop_ctl[2:0]      | imeta |  |   | W  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
-|   phv69   |    -    |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
 |   phv70   |    -    |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
 |   phv71   |    -    |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
 |   phv72   |    -    |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
@@ -189,15 +191,17 @@
 |   phv131  | ingress |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
 |   [15:0]  | ingress |            ipv4.srcAddr[15:0]            |  pkt  |  | W | R  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
 |   phv132  | ingress |                                          |   SH  |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
+|   [15:8]  | ingress |             tcp.srcPort[7:0]             |  pkt  |  | W | R  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
+|    [7:0]  | ingress |            tcp.dstPort[15:8]             |  pkt  |  | W | R  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
+|   phv133  | ingress |                                          |   SH  |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
 |   [15:8]  | ingress |          ethernet.dstAddr[7:0]           |  pkt  |  | W | R  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
 |    [7:0]  | ingress |         ethernet.srcAddr[47:40]          |  pkt  |  | W | R  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
-|   phv133  | ingress |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
-|   [15:0]  | ingress |         ethernet.etherType[15:0]         |  pkt  |  | W | R  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
 |   phv134  | ingress |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
-|   [15:0]  | ingress |       ecmp_metadata.group_id[15:0]       |  meta |  |   | W  | R |   |   |   |   |   |   |   |   |    |    |   |
+|   [15:0]  | ingress |         ethernet.etherType[15:0]         |  pkt  |  | W | R  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
 |   phv135  | ingress |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
+|   [15:0]  | ingress |       ecmp_metadata.group_id[15:0]       |  meta |  |   | W  | R |   |   |   |   |   |   |   |   |    |    |   |
+|   phv136  | ingress |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
 |   [15:0]  | ingress |       ecmp_metadata.selector[15:0]       |  meta |  |   | W  | R |   |   |   |   |   |   |   |   |    |    |   |
-|   phv136  |    -    |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
 |   phv137  |    -    |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
 |   phv138  |    -    |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
 |   phv139  |    -    |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
@@ -298,45 +302,47 @@
 |   [23:21] | ingress |             ipv4.flags[2:0]              |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
 |   [20:8]  | ingress |          ipv4.fragOffset[12:0]           |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
 |    [7:0]  | ingress |              ipv4.ttl[7:0]               |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
-|   phv257  | ingress |                                          |   SH  |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
+|   phv257  | ingress |                                          | OL,SH |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
 |   [31:28] | ingress |           tcp.dataOffset[3:0]            |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
 |   [27:25] | ingress |               tcp.res[2:0]               |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
 |   [24:22] | ingress |               tcp.ecn[2:0]               |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
 |   [21:16] | ingress |              tcp.ctrl[5:0]               |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
+|   [31:16] | ingress |            udp.length_[15:0]             |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
 |   [15:0]  | ingress |             tcp.window[15:0]             |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
+|   [15:0]  | ingress |            udp.checksum[15:0]            |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
 |   phv258  | ingress |                                          |   SH  |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
 |   [31:16] | ingress |            tcp.checksum[15:0]            |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
 |   [15:0]  | ingress |           tcp.urgentPtr[15:0]            |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
 |   phv259  |    -    |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
-|   phv260  |    -    |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
-|   phv261  |    -    |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
-|   phv262  |    -    |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
-|   phv263  |    -    |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
-|   phv264  |  egress |                                          |   SH  |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
+|   phv260  |  egress |                                          |   SH  |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
 |   [31:24] |  egress |              ipv4.ttl[7:0]               |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
 |   [23:16] |  egress |            ipv4.protocol[7:0]            |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
 |   [15:0]  |  egress |          ipv4.hdrChecksum[15:0]          |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
-|   phv265  |  egress |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
+|   phv261  |  egress |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
 |   [31:0]  |  egress |            ipv4.srcAddr[31:0]            |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
-|   phv266  |  egress |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
+|   phv262  |  egress |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
 |   [31:0]  |  egress |            ipv4.dstAddr[31:0]            |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
-|   phv267  |  egress |                                          | OL,SH |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
+|   phv263  |  egress |                                          | OL,SH |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
 |   [31:16] |  egress |            udp.length_[15:0]             |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
 |   [31:0]  |  egress |             tcp.ackNo[31:0]              |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
 |   [15:0]  |  egress |            udp.checksum[15:0]            |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
-|   phv268  |  egress |                                          |   SH  |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
+|   phv264  |  egress |                                          |   SH  |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
 |   [31:28] |  egress |           tcp.dataOffset[3:0]            |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
 |   [27:25] |  egress |               tcp.res[2:0]               |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
 |   [24:22] |  egress |               tcp.ecn[2:0]               |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
 |   [21:16] |  egress |              tcp.ctrl[5:0]               |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
 |   [15:0]  |  egress |             tcp.window[15:0]             |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
-|   phv269  |  egress |                                          |   SH  |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
+|   phv265  |  egress |                                          |   SH  |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
 |   [31:16] |  egress |            tcp.checksum[15:0]            |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
 |   [15:0]  |  egress |           tcp.urgentPtr[15:0]            |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
-|   phv270  |  egress |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
+|   phv266  |  egress |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
 |   [31:0]  |  egress |          ethernet.dstAddr[39:8]          |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
-|   phv271  |  egress |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
+|   phv267  |  egress |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
 |   [31:0]  |  egress |          ethernet.srcAddr[31:0]          |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
+|   phv268  |    -    |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
+|   phv269  |    -    |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
+|   phv270  |    -    |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
+|   phv271  |    -    |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
 |           |         |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
 |   phv272  |    -    |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
 |   phv273  |    -    |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
@@ -359,33 +365,29 @@
 |    [7:4]  | ingress |            ipv4.version[3:0]             |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
 |    [3:0]  | ingress |              ipv4.ihl[3:0]               |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
 |   phv289  | ingress |                                          | OL,SH |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
-|    [7:0]  | ingress |            tcp.srcPort[15:8]             |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
-|    [7:0]  | ingress |            udp.length_[15:8]             |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
-|   phv290  | ingress |                                          | OL,SH |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
-|    [7:0]  | ingress |             tcp.srcPort[7:0]             |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
-|    [7:0]  | ingress |             udp.length_[7:0]             |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
-|   phv291  | ingress |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
-|    [7:0]  | ingress |            tcp.dstPort[15:8]             |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
-|   phv292  | ingress |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
-|    [7:0]  | ingress |             tcp.dstPort[7:0]             |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
-|   phv293  |    -    |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
-|   phv294  |    -    |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
-|   phv295  |    -    |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
-|   phv296  |  egress |                                          |   SH  |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
+|    [7:0]  | ingress |              tcp.seqNo[7:0]              |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
+|    [7:0]  | ingress |            udp.srcPort[15:8]             |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
+|   phv290  |    -    |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
+|   phv291  |    -    |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
+|   phv292  |  egress |                                          |   SH  |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
 |    [7:4]  |  egress |            ipv4.version[3:0]             |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
 |    [3:0]  |  egress |              ipv4.ihl[3:0]               |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
-|   phv297  |  egress |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
+|   phv293  |  egress |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
 |    [7:0]  |  egress |            ipv4.diffserv[7:0]            |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
-|   phv298  |  egress |                                          | OL,SH |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
+|   phv294  |  egress |                                          | OL,SH |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
 |    [7:0]  |  egress |            tcp.srcPort[15:8]             |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
 |    [7:0]  |  egress |            udp.srcPort[15:8]             |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
-|   phv299  |  egress |                                          | OL,SH |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
+|   phv295  |  egress |                                          | OL,SH |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
 |    [7:0]  |  egress |             tcp.srcPort[7:0]             |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
 |    [7:0]  |  egress |             udp.srcPort[7:0]             |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
-|   phv300  |  egress |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
+|   phv296  |  egress |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
 |    [7:0]  |  egress |         ethernet.dstAddr[47:40]          |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
-|   phv301  |  egress |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
+|   phv297  |  egress |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
 |    [7:0]  |  egress |         ethernet.srcAddr[39:32]          |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
+|   phv298  |    -    |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
+|   phv299  |    -    |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
+|   phv300  |    -    |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
+|   phv301  |    -    |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
 |   phv302  |    -    |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
 |   phv303  |    -    |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
 |           |         |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
@@ -413,45 +415,43 @@
 |   [15:8]  | ingress |            ipv4.totalLen[7:0]            |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
 |    [7:0]  | ingress |        ipv4.identification[15:8]         |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
 |   phv322  | ingress |                                          | OL,SH |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
-|   [15:0]  | ingress |             tcp.seqNo[31:16]             |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
-|   [15:0]  | ingress |            udp.checksum[15:0]            |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
-|   phv323  | ingress |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
-|   [15:0]  | ingress |             tcp.seqNo[15:0]              |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
-|   phv324  | ingress |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
 |   [15:0]  | ingress |             tcp.ackNo[31:16]             |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
-|   phv325  | ingress |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
+|   [15:0]  | ingress |            udp.dstPort[15:0]             |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
+|   phv323  | ingress |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
 |   [15:0]  | ingress |             tcp.ackNo[15:0]              |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
-|   phv326  |    -    |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
-|   phv327  |    -    |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
-|   phv328  |    -    |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
-|   phv329  |    -    |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
-|   phv330  |    -    |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
-|   phv331  |    -    |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
-|   phv332  |  egress |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
+|   phv324  |    -    |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
+|   phv325  |    -    |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
+|   phv326  |  egress |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
 |   [15:0]  |  egress |           ipv4.totalLen[15:0]            |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
-|   phv333  |  egress |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
+|   phv327  |  egress |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
 |   [15:0]  |  egress |        ipv4.identification[15:0]         |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
-|   phv334  |  egress |                                          |   SH  |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
+|   phv328  |  egress |                                          |   SH  |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
 |   [15:13] |  egress |             ipv4.flags[2:0]              |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
 |   [12:0]  |  egress |          ipv4.fragOffset[12:0]           |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
-|   phv335  |  egress |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
+|   phv329  |  egress |                                          | OL,SH |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
 |   [15:0]  |  egress |            tcp.dstPort[15:0]             |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
-|           |         |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
-|   phv336  |  egress |                                          | OL,SH |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
-|   [15:0]  |  egress |             tcp.seqNo[31:16]             |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
 |   [15:0]  |  egress |            udp.dstPort[15:0]             |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
-|   phv337  |  egress |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
+|   phv330  |  egress |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
+|   [15:0]  |  egress |             tcp.seqNo[31:16]             |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
+|   phv331  |  egress |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
 |   [15:0]  |  egress |             tcp.seqNo[15:0]              |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
-|   phv338  |  egress |                                          |   SH  |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
+|   phv332  |  egress |                                          |   SH  |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
 |   [15:8]  |  egress |          ethernet.dstAddr[7:0]           |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
 |    [7:0]  |  egress |         ethernet.srcAddr[47:40]          |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
-|   phv339  |  egress |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
+|   phv333  |  egress |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
 |   [15:0]  |  egress |         ethernet.etherType[15:0]         |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
-|   phv340  |  egress |                                          | OL,SH |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
+|   phv334  |  egress |                                          | OL,SH |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
 |   [15:7]  |  egress |     packet_out_hdr.egress_port[8:0]      |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
 |   [15:7]  |  egress |     packet_in_hdr.ingress_port[8:0]      |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
 |    [6:0]  |  egress |       packet_out_hdr._padding[6:0]       |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
 |    [6:0]  |  egress |       packet_in_hdr._padding[6:0]        |  pkt  |  | W | ~  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
+|   phv335  |    -    |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
+|           |         |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
+|   phv336  |    -    |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
+|   phv337  |    -    |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
+|   phv338  |    -    |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
+|   phv339  |    -    |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
+|   phv340  |    -    |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
 |   phv341  |    -    |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
 |   phv342  |    -    |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
 |   phv343  |    -    |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
@@ -483,9 +483,9 @@
 -----------------------------------------------------------------------------------------------------------------------------------------
 
 
-Containers used: 59
-Containers with data overlayed: 9  (15.25%)
-Containers shared: 29  (49.15%)
+Containers used: 56
+Containers with data overlayed: 10  (17.86%)
+Containers shared: 30  (53.57%)
 
 ------------------------
   Legend:
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/pa.constraints.log b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/pa.constraints.log
index 13d6041..85e1d6e 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/pa.constraints.log
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/pa.constraints.log
@@ -1,7 +1,7 @@
 +---------------------------------------------------------------------+
 |  Log file: pa.constraints.log                                       |
 |  Compiler version: 5.1.0 (fca32d1)                                  |
-|  Created on: Tue Sep 12 11:16:41 2017                               |
+|  Created on: Wed Sep 13 01:00:26 2017                               |
 +---------------------------------------------------------------------+
 
 To populate this log file, include --print-pa-constraints as a compiler argument.
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/pa.liveness.log b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/pa.liveness.log
index 37549c5..d367040 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/pa.liveness.log
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/pa.liveness.log
@@ -1,6 +1,6 @@
 +---------------------------------------------------------------------+
 |  Log file: pa.liveness.log                                          |
 |  Compiler version: 5.1.0 (fca32d1)                                  |
-|  Created on: Tue Sep 12 11:16:41 2017                               |
+|  Created on: Wed Sep 13 01:00:26 2017                               |
 +---------------------------------------------------------------------+
 
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/pa.log b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/pa.log
index 0eaf2fe..a7b42aa 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/pa.log
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/pa.log
@@ -1,7 +1,7 @@
 +---------------------------------------------------------------------+
 |  Log file: pa.log                                                   |
 |  Compiler version: 5.1.0 (fca32d1)                                  |
-|  Created on: Tue Sep 12 11:16:41 2017                               |
+|  Created on: Wed Sep 13 01:00:26 2017                               |
 +---------------------------------------------------------------------+
 
 HLIR Version: 0.10.5
@@ -504,17 +504,17 @@
 |             tcp.checksum            |     16    |  ingress  |    x    |     x     |           |              |               |
 |               tcp.ctrl              |     6     |  ingress  |    x    |     x     |           |              |               |
 |            tcp.dataOffset           |     4     |  ingress  |    x    |     x     |           |              |               |
-|             tcp.dstPort             |     16    |  ingress  |    x    |     x     |           |              |               |
+|             tcp.dstPort             |     16    |  ingress  |    x    |     x     |           |      x       |               |
 |               tcp.ecn               |     3     |  ingress  |    x    |     x     |           |              |               |
 |               tcp.res               |     3     |  ingress  |    x    |     x     |           |              |               |
 |              tcp.seqNo              |     32    |  ingress  |    x    |     x     |           |              |               |
-|             tcp.srcPort             |     16    |  ingress  |    x    |     x     |           |              |               |
+|             tcp.srcPort             |     16    |  ingress  |    x    |     x     |           |      x       |               |
 |            tcp.urgentPtr            |     16    |  ingress  |    x    |     x     |           |              |               |
 |              tcp.window             |     16    |  ingress  |    x    |     x     |           |              |               |
 |             udp.checksum            |     16    |  ingress  |    x    |     x     |           |              |               |
-|             udp.dstPort             |     16    |  ingress  |    x    |     x     |           |      x       |               |
+|             udp.dstPort             |     16    |  ingress  |    x    |     x     |           |              |               |
 |             udp.length_             |     16    |  ingress  |    x    |     x     |           |              |               |
-|             udp.srcPort             |     16    |  ingress  |    x    |     x     |           |      x       |               |
+|             udp.srcPort             |     16    |  ingress  |    x    |     x     |           |              |               |
 ---------------------------------------------------------------------------------------------------------------------------------
 
 Performing PHV allocation...
@@ -553,7 +553,7 @@
   parse_pkt_in and parse_pkt_out are exclusive parse states
   parse_tcp and parse_udp are exclusive parse states
 
->>Event 'pa_init' at time 1505215004.27
+>>Event 'pa_init' at time 1505264429.10
    Took 0.01 seconds
 --------------------------------------------
 PHV MAU Groups: 92
@@ -645,13 +645,13 @@
   ipv4.dstAddr <32 bits ingress parsed R>
 
 Phv Mau Group (ingress) -- 1 instance for total bit width of 16.
-  tcp.srcPort <16 bits ingress parsed tagalong>
+  tcp.srcPort <16 bits ingress parsed R>
 
 Phv Mau Group (ingress) -- 1 instance for total bit width of 1.
   --validity_check--tcp <1 bits ingress parsed pov>
 
 Phv Mau Group (ingress) -- 1 instance for total bit width of 16.
-  tcp.dstPort <16 bits ingress parsed tagalong>
+  tcp.dstPort <16 bits ingress parsed R>
 
 Phv Mau Group (ingress) -- 1 instance for total bit width of 32.
   tcp.seqNo <32 bits ingress parsed tagalong>
@@ -681,13 +681,13 @@
   tcp.urgentPtr <16 bits ingress parsed tagalong>
 
 Phv Mau Group (ingress) -- 1 instance for total bit width of 16.
-  udp.srcPort <16 bits ingress parsed R>
+  udp.srcPort <16 bits ingress parsed tagalong>
 
 Phv Mau Group (ingress) -- 1 instance for total bit width of 1.
   --validity_check--udp <1 bits ingress parsed pov>
 
 Phv Mau Group (ingress) -- 1 instance for total bit width of 16.
-  udp.dstPort <16 bits ingress parsed R>
+  udp.dstPort <16 bits ingress parsed tagalong>
 
 Phv Mau Group (ingress) -- 1 instance for total bit width of 16.
   udp.length_ <16 bits ingress parsed tagalong>
@@ -837,7 +837,7 @@
   eg_intr_md.egress_cos <3 bits egress parsed imeta>
 
 
->>Event 'pa_resv' at time 1505215004.27
+>>Event 'pa_resv' at time 1505264429.10
    Took 0.00 seconds
 
 -----------------------------------------------
@@ -879,7 +879,7 @@
   Group 2 32 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 12 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv32
   Group 3 32 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 12 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv48
 Reserving 32-bit container for ingress: phv0
->>Event 'pa_bridge' at time 1505215004.31
+>>Event 'pa_bridge' at time 1505264429.14
    Took 0.04 seconds
 
 -----------------------------------------------
@@ -932,7 +932,7 @@
 |     Overall total      |    1 (0.30%)    | 32 (0.52%) |      6144      |
 ---------------------------------------------------------------------------
 
->>Event 'pa_phase0' at time 1505215004.31
+>>Event 'pa_phase0' at time 1505264429.14
    Took 0.00 seconds
 
 -----------------------------------------------
@@ -985,7 +985,7 @@
 |     Overall total      |    1 (0.30%)    | 32 (0.52%) |      6144      |
 ---------------------------------------------------------------------------
 
->>Event 'pa_critical' at time 1505215004.31
+>>Event 'pa_critical' at time 1505264429.14
    Took 0.00 seconds
 
 -----------------------------------------------
@@ -1334,8 +1334,8 @@
 -------------------------------------------------------------------------------------
 |      Name      | BW | Tagalong? | Req | Pref | Not Allow | MaxSplit | Group Size |
 -------------------------------------------------------------------------------------
-|  tcp.srcPort   | 16 |    True   |  -  |  -   |     -     |    2     |     1      |
-|  tcp.dstPort   | 16 |    True   |  -  |  -   |     -     |    2     |     1      |
+|  tcp.srcPort   | 16 |   False   |  -  |  -   |     -     |    2     |     1      |
+|  tcp.dstPort   | 16 |   False   |  -  |  -   |     -     |    2     |     1      |
 |   tcp.seqNo    | 32 |    True   |  -  |  -   |     -     |    4     |     1      |
 |   tcp.ackNo    | 32 |    True   |  -  |  -   |     -     |    4     |     1      |
 | tcp.dataOffset | 4  |    True   |  -  |  -   |     -     |    1     |     1      |
@@ -1361,23 +1361,21 @@
   32-bit: 31
 Initial packing options: 5196
 
-Packing option 0:  [8, 8, 8, 8, 16, 16, 16, 16, 32, 32]
+Packing option 0:  [8, 16, 32, 8, 16, 16, 32, 32]
 MAU containers after:
-  8-bit: 47
-  16-bit: 76
-  32-bit: 45
+  8-bit: 46
+  16-bit: 75
+  32-bit: 44
 +-------------------------+
 |  tcp.srcPort [15:8]     |
 +-------------------------+
 |  tcp.srcPort [7:0]      |
-+-------------------------+
 |  tcp.dstPort [15:8]     |
 +-------------------------+
 |  tcp.dstPort [7:0]      |
+|  tcp.seqNo [31:8]       |
 +-------------------------+
-|  tcp.seqNo [31:16]      |
-+-------------------------+
-|  tcp.seqNo [15:0]       |
+|  tcp.seqNo [7:0]        |
 +-------------------------+
 |  tcp.ackNo [31:16]      |
 +-------------------------+
@@ -1395,28 +1393,43 @@
 
 Looking at tcp.srcPort (ingress) [15:8], with test_alloc = True
 ----> tcp.srcPort (ingress) is allocated? False
-***Allocating phv289[7:0] for tcp.srcPort[15:8]
+
+MAU groups: 3
+  Group 4 8 bits -- avail 15 -- ingress avail 15 and remain 14 and promised 1 and req 1 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv65
+  Group 6 8 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv96
+  Group 7 8 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv112
+***Allocating phv65[7:0] for tcp.srcPort[15:8]
 Looking at tcp.srcPort (ingress) [7:0], with test_alloc = True
 ----> tcp.srcPort (ingress) is allocated? False
-***Allocating phv290[7:0] for tcp.srcPort[7:0]
 Looking at tcp.dstPort (ingress) [15:8], with test_alloc = True
-----> tcp.dstPort (ingress) is allocated? False
-***Allocating phv291[7:0] for tcp.dstPort[15:8]
+
+MAU groups: 5
+  Group 8 16 bits -- avail 13 -- ingress avail 13 and remain 11 and promised 2 and req 2 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv132
+  Group 10 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv160
+  Group 11 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv176
+  Group 12 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv192
+  Group 13 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv208
+***Allocating phv132[15:8] for tcp.srcPort[7:0]
+***Allocating phv132[7:0] for tcp.dstPort[15:8]
 Looking at tcp.dstPort (ingress) [7:0], with test_alloc = True
 ----> tcp.dstPort (ingress) is allocated? False
-***Allocating phv292[7:0] for tcp.dstPort[7:0]
-Looking at tcp.seqNo (ingress) [31:16], with test_alloc = True
+Looking at tcp.seqNo (ingress) [31:8], with test_alloc = True
+
+MAU groups: 3
+  Group 0 32 bits -- avail 13 -- ingress avail 13 and remain 12 and promised 1 and req 1 -- egress avail 12 and remain 12 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv3
+  Group 2 32 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 12 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv32
+  Group 3 32 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 12 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv48
+***Allocating phv3[31:24] for tcp.dstPort[7:0]
+***Allocating phv3[23:0] for tcp.seqNo[31:8]
+Looking at tcp.seqNo (ingress) [7:0], with test_alloc = True
 ----> tcp.seqNo (ingress) is allocated? False
-***Allocating phv322[15:0] for tcp.seqNo[31:16]
-Looking at tcp.seqNo (ingress) [15:0], with test_alloc = True
-----> tcp.seqNo (ingress) is allocated? False
-***Allocating phv323[15:0] for tcp.seqNo[15:0]
+***Allocating phv289[7:0] for tcp.seqNo[7:0]
 Looking at tcp.ackNo (ingress) [31:16], with test_alloc = True
 ----> tcp.ackNo (ingress) is allocated? False
-***Allocating phv324[15:0] for tcp.ackNo[31:16]
+***Allocating phv322[15:0] for tcp.ackNo[31:16]
 Looking at tcp.ackNo (ingress) [15:0], with test_alloc = True
 ----> tcp.ackNo (ingress) is allocated? False
-***Allocating phv325[15:0] for tcp.ackNo[15:0]
+***Allocating phv323[15:0] for tcp.ackNo[15:0]
 Looking at tcp.dataOffset (ingress) [3:0], with test_alloc = True
 ----> tcp.dataOffset (ingress) is allocated? False
 Looking at tcp.res (ingress) [2:0], with test_alloc = True
@@ -1487,9 +1500,9 @@
   16-bit: 80
   32-bit: 48
 Tagalong containers available:
-  8-bit: 24
-  16-bit: 36
-  32-bit: 24
+  8-bit: 28
+  16-bit: 42
+  32-bit: 28
 Initial packing options: 5196
 
 Packing option 0:  [8, 8, 16, 16, 16, 32, 32, 32]
@@ -1522,35 +1535,35 @@
 Looking at ipv4.version (egress) [3:0], with test_alloc = True
 ----> ipv4.version (egress) is allocated? False
 Looking at ipv4.ihl (egress) [3:0], with test_alloc = True
-***Allocating phv296[7:4] for ipv4.version[3:0]
-***Allocating phv296[3:0] for ipv4.ihl[3:0]
+***Allocating phv292[7:4] for ipv4.version[3:0]
+***Allocating phv292[3:0] for ipv4.ihl[3:0]
 Looking at ipv4.diffserv (egress) [7:0], with test_alloc = True
 ----> ipv4.diffserv (egress) is allocated? False
-***Allocating phv297[7:0] for ipv4.diffserv[7:0]
+***Allocating phv293[7:0] for ipv4.diffserv[7:0]
 Looking at ipv4.totalLen (egress) [15:0], with test_alloc = True
 ----> ipv4.totalLen (egress) is allocated? False
-***Allocating phv332[15:0] for ipv4.totalLen[15:0]
+***Allocating phv326[15:0] for ipv4.totalLen[15:0]
 Looking at ipv4.identification (egress) [15:0], with test_alloc = True
 ----> ipv4.identification (egress) is allocated? False
-***Allocating phv333[15:0] for ipv4.identification[15:0]
+***Allocating phv327[15:0] for ipv4.identification[15:0]
 Looking at ipv4.flags (egress) [2:0], with test_alloc = True
 ----> ipv4.flags (egress) is allocated? False
 Looking at ipv4.fragOffset (egress) [12:0], with test_alloc = True
-***Allocating phv334[15:13] for ipv4.flags[2:0]
-***Allocating phv334[12:0] for ipv4.fragOffset[12:0]
+***Allocating phv328[15:13] for ipv4.flags[2:0]
+***Allocating phv328[12:0] for ipv4.fragOffset[12:0]
 Looking at ipv4.ttl (egress) [7:0], with test_alloc = True
 ----> ipv4.ttl (egress) is allocated? False
 Looking at ipv4.protocol (egress) [7:0], with test_alloc = True
 Looking at ipv4.hdrChecksum (egress) [15:0], with test_alloc = True
-***Allocating phv264[31:24] for ipv4.ttl[7:0]
-***Allocating phv264[23:16] for ipv4.protocol[7:0]
-***Allocating phv264[15:0] for ipv4.hdrChecksum[15:0]
+***Allocating phv260[31:24] for ipv4.ttl[7:0]
+***Allocating phv260[23:16] for ipv4.protocol[7:0]
+***Allocating phv260[15:0] for ipv4.hdrChecksum[15:0]
 Looking at ipv4.srcAddr (egress) [31:0], with test_alloc = True
 ----> ipv4.srcAddr (egress) is allocated? False
-***Allocating phv265[31:0] for ipv4.srcAddr[31:0]
+***Allocating phv261[31:0] for ipv4.srcAddr[31:0]
 Looking at ipv4.dstAddr (egress) [31:0], with test_alloc = True
 ----> ipv4.dstAddr (egress) is allocated? False
-***Allocating phv266[31:0] for ipv4.dstAddr[31:0]
+***Allocating phv262[31:0] for ipv4.dstAddr[31:0]
 Packing options tried: 1
 Packing options skipped: 0
 
@@ -1603,9 +1616,9 @@
   16-bit: 80
   32-bit: 48
 Tagalong containers available:
-  8-bit: 22
-  16-bit: 33
-  32-bit: 21
+  8-bit: 26
+  16-bit: 39
+  32-bit: 25
 Initial packing options: 5196
 
 Packing option 0:  [8, 8, 16, 16, 16, 32, 32, 32]
@@ -1638,38 +1651,38 @@
 
 Looking at tcp.srcPort (egress) [15:8], with test_alloc = True
 ----> tcp.srcPort (egress) is allocated? False
-***Allocating phv298[7:0] for tcp.srcPort[15:8]
+***Allocating phv294[7:0] for tcp.srcPort[15:8]
 Looking at tcp.srcPort (egress) [7:0], with test_alloc = True
 ----> tcp.srcPort (egress) is allocated? False
-***Allocating phv299[7:0] for tcp.srcPort[7:0]
+***Allocating phv295[7:0] for tcp.srcPort[7:0]
 Looking at tcp.dstPort (egress) [15:0], with test_alloc = True
 ----> tcp.dstPort (egress) is allocated? False
-***Allocating phv335[15:0] for tcp.dstPort[15:0]
+***Allocating phv329[15:0] for tcp.dstPort[15:0]
 Looking at tcp.seqNo (egress) [31:16], with test_alloc = True
 ----> tcp.seqNo (egress) is allocated? False
-***Allocating phv336[15:0] for tcp.seqNo[31:16]
+***Allocating phv330[15:0] for tcp.seqNo[31:16]
 Looking at tcp.seqNo (egress) [15:0], with test_alloc = True
 ----> tcp.seqNo (egress) is allocated? False
-***Allocating phv337[15:0] for tcp.seqNo[15:0]
+***Allocating phv331[15:0] for tcp.seqNo[15:0]
 Looking at tcp.ackNo (egress) [31:0], with test_alloc = True
 ----> tcp.ackNo (egress) is allocated? False
-***Allocating phv267[31:0] for tcp.ackNo[31:0]
+***Allocating phv263[31:0] for tcp.ackNo[31:0]
 Looking at tcp.dataOffset (egress) [3:0], with test_alloc = True
 ----> tcp.dataOffset (egress) is allocated? False
 Looking at tcp.res (egress) [2:0], with test_alloc = True
 Looking at tcp.ecn (egress) [2:0], with test_alloc = True
 Looking at tcp.ctrl (egress) [5:0], with test_alloc = True
 Looking at tcp.window (egress) [15:0], with test_alloc = True
-***Allocating phv268[31:28] for tcp.dataOffset[3:0]
-***Allocating phv268[27:25] for tcp.res[2:0]
-***Allocating phv268[24:22] for tcp.ecn[2:0]
-***Allocating phv268[21:16] for tcp.ctrl[5:0]
-***Allocating phv268[15:0] for tcp.window[15:0]
+***Allocating phv264[31:28] for tcp.dataOffset[3:0]
+***Allocating phv264[27:25] for tcp.res[2:0]
+***Allocating phv264[24:22] for tcp.ecn[2:0]
+***Allocating phv264[21:16] for tcp.ctrl[5:0]
+***Allocating phv264[15:0] for tcp.window[15:0]
 Looking at tcp.checksum (egress) [15:0], with test_alloc = True
 ----> tcp.checksum (egress) is allocated? False
 Looking at tcp.urgentPtr (egress) [15:0], with test_alloc = True
-***Allocating phv269[31:16] for tcp.checksum[15:0]
-***Allocating phv269[15:0] for tcp.urgentPtr[15:0]
+***Allocating phv265[31:16] for tcp.checksum[15:0]
+***Allocating phv265[15:0] for tcp.urgentPtr[15:0]
 Packing options tried: 1
 Packing options skipped: 0
 
@@ -1702,20 +1715,20 @@
 min_extracts[32] = 1
 Packing options: 604
 MAU containers available:
-  8-bit: 47
-  16-bit: 76
-  32-bit: 45
+  8-bit: 46
+  16-bit: 75
+  32-bit: 44
 Tagalong containers available:
-  8-bit: 19
-  16-bit: 30
+  8-bit: 22
+  16-bit: 32
   32-bit: 21
 Initial packing options: 604
 
 Packing option 0:  [8, 32, 16, 8, 32, 16]
 MAU containers after:
-  8-bit: 45
-  16-bit: 74
-  32-bit: 43
+  8-bit: 44
+  16-bit: 73
+  32-bit: 42
 +-----------------------------+
 |  ethernet.dstAddr [47:40]   |
 +-----------------------------+
@@ -1735,48 +1748,21 @@
 ----> ethernet.dstAddr (ingress) is allocated? False
 
 MAU groups: 3
-  Group 4 8 bits -- avail 15 -- ingress avail 15 and remain 14 and promised 1 and req 1 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv65
-  Group 6 8 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv96
-  Group 7 8 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv112
-***Allocating phv65[7:0] for ethernet.dstAddr[47:40]
-Looking at ethernet.dstAddr (ingress) [39:8], with test_alloc = True
-----> ethernet.dstAddr (ingress) is allocated? False
-
-MAU groups: 3
-  Group 0 32 bits -- avail 13 -- ingress avail 13 and remain 12 and promised 1 and req 1 -- egress avail 12 and remain 12 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv3
-  Group 2 32 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 12 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv32
-  Group 3 32 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 12 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv48
-***Allocating phv3[31:0] for ethernet.dstAddr[39:8]
-Looking at ethernet.dstAddr (ingress) [7:0], with test_alloc = True
-----> ethernet.dstAddr (ingress) is allocated? False
-Looking at ethernet.srcAddr (ingress) [47:40], with test_alloc = True
-
-MAU groups: 5
-  Group 8 16 bits -- avail 13 -- ingress avail 13 and remain 11 and promised 2 and req 2 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv132
-  Group 10 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv160
-  Group 11 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv176
-  Group 12 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv192
-  Group 13 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv208
-***Allocating phv132[15:8] for ethernet.dstAddr[7:0]
-***Allocating phv132[7:0] for ethernet.srcAddr[47:40]
-Looking at ethernet.srcAddr (ingress) [39:32], with test_alloc = True
-----> ethernet.srcAddr (ingress) is allocated? False
-
-MAU groups: 3
   Group 4 8 bits -- avail 14 -- ingress avail 14 and remain 13 and promised 1 and req 1 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv66
   Group 6 8 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv96
   Group 7 8 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv112
-***Allocating phv66[7:0] for ethernet.srcAddr[39:32]
-Looking at ethernet.srcAddr (ingress) [31:0], with test_alloc = True
-----> ethernet.srcAddr (ingress) is allocated? False
+***Allocating phv66[7:0] for ethernet.dstAddr[47:40]
+Looking at ethernet.dstAddr (ingress) [39:8], with test_alloc = True
+----> ethernet.dstAddr (ingress) is allocated? False
 
 MAU groups: 3
   Group 0 32 bits -- avail 12 -- ingress avail 12 and remain 11 and promised 1 and req 1 -- egress avail 12 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv4
   Group 2 32 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 12 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv32
   Group 3 32 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 12 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv48
-***Allocating phv4[31:0] for ethernet.srcAddr[31:0]
-Looking at ethernet.etherType (ingress) [15:0], with test_alloc = True
-----> ethernet.etherType (ingress) is allocated? False
+***Allocating phv4[31:0] for ethernet.dstAddr[39:8]
+Looking at ethernet.dstAddr (ingress) [7:0], with test_alloc = True
+----> ethernet.dstAddr (ingress) is allocated? False
+Looking at ethernet.srcAddr (ingress) [47:40], with test_alloc = True
 
 MAU groups: 5
   Group 8 16 bits -- avail 12 -- ingress avail 12 and remain 10 and promised 2 and req 2 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv133
@@ -1784,7 +1770,34 @@
   Group 11 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv176
   Group 12 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv192
   Group 13 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv208
-***Allocating phv133[15:0] for ethernet.etherType[15:0]
+***Allocating phv133[15:8] for ethernet.dstAddr[7:0]
+***Allocating phv133[7:0] for ethernet.srcAddr[47:40]
+Looking at ethernet.srcAddr (ingress) [39:32], with test_alloc = True
+----> ethernet.srcAddr (ingress) is allocated? False
+
+MAU groups: 3
+  Group 4 8 bits -- avail 13 -- ingress avail 13 and remain 12 and promised 1 and req 1 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv67
+  Group 6 8 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv96
+  Group 7 8 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv112
+***Allocating phv67[7:0] for ethernet.srcAddr[39:32]
+Looking at ethernet.srcAddr (ingress) [31:0], with test_alloc = True
+----> ethernet.srcAddr (ingress) is allocated? False
+
+MAU groups: 3
+  Group 0 32 bits -- avail 11 -- ingress avail 11 and remain 10 and promised 1 and req 1 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv5
+  Group 2 32 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 12 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv32
+  Group 3 32 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 12 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv48
+***Allocating phv5[31:0] for ethernet.srcAddr[31:0]
+Looking at ethernet.etherType (ingress) [15:0], with test_alloc = True
+----> ethernet.etherType (ingress) is allocated? False
+
+MAU groups: 5
+  Group 8 16 bits -- avail 11 -- ingress avail 11 and remain 9 and promised 2 and req 2 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv134
+  Group 10 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv160
+  Group 11 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv176
+  Group 12 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv192
+  Group 13 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv208
+***Allocating phv134[15:0] for ethernet.etherType[15:0]
 Packing options tried: 1
 Packing options skipped: 0
 
@@ -1821,9 +1834,9 @@
   16-bit: 80
   32-bit: 48
 Tagalong containers available:
-  8-bit: 20
-  16-bit: 30
-  32-bit: 18
+  8-bit: 24
+  16-bit: 36
+  32-bit: 22
 Initial packing options: 604
 
 Packing option 0:  [8, 32, 16, 8, 32, 16]
@@ -1848,24 +1861,24 @@
 
 Looking at ethernet.dstAddr (egress) [47:40], with test_alloc = True
 ----> ethernet.dstAddr (egress) is allocated? False
-***Allocating phv300[7:0] for ethernet.dstAddr[47:40]
+***Allocating phv296[7:0] for ethernet.dstAddr[47:40]
 Looking at ethernet.dstAddr (egress) [39:8], with test_alloc = True
 ----> ethernet.dstAddr (egress) is allocated? False
-***Allocating phv270[31:0] for ethernet.dstAddr[39:8]
+***Allocating phv266[31:0] for ethernet.dstAddr[39:8]
 Looking at ethernet.dstAddr (egress) [7:0], with test_alloc = True
 ----> ethernet.dstAddr (egress) is allocated? False
 Looking at ethernet.srcAddr (egress) [47:40], with test_alloc = True
-***Allocating phv338[15:8] for ethernet.dstAddr[7:0]
-***Allocating phv338[7:0] for ethernet.srcAddr[47:40]
+***Allocating phv332[15:8] for ethernet.dstAddr[7:0]
+***Allocating phv332[7:0] for ethernet.srcAddr[47:40]
 Looking at ethernet.srcAddr (egress) [39:32], with test_alloc = True
 ----> ethernet.srcAddr (egress) is allocated? False
-***Allocating phv301[7:0] for ethernet.srcAddr[39:32]
+***Allocating phv297[7:0] for ethernet.srcAddr[39:32]
 Looking at ethernet.srcAddr (egress) [31:0], with test_alloc = True
 ----> ethernet.srcAddr (egress) is allocated? False
-***Allocating phv271[31:0] for ethernet.srcAddr[31:0]
+***Allocating phv267[31:0] for ethernet.srcAddr[31:0]
 Looking at ethernet.etherType (egress) [15:0], with test_alloc = True
 ----> ethernet.etherType (egress) is allocated? False
-***Allocating phv339[15:0] for ethernet.etherType[15:0]
+***Allocating phv333[15:0] for ethernet.etherType[15:0]
 Packing options tried: 1
 Packing options skipped: 0
 
@@ -1904,9 +1917,9 @@
   16-bit: 80
   32-bit: 48
 Tagalong containers available:
-  8-bit: 18
-  16-bit: 28
-  32-bit: 16
+  8-bit: 22
+  16-bit: 34
+  32-bit: 20
 Initial packing options: 3
 
 Packing option 1:  [16, 8]
@@ -1993,9 +2006,9 @@
   16-bit: 79
   32-bit: 48
 Tagalong containers available:
-  8-bit: 18
-  16-bit: 28
-  32-bit: 16
+  8-bit: 22
+  16-bit: 34
+  32-bit: 20
 Initial packing options: 2
 
 Packing option 0:  [16]
@@ -2011,8 +2024,8 @@
 Looking at packet_out_hdr.egress_port (egress) [8:0], with test_alloc = True
 ----> packet_out_hdr.egress_port (egress) is allocated? False
 Looking at packet_out_hdr._padding (egress) [6:0], with test_alloc = True
-***Allocating phv340[15:7] for packet_out_hdr.egress_port[8:0]
-***Allocating phv340[6:0] for packet_out_hdr._padding[6:0]
+***Allocating phv334[15:7] for packet_out_hdr.egress_port[8:0]
+***Allocating phv334[6:0] for packet_out_hdr._padding[6:0]
 Packing options tried: 1
 Packing options skipped: 0
 
@@ -2030,46 +2043,46 @@
 |       PHV Group        | Containers Used |  Bits Used   | Bits Available |
 | (container bit widths) |     (% used)    |   (% used)   |                |
 -----------------------------------------------------------------------------
-|         0 (32)         |    5 (31.25%)   | 160 (31.25%) |      512       |
+|         0 (32)         |    6 (37.50%)   | 192 (37.50%) |      512       |
 |         1 (32)         |    0 (0.00%)    |  0 (0.00%)   |      512       |
 |         2 (32)         |    0 (0.00%)    |  0 (0.00%)   |      512       |
 |         3 (32)         |    0 (0.00%)    |  0 (0.00%)   |      512       |
-|    Total for 32 bit    |    5 (7.81%)    | 160 (7.81%)  |      2048      |
+|    Total for 32 bit    |    6 (9.38%)    | 192 (9.38%)  |      2048      |
 |                        |                 |              |                |
-|         4 (8)          |    3 (18.75%)   | 24 (18.75%)  |      128       |
+|         4 (8)          |    4 (25.00%)   | 32 (25.00%)  |      128       |
 |         5 (8)          |    1 (6.25%)    |  8 (6.25%)   |      128       |
 |         6 (8)          |    0 (0.00%)    |  0 (0.00%)   |      128       |
 |         7 (8)          |    0 (0.00%)    |  0 (0.00%)   |      128       |
-|    Total for 8 bit     |    4 (6.25%)    |  32 (6.25%)  |      512       |
+|    Total for 8 bit     |    5 (7.81%)    |  40 (7.81%)  |      512       |
 |                        |                 |              |                |
-|         8 (16)         |    5 (31.25%)   | 80 (31.25%)  |      256       |
+|         8 (16)         |    6 (37.50%)   | 96 (37.50%)  |      256       |
 |         9 (16)         |    1 (6.25%)    |  16 (6.25%)  |      256       |
 |        10 (16)         |    0 (0.00%)    |  0 (0.00%)   |      256       |
 |        11 (16)         |    0 (0.00%)    |  0 (0.00%)   |      256       |
 |        12 (16)         |    0 (0.00%)    |  0 (0.00%)   |      256       |
 |        13 (16)         |    0 (0.00%)    |  0 (0.00%)   |      256       |
-|    Total for 16 bit    |    6 (6.25%)    |  96 (6.25%)  |      1536      |
+|    Total for 16 bit    |    7 (7.29%)    | 112 (7.29%)  |      1536      |
 |                        |                 |              |                |
 |       14 (32) T        |   11 (68.75%)   | 352 (68.75%) |      512       |
 |       15 (32) T        |    0 (0.00%)    |  0 (0.00%)   |      512       |
 |    Total for 32 bit    |   11 (34.38%)   | 352 (34.38%) |      1024      |
 |                        |                 |              |                |
-|        16 (8) T        |   11 (68.75%)   | 88 (68.75%)  |      128       |
+|        16 (8) T        |    8 (50.00%)   | 64 (50.00%)  |      128       |
 |        17 (8) T        |    0 (0.00%)    |  0 (0.00%)   |      128       |
-|    Total for 8 bit     |   11 (34.38%)   | 88 (34.38%)  |      256       |
+|    Total for 8 bit     |    8 (25.00%)   | 64 (25.00%)  |      256       |
 |                        |                 |              |                |
-|       18 (16) T        |   10 (62.50%)   | 160 (62.50%) |      256       |
-|       19 (16) T        |    5 (31.25%)   | 80 (31.25%)  |      256       |
+|       18 (16) T        |   13 (81.25%)   | 208 (81.25%) |      256       |
+|       19 (16) T        |    0 (0.00%)    |  0 (0.00%)   |      256       |
 |       20 (16) T        |    0 (0.00%)    |  0 (0.00%)   |      256       |
-|    Total for 16 bit    |   15 (31.25%)   | 240 (31.25%) |      768       |
+|    Total for 16 bit    |   13 (27.08%)   | 208 (27.08%) |      768       |
 |                        |                 |              |                |
-|       MAU total        |    15 (6.70%)   | 288 (7.03%)  |      4096      |
-|     Tagalong total     |   37 (33.04%)   | 680 (33.20%) |      2048      |
-|     Overall total      |   52 (15.48%)   | 968 (15.76%) |      6144      |
+|       MAU total        |    18 (8.04%)   | 344 (8.40%)  |      4096      |
+|     Tagalong total     |   32 (28.57%)   | 624 (30.47%) |      2048      |
+|     Overall total      |   50 (14.88%)   | 968 (15.76%) |      6144      |
 -----------------------------------------------------------------------------
 
->>Event 'pa_overlay' at time 1505215013.40
-   Took 9.09 seconds
+>>Event 'pa_overlay' at time 1505264438.27
+   Took 9.12 seconds
 
 -----------------------------------------------
   Allocating remaining parsed fields
@@ -2107,9 +2120,9 @@
 -------------------------------------------------------------------------------------------------------
 
 MAU containers available:
-  8-bit: 45
-  16-bit: 74
-  32-bit: 43
+  8-bit: 44
+  16-bit: 73
+  32-bit: 42
 Packing options: 2
 Initial packing options: 2
 
@@ -2140,381 +2153,29 @@
 -----------------------------------------------------------------------------------
 |     Name     | BW | Tagalong? | Req | Pref | Not Allow | MaxSplit | Group Size |
 -----------------------------------------------------------------------------------
-| udp.srcPort  | 16 |   False   |  -  |  -   |     -     |    2     |     1      |
-| udp.dstPort  | 16 |   False   |  -  |  -   |     -     |    2     |     1      |
+| udp.srcPort  | 16 |    True   |  -  |  -   |     -     |    2     |     1      |
+| udp.dstPort  | 16 |    True   |  -  |  -   |     -     |    2     |     1      |
 | udp.length_  | 16 |    True   |  -  |  -   |     -     |    2     |     1      |
 | udp.checksum | 16 |    True   |  -  |  -   |     -     |    2     |     1      |
 -----------------------------------------------------------------------------------
 
 MAU containers available:
-  8-bit: 45
-  16-bit: 74
-  32-bit: 43
+  8-bit: 44
+  16-bit: 73
+  32-bit: 42
 Packing options: 47
 Initial packing options: 47
 
 Packing option 0:  [8, 8, 16, 32]
-
-MAU groups: 3
-  Group 4 8 bits -- avail 13 -- ingress avail 13 and remain 12 and promised 1 and req 1 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv67
-  Group 6 8 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv96
-  Group 7 8 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv112
-
-MAU groups: 3
-  Group 4 8 bits -- avail 12 -- ingress avail 12 and remain 11 and promised 1 and req 1 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv68
-  Group 6 8 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv96
-  Group 7 8 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv112
-
-MAU groups: 5
-  Group 8 16 bits -- avail 11 -- ingress avail 11 and remain 9 and promised 2 and req 2 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv134
-  Group 10 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv160
-  Group 11 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv176
-  Group 12 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv192
-  Group 13 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv208
->>Can pack using [8, 8, 16, 32] if open up 3 new containers.
-
-Packing option 1:  [8, 8, 32, 16]
-
-MAU groups: 3
-  Group 4 8 bits -- avail 13 -- ingress avail 13 and remain 12 and promised 1 and req 1 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv67
-  Group 6 8 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv96
-  Group 7 8 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv112
-
-MAU groups: 3
-  Group 4 8 bits -- avail 12 -- ingress avail 12 and remain 11 and promised 1 and req 1 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv68
-  Group 6 8 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv96
-  Group 7 8 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv112
-
-MAU groups: 3
-  Group 0 32 bits -- avail 11 -- ingress avail 11 and remain 10 and promised 1 and req 1 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv5
-  Group 2 32 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 12 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv32
-  Group 3 32 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 12 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv48
->>Can pack using [8, 8, 32, 16] if open up 3 new containers.
-
-Packing option 2:  [8, 16, 8, 32]
-
-MAU groups: 3
-  Group 4 8 bits -- avail 13 -- ingress avail 13 and remain 12 and promised 1 and req 1 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv67
-  Group 6 8 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv96
-  Group 7 8 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv112
-
-MAU groups: 5
-  Group 8 16 bits -- avail 11 -- ingress avail 11 and remain 9 and promised 2 and req 2 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv134
-  Group 10 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv160
-  Group 11 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv176
-  Group 12 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv192
-  Group 13 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv208
-
-MAU groups: 3
-  Group 4 8 bits -- avail 12 -- ingress avail 12 and remain 11 and promised 1 and req 1 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv68
-  Group 6 8 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv96
-  Group 7 8 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv112
->>Can pack using [8, 16, 8, 32] if open up 3 new containers.
-
-Packing option 3:  [8, 16, 32, 8]
-
-MAU groups: 3
-  Group 4 8 bits -- avail 13 -- ingress avail 13 and remain 12 and promised 1 and req 1 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv67
-  Group 6 8 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv96
-  Group 7 8 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv112
-
-MAU groups: 5
-  Group 8 16 bits -- avail 11 -- ingress avail 11 and remain 9 and promised 2 and req 2 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv134
-  Group 10 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv160
-  Group 11 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv176
-  Group 12 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv192
-  Group 13 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv208
-
-MAU groups: 3
-  Group 0 32 bits -- avail 11 -- ingress avail 11 and remain 10 and promised 1 and req 1 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv5
-  Group 2 32 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 12 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv32
-  Group 3 32 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 12 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv48
->>Can pack using [8, 16, 32, 8] if open up 3 new containers.
-
-Packing option 4:  [8, 32, 8, 16]
-
-MAU groups: 3
-  Group 4 8 bits -- avail 13 -- ingress avail 13 and remain 12 and promised 1 and req 1 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv67
-  Group 6 8 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv96
-  Group 7 8 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv112
-
-MAU groups: 3
-  Group 0 32 bits -- avail 11 -- ingress avail 11 and remain 10 and promised 1 and req 1 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv5
-  Group 2 32 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 12 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv32
-  Group 3 32 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 12 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv48
->>Can pack using [8, 32, 8, 16] if open up 2 new containers.
-
-Packing option 5:  [8, 32, 16, 8]
-
-MAU groups: 3
-  Group 4 8 bits -- avail 13 -- ingress avail 13 and remain 12 and promised 1 and req 1 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv67
-  Group 6 8 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv96
-  Group 7 8 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv112
-
-MAU groups: 3
-  Group 0 32 bits -- avail 11 -- ingress avail 11 and remain 10 and promised 1 and req 1 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv5
-  Group 2 32 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 12 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv32
-  Group 3 32 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 12 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv48
->>Can pack using [8, 32, 16, 8] if open up 2 new containers.
-
-Packing option 6:  [16, 8, 8, 32]
-
-MAU groups: 5
-  Group 8 16 bits -- avail 11 -- ingress avail 11 and remain 9 and promised 2 and req 2 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv134
-  Group 10 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv160
-  Group 11 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv176
-  Group 12 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv192
-  Group 13 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv208
-
-MAU groups: 3
-  Group 4 8 bits -- avail 13 -- ingress avail 13 and remain 12 and promised 1 and req 1 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv67
-  Group 6 8 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv96
-  Group 7 8 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv112
-
-MAU groups: 3
-  Group 4 8 bits -- avail 12 -- ingress avail 12 and remain 11 and promised 1 and req 1 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv68
-  Group 6 8 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv96
-  Group 7 8 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv112
->>Can pack using [16, 8, 8, 32] if open up 3 new containers.
-
-Packing option 7:  [16, 8, 32, 8]
-
-MAU groups: 5
-  Group 8 16 bits -- avail 11 -- ingress avail 11 and remain 9 and promised 2 and req 2 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv134
-  Group 10 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv160
-  Group 11 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv176
-  Group 12 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv192
-  Group 13 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv208
-
-MAU groups: 3
-  Group 4 8 bits -- avail 13 -- ingress avail 13 and remain 12 and promised 1 and req 1 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv67
-  Group 6 8 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv96
-  Group 7 8 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv112
-
-MAU groups: 3
-  Group 0 32 bits -- avail 11 -- ingress avail 11 and remain 10 and promised 1 and req 1 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv5
-  Group 2 32 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 12 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv32
-  Group 3 32 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 12 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv48
->>Can pack using [16, 8, 32, 8] if open up 3 new containers.
-
-Packing option 8:  [16, 32, 8, 8]
-
-MAU groups: 5
-  Group 8 16 bits -- avail 11 -- ingress avail 11 and remain 9 and promised 2 and req 2 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv134
-  Group 10 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv160
-  Group 11 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv176
-  Group 12 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv192
-  Group 13 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv208
-
-MAU groups: 3
-  Group 0 32 bits -- avail 11 -- ingress avail 11 and remain 10 and promised 1 and req 1 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv5
-  Group 2 32 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 12 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv32
-  Group 3 32 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 12 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv48
->>Can pack using [16, 32, 8, 8] if open up 2 new containers.
-
-Packing option 9:  [32, 8, 8, 16]
-
-MAU groups: 3
-  Group 0 32 bits -- avail 11 -- ingress avail 11 and remain 10 and promised 1 and req 1 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv5
-  Group 2 32 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 12 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv32
-  Group 3 32 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 12 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv48
->>Can pack using [32, 8, 8, 16] if open up 1 new containers.
-
-Packing option 10:  [32, 8, 16, 8]
-
-MAU groups: 3
-  Group 0 32 bits -- avail 11 -- ingress avail 11 and remain 10 and promised 1 and req 1 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv5
-  Group 2 32 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 12 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv32
-  Group 3 32 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 12 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv48
->>Can pack using [32, 8, 16, 8] if open up 1 new containers.
-
-Packing option 11:  [32, 16, 8, 8]
-
-MAU groups: 3
-  Group 0 32 bits -- avail 11 -- ingress avail 11 and remain 10 and promised 1 and req 1 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv5
-  Group 2 32 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 12 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv32
-  Group 3 32 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 12 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv48
->>Can pack using [32, 16, 8, 8] if open up 1 new containers.
-
-Packing option 12:  [16, 16, 32]
-
-MAU groups: 5
-  Group 8 16 bits -- avail 11 -- ingress avail 11 and remain 9 and promised 2 and req 2 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv134
-  Group 10 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv160
-  Group 11 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv176
-  Group 12 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv192
-  Group 13 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv208
-
-MAU groups: 5
-  Group 8 16 bits -- avail 10 -- ingress avail 10 and remain 8 and promised 2 and req 2 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv135
-  Group 10 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv160
-  Group 11 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv176
-  Group 12 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv192
-  Group 13 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv208
->>Can pack using [16, 16, 32] if open up 2 new containers.
-
-Packing option 13:  [16, 32, 16]
-
-MAU groups: 5
-  Group 8 16 bits -- avail 11 -- ingress avail 11 and remain 9 and promised 2 and req 2 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv134
-  Group 10 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv160
-  Group 11 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv176
-  Group 12 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv192
-  Group 13 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv208
-
-MAU groups: 3
-  Group 0 32 bits -- avail 11 -- ingress avail 11 and remain 10 and promised 1 and req 1 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv5
-  Group 2 32 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 12 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv32
-  Group 3 32 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 12 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv48
->>Can pack using [16, 32, 16] if open up 2 new containers.
-
-Packing option 14:  [32, 16, 16]
-
-MAU groups: 3
-  Group 0 32 bits -- avail 11 -- ingress avail 11 and remain 10 and promised 1 and req 1 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv5
-  Group 2 32 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 12 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv32
-  Group 3 32 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 12 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv48
->>Can pack using [32, 16, 16] if open up 1 new containers.
-
-Packing option 15:  [8, 8, 16, 16, 16]
-
-MAU groups: 3
-  Group 4 8 bits -- avail 13 -- ingress avail 13 and remain 12 and promised 1 and req 1 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv67
-  Group 6 8 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv96
-  Group 7 8 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv112
-
-MAU groups: 3
-  Group 4 8 bits -- avail 12 -- ingress avail 12 and remain 11 and promised 1 and req 1 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv68
-  Group 6 8 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv96
-  Group 7 8 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv112
-
-MAU groups: 5
-  Group 8 16 bits -- avail 11 -- ingress avail 11 and remain 9 and promised 2 and req 2 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv134
-  Group 10 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv160
-  Group 11 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv176
-  Group 12 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv192
-  Group 13 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv208
->>Can pack using [8, 8, 16, 16, 16] if open up 3 new containers.
-
-Packing option 16:  [8, 16, 8, 16, 16]
-
-MAU groups: 3
-  Group 4 8 bits -- avail 13 -- ingress avail 13 and remain 12 and promised 1 and req 1 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv67
-  Group 6 8 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv96
-  Group 7 8 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv112
-
-MAU groups: 5
-  Group 8 16 bits -- avail 11 -- ingress avail 11 and remain 9 and promised 2 and req 2 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv134
-  Group 10 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv160
-  Group 11 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv176
-  Group 12 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv192
-  Group 13 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv208
-
-MAU groups: 3
-  Group 4 8 bits -- avail 12 -- ingress avail 12 and remain 11 and promised 1 and req 1 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv68
-  Group 6 8 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv96
-  Group 7 8 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv112
->>Can pack using [8, 16, 8, 16, 16] if open up 3 new containers.
-
-Packing option 17:  [8, 16, 16, 8, 16]
-
-MAU groups: 3
-  Group 4 8 bits -- avail 13 -- ingress avail 13 and remain 12 and promised 1 and req 1 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv67
-  Group 6 8 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv96
-  Group 7 8 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv112
-
-MAU groups: 5
-  Group 8 16 bits -- avail 11 -- ingress avail 11 and remain 9 and promised 2 and req 2 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv134
-  Group 10 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv160
-  Group 11 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv176
-  Group 12 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv192
-  Group 13 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv208
-
-MAU groups: 5
-  Group 8 16 bits -- avail 10 -- ingress avail 10 and remain 8 and promised 2 and req 2 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv135
-  Group 10 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv160
-  Group 11 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv176
-  Group 12 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv192
-  Group 13 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv208
->>Can pack using [8, 16, 16, 8, 16] if open up 3 new containers.
-
-Packing option 18:  [8, 16, 16, 16, 8]
-
-MAU groups: 3
-  Group 4 8 bits -- avail 13 -- ingress avail 13 and remain 12 and promised 1 and req 1 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv67
-  Group 6 8 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv96
-  Group 7 8 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv112
-
-MAU groups: 5
-  Group 8 16 bits -- avail 11 -- ingress avail 11 and remain 9 and promised 2 and req 2 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv134
-  Group 10 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv160
-  Group 11 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv176
-  Group 12 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv192
-  Group 13 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv208
-
-MAU groups: 5
-  Group 8 16 bits -- avail 10 -- ingress avail 10 and remain 8 and promised 2 and req 2 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv135
-  Group 10 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv160
-  Group 11 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv176
-  Group 12 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv192
-  Group 13 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv208
->>Can pack using [8, 16, 16, 16, 8] if open up 3 new containers.
-
-Packing option 19:  [16, 8, 8, 16, 16]
-
-MAU groups: 5
-  Group 8 16 bits -- avail 11 -- ingress avail 11 and remain 9 and promised 2 and req 2 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv134
-  Group 10 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv160
-  Group 11 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv176
-  Group 12 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv192
-  Group 13 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv208
-
-MAU groups: 3
-  Group 4 8 bits -- avail 13 -- ingress avail 13 and remain 12 and promised 1 and req 1 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv67
-  Group 6 8 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv96
-  Group 7 8 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv112
-
-MAU groups: 3
-  Group 4 8 bits -- avail 12 -- ingress avail 12 and remain 11 and promised 1 and req 1 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv68
-  Group 6 8 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv96
-  Group 7 8 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv112
->>Can pack using [16, 8, 8, 16, 16] if open up 3 new containers.
-
-Packing option 20:  [16, 8, 16, 8, 16]
-
-MAU groups: 5
-  Group 8 16 bits -- avail 11 -- ingress avail 11 and remain 9 and promised 2 and req 2 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv134
-  Group 10 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv160
-  Group 11 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv176
-  Group 12 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv192
-  Group 13 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv208
-
-MAU groups: 3
-  Group 4 8 bits -- avail 13 -- ingress avail 13 and remain 12 and promised 1 and req 1 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv67
-  Group 6 8 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv96
-  Group 7 8 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv112
-
-MAU groups: 5
-  Group 8 16 bits -- avail 10 -- ingress avail 10 and remain 8 and promised 2 and req 2 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv135
-  Group 10 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv160
-  Group 11 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv176
-  Group 12 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv192
-  Group 13 16 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv208
->>Can pack using [16, 8, 16, 8, 16] if open up 3 new containers.
-Terminate search for time purposes...
-Packing options tried: 21
+>>Can pack using [8, 8, 16, 32] if open up 0 new containers.
+Packing options tried: 1
 Packing options skipped: 0
-Trying to place using best packing [32, 8, 8, 16]
-
-MAU groups: 3
-  Group 0 32 bits -- avail 11 -- ingress avail 11 and remain 10 and promised 1 and req 1 -- egress avail 8 and remain 8 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv5
-  Group 2 32 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 12 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv32
-  Group 3 32 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 12 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv48
-***Allocating phv5[31:16] for udp.srcPort[15:0]
-***Allocating phv5[15:0] for udp.dstPort[15:0]
-***Allocating phv289[7:0] for udp.length_[15:8]
-***Allocating phv290[7:0] for udp.length_[7:0]
-***Allocating phv322[15:0] for udp.checksum[15:0]
+Trying to place using best packing [8, 8, 16, 32]
+***Allocating phv289[7:0] for udp.srcPort[15:8]
+***Allocating phv65[7:0] for udp.srcPort[7:0]
+***Allocating phv322[15:0] for udp.dstPort[15:0]
+***Allocating phv257[31:16] for udp.length_[15:0]
+***Allocating phv257[15:0] for udp.checksum[15:0]
 Working on parse node parse_udp (8) (egress)
 
 -------------------------------------------
@@ -2553,11 +2214,11 @@
 Packing options tried: 1
 Packing options skipped: 0
 Trying to place using best packing [8, 8, 16, 32]
-***Allocating phv298[7:0] for udp.srcPort[15:8]
-***Allocating phv299[7:0] for udp.srcPort[7:0]
-***Allocating phv336[15:0] for udp.dstPort[15:0]
-***Allocating phv267[31:16] for udp.length_[15:0]
-***Allocating phv267[15:0] for udp.checksum[15:0]
+***Allocating phv294[7:0] for udp.srcPort[15:8]
+***Allocating phv295[7:0] for udp.srcPort[7:0]
+***Allocating phv329[15:0] for udp.dstPort[15:0]
+***Allocating phv263[31:16] for udp.length_[15:0]
+***Allocating phv263[15:0] for udp.checksum[15:0]
 Working on parse node parse_pkt_in (2) (egress)
 
 -------------------------------------------
@@ -2592,101 +2253,101 @@
 Packing options tried: 1
 Packing options skipped: 0
 Trying to place using best packing [16]
-***Allocating phv340[15:7] for packet_in_hdr.ingress_port[8:0]
-***Allocating phv340[6:0] for packet_in_hdr._padding[6:0]
+***Allocating phv334[15:7] for packet_in_hdr.ingress_port[8:0]
+***Allocating phv334[6:0] for packet_in_hdr._padding[6:0]
 
 After allocating remaining parse nodes:
 Allocation state: Final Allocation
-------------------------------------------------------------------------------
-|       PHV Group        | Containers Used |   Bits Used   | Bits Available |
-| (container bit widths) |     (% used)    |    (% used)   |                |
-------------------------------------------------------------------------------
-|         0 (32)         |    6 (37.50%)   |  192 (37.50%) |      512       |
-|         1 (32)         |    0 (0.00%)    |   0 (0.00%)   |      512       |
-|         2 (32)         |    0 (0.00%)    |   0 (0.00%)   |      512       |
-|         3 (32)         |    0 (0.00%)    |   0 (0.00%)   |      512       |
-|    Total for 32 bit    |    6 (9.38%)    |  192 (9.38%)  |      2048      |
-|                        |                 |               |                |
-|         4 (8)          |    3 (18.75%)   |  24 (18.75%)  |      128       |
-|         5 (8)          |    1 (6.25%)    |   8 (6.25%)   |      128       |
-|         6 (8)          |    0 (0.00%)    |   0 (0.00%)   |      128       |
-|         7 (8)          |    0 (0.00%)    |   0 (0.00%)   |      128       |
-|    Total for 8 bit     |    4 (6.25%)    |   32 (6.25%)  |      512       |
-|                        |                 |               |                |
-|         8 (16)         |    5 (31.25%)   |  80 (31.25%)  |      256       |
-|         9 (16)         |    1 (6.25%)    |   16 (6.25%)  |      256       |
-|        10 (16)         |    0 (0.00%)    |   0 (0.00%)   |      256       |
-|        11 (16)         |    0 (0.00%)    |   0 (0.00%)   |      256       |
-|        12 (16)         |    0 (0.00%)    |   0 (0.00%)   |      256       |
-|        13 (16)         |    0 (0.00%)    |   0 (0.00%)   |      256       |
-|    Total for 16 bit    |    6 (6.25%)    |   96 (6.25%)  |      1536      |
-|                        |                 |               |                |
-|       14 (32) T        |   11 (68.75%)   |  352 (68.75%) |      512       |
-|       15 (32) T        |    0 (0.00%)    |   0 (0.00%)   |      512       |
-|    Total for 32 bit    |   11 (34.38%)   |  352 (34.38%) |      1024      |
-|                        |                 |               |                |
-|        16 (8) T        |   11 (68.75%)   |  88 (68.75%)  |      128       |
-|        17 (8) T        |    0 (0.00%)    |   0 (0.00%)   |      128       |
-|    Total for 8 bit     |   11 (34.38%)   |  88 (34.38%)  |      256       |
-|                        |                 |               |                |
-|       18 (16) T        |   10 (62.50%)   |  160 (62.50%) |      256       |
-|       19 (16) T        |    5 (31.25%)   |  80 (31.25%)  |      256       |
-|       20 (16) T        |    0 (0.00%)    |   0 (0.00%)   |      256       |
-|    Total for 16 bit    |   15 (31.25%)   |  240 (31.25%) |      768       |
-|                        |                 |               |                |
-|       MAU total        |    16 (7.14%)   |  320 (7.81%)  |      4096      |
-|     Tagalong total     |   37 (33.04%)   |  680 (33.20%) |      2048      |
-|     Overall total      |   53 (15.77%)   | 1000 (16.28%) |      6144      |
-------------------------------------------------------------------------------
+-----------------------------------------------------------------------------
+|       PHV Group        | Containers Used |  Bits Used   | Bits Available |
+| (container bit widths) |     (% used)    |   (% used)   |                |
+-----------------------------------------------------------------------------
+|         0 (32)         |    6 (37.50%)   | 192 (37.50%) |      512       |
+|         1 (32)         |    0 (0.00%)    |  0 (0.00%)   |      512       |
+|         2 (32)         |    0 (0.00%)    |  0 (0.00%)   |      512       |
+|         3 (32)         |    0 (0.00%)    |  0 (0.00%)   |      512       |
+|    Total for 32 bit    |    6 (9.38%)    | 192 (9.38%)  |      2048      |
+|                        |                 |              |                |
+|         4 (8)          |    4 (25.00%)   | 32 (25.00%)  |      128       |
+|         5 (8)          |    1 (6.25%)    |  8 (6.25%)   |      128       |
+|         6 (8)          |    0 (0.00%)    |  0 (0.00%)   |      128       |
+|         7 (8)          |    0 (0.00%)    |  0 (0.00%)   |      128       |
+|    Total for 8 bit     |    5 (7.81%)    |  40 (7.81%)  |      512       |
+|                        |                 |              |                |
+|         8 (16)         |    6 (37.50%)   | 96 (37.50%)  |      256       |
+|         9 (16)         |    1 (6.25%)    |  16 (6.25%)  |      256       |
+|        10 (16)         |    0 (0.00%)    |  0 (0.00%)   |      256       |
+|        11 (16)         |    0 (0.00%)    |  0 (0.00%)   |      256       |
+|        12 (16)         |    0 (0.00%)    |  0 (0.00%)   |      256       |
+|        13 (16)         |    0 (0.00%)    |  0 (0.00%)   |      256       |
+|    Total for 16 bit    |    7 (7.29%)    | 112 (7.29%)  |      1536      |
+|                        |                 |              |                |
+|       14 (32) T        |   11 (68.75%)   | 352 (68.75%) |      512       |
+|       15 (32) T        |    0 (0.00%)    |  0 (0.00%)   |      512       |
+|    Total for 32 bit    |   11 (34.38%)   | 352 (34.38%) |      1024      |
+|                        |                 |              |                |
+|        16 (8) T        |    8 (50.00%)   | 64 (50.00%)  |      128       |
+|        17 (8) T        |    0 (0.00%)    |  0 (0.00%)   |      128       |
+|    Total for 8 bit     |    8 (25.00%)   | 64 (25.00%)  |      256       |
+|                        |                 |              |                |
+|       18 (16) T        |   13 (81.25%)   | 208 (81.25%) |      256       |
+|       19 (16) T        |    0 (0.00%)    |  0 (0.00%)   |      256       |
+|       20 (16) T        |    0 (0.00%)    |  0 (0.00%)   |      256       |
+|    Total for 16 bit    |   13 (27.08%)   | 208 (27.08%) |      768       |
+|                        |                 |              |                |
+|       MAU total        |    18 (8.04%)   | 344 (8.40%)  |      4096      |
+|     Tagalong total     |   32 (28.57%)   | 624 (30.47%) |      2048      |
+|     Overall total      |   50 (14.88%)   | 968 (15.76%) |      6144      |
+-----------------------------------------------------------------------------
 
 
 
 Difference in allocation between critical parse path and overlaying headers:
 Allocation state: Diff
----------------------------------------------------------------------------
-|       PHV Group        | Containers Used | Bits Used  | Bits Available |
-| (container bit widths) |     (% used)    |  (% used)  |                |
----------------------------------------------------------------------------
-|         0 (32)         |    1 (6.25%)    | 32 (6.25%) |      512       |
-|         1 (32)         |    0 (0.00%)    | 0 (0.00%)  |      512       |
-|         2 (32)         |    0 (0.00%)    | 0 (0.00%)  |      512       |
-|         3 (32)         |    0 (0.00%)    | 0 (0.00%)  |      512       |
-|    Total for 32 bit    |    1 (1.56%)    | 32 (1.56%) |      2048      |
-|                        |                 |            |                |
-|         4 (8)          |    0 (0.00%)    | 0 (0.00%)  |      128       |
-|         5 (8)          |    0 (0.00%)    | 0 (0.00%)  |      128       |
-|         6 (8)          |    0 (0.00%)    | 0 (0.00%)  |      128       |
-|         7 (8)          |    0 (0.00%)    | 0 (0.00%)  |      128       |
-|    Total for 8 bit     |    0 (0.00%)    | 0 (0.00%)  |      512       |
-|                        |                 |            |                |
-|         8 (16)         |    0 (0.00%)    | 0 (0.00%)  |      256       |
-|         9 (16)         |    0 (0.00%)    | 0 (0.00%)  |      256       |
-|        10 (16)         |    0 (0.00%)    | 0 (0.00%)  |      256       |
-|        11 (16)         |    0 (0.00%)    | 0 (0.00%)  |      256       |
-|        12 (16)         |    0 (0.00%)    | 0 (0.00%)  |      256       |
-|        13 (16)         |    0 (0.00%)    | 0 (0.00%)  |      256       |
-|    Total for 16 bit    |    0 (0.00%)    | 0 (0.00%)  |      1536      |
-|                        |                 |            |                |
-|       14 (32) T        |    0 (0.00%)    | 0 (0.00%)  |      512       |
-|       15 (32) T        |    0 (0.00%)    | 0 (0.00%)  |      512       |
-|    Total for 32 bit    |    0 (0.00%)    | 0 (0.00%)  |      1024      |
-|                        |                 |            |                |
-|        16 (8) T        |    0 (0.00%)    | 0 (0.00%)  |      128       |
-|        17 (8) T        |    0 (0.00%)    | 0 (0.00%)  |      128       |
-|    Total for 8 bit     |    0 (0.00%)    | 0 (0.00%)  |      256       |
-|                        |                 |            |                |
-|       18 (16) T        |    0 (0.00%)    | 0 (0.00%)  |      256       |
-|       19 (16) T        |    0 (0.00%)    | 0 (0.00%)  |      256       |
-|       20 (16) T        |    0 (0.00%)    | 0 (0.00%)  |      256       |
-|    Total for 16 bit    |    0 (0.00%)    | 0 (0.00%)  |      768       |
-|                        |                 |            |                |
-|       MAU total        |    1 (0.45%)    | 32 (0.78%) |      4096      |
-|     Tagalong total     |    0 (0.00%)    | 0 (0.00%)  |      2048      |
-|     Overall total      |    1 (0.30%)    | 32 (0.52%) |      6144      |
----------------------------------------------------------------------------
+--------------------------------------------------------------------------
+|       PHV Group        | Containers Used | Bits Used | Bits Available |
+| (container bit widths) |     (% used)    |  (% used) |                |
+--------------------------------------------------------------------------
+|         0 (32)         |    0 (0.00%)    | 0 (0.00%) |      512       |
+|         1 (32)         |    0 (0.00%)    | 0 (0.00%) |      512       |
+|         2 (32)         |    0 (0.00%)    | 0 (0.00%) |      512       |
+|         3 (32)         |    0 (0.00%)    | 0 (0.00%) |      512       |
+|    Total for 32 bit    |    0 (0.00%)    | 0 (0.00%) |      2048      |
+|                        |                 |           |                |
+|         4 (8)          |    0 (0.00%)    | 0 (0.00%) |      128       |
+|         5 (8)          |    0 (0.00%)    | 0 (0.00%) |      128       |
+|         6 (8)          |    0 (0.00%)    | 0 (0.00%) |      128       |
+|         7 (8)          |    0 (0.00%)    | 0 (0.00%) |      128       |
+|    Total for 8 bit     |    0 (0.00%)    | 0 (0.00%) |      512       |
+|                        |                 |           |                |
+|         8 (16)         |    0 (0.00%)    | 0 (0.00%) |      256       |
+|         9 (16)         |    0 (0.00%)    | 0 (0.00%) |      256       |
+|        10 (16)         |    0 (0.00%)    | 0 (0.00%) |      256       |
+|        11 (16)         |    0 (0.00%)    | 0 (0.00%) |      256       |
+|        12 (16)         |    0 (0.00%)    | 0 (0.00%) |      256       |
+|        13 (16)         |    0 (0.00%)    | 0 (0.00%) |      256       |
+|    Total for 16 bit    |    0 (0.00%)    | 0 (0.00%) |      1536      |
+|                        |                 |           |                |
+|       14 (32) T        |    0 (0.00%)    | 0 (0.00%) |      512       |
+|       15 (32) T        |    0 (0.00%)    | 0 (0.00%) |      512       |
+|    Total for 32 bit    |    0 (0.00%)    | 0 (0.00%) |      1024      |
+|                        |                 |           |                |
+|        16 (8) T        |    0 (0.00%)    | 0 (0.00%) |      128       |
+|        17 (8) T        |    0 (0.00%)    | 0 (0.00%) |      128       |
+|    Total for 8 bit     |    0 (0.00%)    | 0 (0.00%) |      256       |
+|                        |                 |           |                |
+|       18 (16) T        |    0 (0.00%)    | 0 (0.00%) |      256       |
+|       19 (16) T        |    0 (0.00%)    | 0 (0.00%) |      256       |
+|       20 (16) T        |    0 (0.00%)    | 0 (0.00%) |      256       |
+|    Total for 16 bit    |    0 (0.00%)    | 0 (0.00%) |      768       |
+|                        |                 |           |                |
+|       MAU total        |    0 (0.00%)    | 0 (0.00%) |      4096      |
+|     Tagalong total     |    0 (0.00%)    | 0 (0.00%) |      2048      |
+|     Overall total      |    0 (0.00%)    | 0 (0.00%) |      6144      |
+--------------------------------------------------------------------------
 
->>Event 'pa_meta1' at time 1505215017.16
-   Took 3.76 seconds
+>>Event 'pa_meta1' at time 1505264438.77
+   Took 0.51 seconds
 
 -----------------------------------------------
   Allocating metadata (pass 1)
@@ -2754,47 +2415,47 @@
 ***Allocating phv130[8:0] for ig_intr_md_for_tm.ucast_egress_port[8:0]
 Allocation state after promised meta allocated:
 Allocation state: Final Allocation
-------------------------------------------------------------------------------
-|       PHV Group        | Containers Used |   Bits Used   | Bits Available |
-| (container bit widths) |     (% used)    |    (% used)   |                |
-------------------------------------------------------------------------------
-|         0 (32)         |    6 (37.50%)   |  192 (37.50%) |      512       |
-|         1 (32)         |    0 (0.00%)    |   0 (0.00%)   |      512       |
-|         2 (32)         |    0 (0.00%)    |   0 (0.00%)   |      512       |
-|         3 (32)         |    0 (0.00%)    |   0 (0.00%)   |      512       |
-|    Total for 32 bit    |    6 (9.38%)    |  192 (9.38%)  |      2048      |
-|                        |                 |               |                |
-|         4 (8)          |    3 (18.75%)   |  24 (18.75%)  |      128       |
-|         5 (8)          |    1 (6.25%)    |   8 (6.25%)   |      128       |
-|         6 (8)          |    0 (0.00%)    |   0 (0.00%)   |      128       |
-|         7 (8)          |    0 (0.00%)    |   0 (0.00%)   |      128       |
-|    Total for 8 bit     |    4 (6.25%)    |   32 (6.25%)  |      512       |
-|                        |                 |               |                |
-|         8 (16)         |    6 (37.50%)   |  89 (34.77%)  |      256       |
-|         9 (16)         |    1 (6.25%)    |   16 (6.25%)  |      256       |
-|        10 (16)         |    0 (0.00%)    |   0 (0.00%)   |      256       |
-|        11 (16)         |    0 (0.00%)    |   0 (0.00%)   |      256       |
-|        12 (16)         |    0 (0.00%)    |   0 (0.00%)   |      256       |
-|        13 (16)         |    0 (0.00%)    |   0 (0.00%)   |      256       |
-|    Total for 16 bit    |    7 (7.29%)    |  105 (6.84%)  |      1536      |
-|                        |                 |               |                |
-|       14 (32) T        |   11 (68.75%)   |  352 (68.75%) |      512       |
-|       15 (32) T        |    0 (0.00%)    |   0 (0.00%)   |      512       |
-|    Total for 32 bit    |   11 (34.38%)   |  352 (34.38%) |      1024      |
-|                        |                 |               |                |
-|        16 (8) T        |   11 (68.75%)   |  88 (68.75%)  |      128       |
-|        17 (8) T        |    0 (0.00%)    |   0 (0.00%)   |      128       |
-|    Total for 8 bit     |   11 (34.38%)   |  88 (34.38%)  |      256       |
-|                        |                 |               |                |
-|       18 (16) T        |   10 (62.50%)   |  160 (62.50%) |      256       |
-|       19 (16) T        |    5 (31.25%)   |  80 (31.25%)  |      256       |
-|       20 (16) T        |    0 (0.00%)    |   0 (0.00%)   |      256       |
-|    Total for 16 bit    |   15 (31.25%)   |  240 (31.25%) |      768       |
-|                        |                 |               |                |
-|       MAU total        |    17 (7.59%)   |  329 (8.03%)  |      4096      |
-|     Tagalong total     |   37 (33.04%)   |  680 (33.20%) |      2048      |
-|     Overall total      |   54 (16.07%)   | 1009 (16.42%) |      6144      |
-------------------------------------------------------------------------------
+-----------------------------------------------------------------------------
+|       PHV Group        | Containers Used |  Bits Used   | Bits Available |
+| (container bit widths) |     (% used)    |   (% used)   |                |
+-----------------------------------------------------------------------------
+|         0 (32)         |    6 (37.50%)   | 192 (37.50%) |      512       |
+|         1 (32)         |    0 (0.00%)    |  0 (0.00%)   |      512       |
+|         2 (32)         |    0 (0.00%)    |  0 (0.00%)   |      512       |
+|         3 (32)         |    0 (0.00%)    |  0 (0.00%)   |      512       |
+|    Total for 32 bit    |    6 (9.38%)    | 192 (9.38%)  |      2048      |
+|                        |                 |              |                |
+|         4 (8)          |    4 (25.00%)   | 32 (25.00%)  |      128       |
+|         5 (8)          |    1 (6.25%)    |  8 (6.25%)   |      128       |
+|         6 (8)          |    0 (0.00%)    |  0 (0.00%)   |      128       |
+|         7 (8)          |    0 (0.00%)    |  0 (0.00%)   |      128       |
+|    Total for 8 bit     |    5 (7.81%)    |  40 (7.81%)  |      512       |
+|                        |                 |              |                |
+|         8 (16)         |    7 (43.75%)   | 105 (41.02%) |      256       |
+|         9 (16)         |    1 (6.25%)    |  16 (6.25%)  |      256       |
+|        10 (16)         |    0 (0.00%)    |  0 (0.00%)   |      256       |
+|        11 (16)         |    0 (0.00%)    |  0 (0.00%)   |      256       |
+|        12 (16)         |    0 (0.00%)    |  0 (0.00%)   |      256       |
+|        13 (16)         |    0 (0.00%)    |  0 (0.00%)   |      256       |
+|    Total for 16 bit    |    8 (8.33%)    | 121 (7.88%)  |      1536      |
+|                        |                 |              |                |
+|       14 (32) T        |   11 (68.75%)   | 352 (68.75%) |      512       |
+|       15 (32) T        |    0 (0.00%)    |  0 (0.00%)   |      512       |
+|    Total for 32 bit    |   11 (34.38%)   | 352 (34.38%) |      1024      |
+|                        |                 |              |                |
+|        16 (8) T        |    8 (50.00%)   | 64 (50.00%)  |      128       |
+|        17 (8) T        |    0 (0.00%)    |  0 (0.00%)   |      128       |
+|    Total for 8 bit     |    8 (25.00%)   | 64 (25.00%)  |      256       |
+|                        |                 |              |                |
+|       18 (16) T        |   13 (81.25%)   | 208 (81.25%) |      256       |
+|       19 (16) T        |    0 (0.00%)    |  0 (0.00%)   |      256       |
+|       20 (16) T        |    0 (0.00%)    |  0 (0.00%)   |      256       |
+|    Total for 16 bit    |   13 (27.08%)   | 208 (27.08%) |      768       |
+|                        |                 |              |                |
+|       MAU total        |    19 (8.48%)   | 353 (8.62%)  |      4096      |
+|     Tagalong total     |   32 (28.57%)   | 624 (30.47%) |      2048      |
+|     Overall total      |   51 (15.18%)   | 977 (15.90%) |      6144      |
+-----------------------------------------------------------------------------
 
 Allocation state difference after promised meta allocated:
 Allocation state: Diff
@@ -2841,7 +2502,7 @@
 --------------------------------------------------------------------------
 
 Sorted metadata field instances to allocate: 0 / 0 bits (0 ingress bits and 0 egress bits)
->>Event 'pa_pov' at time 1505215017.27
+>>Event 'pa_pov' at time 1505264438.88
    Took 0.10 seconds
 
 -----------------------------------------------
@@ -2849,47 +2510,47 @@
 -----------------------------------------------
 Allocation Step
 Allocation state: Final Allocation
-------------------------------------------------------------------------------
-|       PHV Group        | Containers Used |   Bits Used   | Bits Available |
-| (container bit widths) |     (% used)    |    (% used)   |                |
-------------------------------------------------------------------------------
-|         0 (32)         |    6 (37.50%)   |  192 (37.50%) |      512       |
-|         1 (32)         |    0 (0.00%)    |   0 (0.00%)   |      512       |
-|         2 (32)         |    0 (0.00%)    |   0 (0.00%)   |      512       |
-|         3 (32)         |    0 (0.00%)    |   0 (0.00%)   |      512       |
-|    Total for 32 bit    |    6 (9.38%)    |  192 (9.38%)  |      2048      |
-|                        |                 |               |                |
-|         4 (8)          |    3 (18.75%)   |  24 (18.75%)  |      128       |
-|         5 (8)          |    1 (6.25%)    |   8 (6.25%)   |      128       |
-|         6 (8)          |    0 (0.00%)    |   0 (0.00%)   |      128       |
-|         7 (8)          |    0 (0.00%)    |   0 (0.00%)   |      128       |
-|    Total for 8 bit     |    4 (6.25%)    |   32 (6.25%)  |      512       |
-|                        |                 |               |                |
-|         8 (16)         |    6 (37.50%)   |  89 (34.77%)  |      256       |
-|         9 (16)         |    1 (6.25%)    |   16 (6.25%)  |      256       |
-|        10 (16)         |    0 (0.00%)    |   0 (0.00%)   |      256       |
-|        11 (16)         |    0 (0.00%)    |   0 (0.00%)   |      256       |
-|        12 (16)         |    0 (0.00%)    |   0 (0.00%)   |      256       |
-|        13 (16)         |    0 (0.00%)    |   0 (0.00%)   |      256       |
-|    Total for 16 bit    |    7 (7.29%)    |  105 (6.84%)  |      1536      |
-|                        |                 |               |                |
-|       14 (32) T        |   11 (68.75%)   |  352 (68.75%) |      512       |
-|       15 (32) T        |    0 (0.00%)    |   0 (0.00%)   |      512       |
-|    Total for 32 bit    |   11 (34.38%)   |  352 (34.38%) |      1024      |
-|                        |                 |               |                |
-|        16 (8) T        |   11 (68.75%)   |  88 (68.75%)  |      128       |
-|        17 (8) T        |    0 (0.00%)    |   0 (0.00%)   |      128       |
-|    Total for 8 bit     |   11 (34.38%)   |  88 (34.38%)  |      256       |
-|                        |                 |               |                |
-|       18 (16) T        |   10 (62.50%)   |  160 (62.50%) |      256       |
-|       19 (16) T        |    5 (31.25%)   |  80 (31.25%)  |      256       |
-|       20 (16) T        |    0 (0.00%)    |   0 (0.00%)   |      256       |
-|    Total for 16 bit    |   15 (31.25%)   |  240 (31.25%) |      768       |
-|                        |                 |               |                |
-|       MAU total        |    17 (7.59%)   |  329 (8.03%)  |      4096      |
-|     Tagalong total     |   37 (33.04%)   |  680 (33.20%) |      2048      |
-|     Overall total      |   54 (16.07%)   | 1009 (16.42%) |      6144      |
-------------------------------------------------------------------------------
+-----------------------------------------------------------------------------
+|       PHV Group        | Containers Used |  Bits Used   | Bits Available |
+| (container bit widths) |     (% used)    |   (% used)   |                |
+-----------------------------------------------------------------------------
+|         0 (32)         |    6 (37.50%)   | 192 (37.50%) |      512       |
+|         1 (32)         |    0 (0.00%)    |  0 (0.00%)   |      512       |
+|         2 (32)         |    0 (0.00%)    |  0 (0.00%)   |      512       |
+|         3 (32)         |    0 (0.00%)    |  0 (0.00%)   |      512       |
+|    Total for 32 bit    |    6 (9.38%)    | 192 (9.38%)  |      2048      |
+|                        |                 |              |                |
+|         4 (8)          |    4 (25.00%)   | 32 (25.00%)  |      128       |
+|         5 (8)          |    1 (6.25%)    |  8 (6.25%)   |      128       |
+|         6 (8)          |    0 (0.00%)    |  0 (0.00%)   |      128       |
+|         7 (8)          |    0 (0.00%)    |  0 (0.00%)   |      128       |
+|    Total for 8 bit     |    5 (7.81%)    |  40 (7.81%)  |      512       |
+|                        |                 |              |                |
+|         8 (16)         |    7 (43.75%)   | 105 (41.02%) |      256       |
+|         9 (16)         |    1 (6.25%)    |  16 (6.25%)  |      256       |
+|        10 (16)         |    0 (0.00%)    |  0 (0.00%)   |      256       |
+|        11 (16)         |    0 (0.00%)    |  0 (0.00%)   |      256       |
+|        12 (16)         |    0 (0.00%)    |  0 (0.00%)   |      256       |
+|        13 (16)         |    0 (0.00%)    |  0 (0.00%)   |      256       |
+|    Total for 16 bit    |    8 (8.33%)    | 121 (7.88%)  |      1536      |
+|                        |                 |              |                |
+|       14 (32) T        |   11 (68.75%)   | 352 (68.75%) |      512       |
+|       15 (32) T        |    0 (0.00%)    |  0 (0.00%)   |      512       |
+|    Total for 32 bit    |   11 (34.38%)   | 352 (34.38%) |      1024      |
+|                        |                 |              |                |
+|        16 (8) T        |    8 (50.00%)   | 64 (50.00%)  |      128       |
+|        17 (8) T        |    0 (0.00%)    |  0 (0.00%)   |      128       |
+|    Total for 8 bit     |    8 (25.00%)   | 64 (25.00%)  |      256       |
+|                        |                 |              |                |
+|       18 (16) T        |   13 (81.25%)   | 208 (81.25%) |      256       |
+|       19 (16) T        |    0 (0.00%)    |  0 (0.00%)   |      256       |
+|       20 (16) T        |    0 (0.00%)    |  0 (0.00%)   |      256       |
+|    Total for 16 bit    |   13 (27.08%)   | 208 (27.08%) |      768       |
+|                        |                 |              |                |
+|       MAU total        |    19 (8.48%)   | 353 (8.62%)  |      4096      |
+|     Tagalong total     |   32 (28.57%)   | 624 (30.47%) |      2048      |
+|     Overall total      |   51 (15.18%)   | 977 (15.90%) |      6144      |
+-----------------------------------------------------------------------------
 
 Sorted POV field instances to allocate (with best pack): 13
     0: --validity_check--packet_in_hdr (ingress)  -- max pov share 6 / best pack 5
@@ -2913,19 +2574,19 @@
   Best pack group: (6)
 
 Looking for container to share POV bit in from already allocated containers for POV.
-Container availability (not used yet for POV): total 193 / partial 1
+Container availability (not used yet for POV): total 191 / partial 1
 
 Looking for container to share POV bit in from already allocated containers that have not been used for POV.
->>Choose container phv67, starting at container bit 0, which results in 7 bits still available (unused = 8 and could fit = 7).
+>>Choose container phv68, starting at container bit 0, which results in 7 bits still available (unused = 8 and could fit = 7).
   >> Decided to allocate new container
-Required container phv67
-***Allocating phv67[0:0] for --validity_check--packet_in_hdr[0:0]
-***Allocating phv67[1:1] for --validity_check--packet_out_hdr[0:0]
-***Allocating phv67[2:2] for --validity_check--ethernet[0:0]
-***Allocating phv67[3:3] for --validity_check--ipv4[0:0]
-***Allocating phv67[4:4] for --validity_check--tcp[0:0]
-***Allocating phv67[5:5] for --validity_check--udp[0:0]
-***Allocating phv67[6:6] for --validity_check--metadata_bridge[0:0]
+Required container phv68
+***Allocating phv68[0:0] for --validity_check--packet_in_hdr[0:0]
+***Allocating phv68[1:1] for --validity_check--packet_out_hdr[0:0]
+***Allocating phv68[2:2] for --validity_check--ethernet[0:0]
+***Allocating phv68[3:3] for --validity_check--ipv4[0:0]
+***Allocating phv68[4:4] for --validity_check--tcp[0:0]
+***Allocating phv68[5:5] for --validity_check--udp[0:0]
+***Allocating phv68[6:6] for --validity_check--metadata_bridge[0:0]
 
 Working on
 --validity_check--packet_out_hdr <1 bits ingress parsed pov R W>
@@ -2993,12 +2654,12 @@
 
 Sum of container bit widths POVs found in: 16
  ingress
-    phv67 (8 bits)
+    phv68 (8 bits)
   >> 8 total bits
  egress
     phv81 (8 bits)
   >> 8 total bits
->>Event 'pa_meta2' at time 1505215017.39
+>>Event 'pa_meta2' at time 1505264439.00
    Took 0.12 seconds
 
 -----------------------------------------------
@@ -3009,47 +2670,47 @@
 Promised metadata field instances to allocate: 0 / 0 bits (0 ingress bits and 0 egress bits)
 Allocation state after promised meta allocated:
 Allocation state: Final Allocation
-------------------------------------------------------------------------------
-|       PHV Group        | Containers Used |   Bits Used   | Bits Available |
-| (container bit widths) |     (% used)    |    (% used)   |                |
-------------------------------------------------------------------------------
-|         0 (32)         |    6 (37.50%)   |  192 (37.50%) |      512       |
-|         1 (32)         |    0 (0.00%)    |   0 (0.00%)   |      512       |
-|         2 (32)         |    0 (0.00%)    |   0 (0.00%)   |      512       |
-|         3 (32)         |    0 (0.00%)    |   0 (0.00%)   |      512       |
-|    Total for 32 bit    |    6 (9.38%)    |  192 (9.38%)  |      2048      |
-|                        |                 |               |                |
-|         4 (8)          |    4 (25.00%)   |  31 (24.22%)  |      128       |
-|         5 (8)          |    2 (12.50%)   |  14 (10.94%)  |      128       |
-|         6 (8)          |    0 (0.00%)    |   0 (0.00%)   |      128       |
-|         7 (8)          |    0 (0.00%)    |   0 (0.00%)   |      128       |
-|    Total for 8 bit     |    6 (9.38%)    |   45 (8.79%)  |      512       |
-|                        |                 |               |                |
-|         8 (16)         |    6 (37.50%)   |  89 (34.77%)  |      256       |
-|         9 (16)         |    1 (6.25%)    |   16 (6.25%)  |      256       |
-|        10 (16)         |    0 (0.00%)    |   0 (0.00%)   |      256       |
-|        11 (16)         |    0 (0.00%)    |   0 (0.00%)   |      256       |
-|        12 (16)         |    0 (0.00%)    |   0 (0.00%)   |      256       |
-|        13 (16)         |    0 (0.00%)    |   0 (0.00%)   |      256       |
-|    Total for 16 bit    |    7 (7.29%)    |  105 (6.84%)  |      1536      |
-|                        |                 |               |                |
-|       14 (32) T        |   11 (68.75%)   |  352 (68.75%) |      512       |
-|       15 (32) T        |    0 (0.00%)    |   0 (0.00%)   |      512       |
-|    Total for 32 bit    |   11 (34.38%)   |  352 (34.38%) |      1024      |
-|                        |                 |               |                |
-|        16 (8) T        |   11 (68.75%)   |  88 (68.75%)  |      128       |
-|        17 (8) T        |    0 (0.00%)    |   0 (0.00%)   |      128       |
-|    Total for 8 bit     |   11 (34.38%)   |  88 (34.38%)  |      256       |
-|                        |                 |               |                |
-|       18 (16) T        |   10 (62.50%)   |  160 (62.50%) |      256       |
-|       19 (16) T        |    5 (31.25%)   |  80 (31.25%)  |      256       |
-|       20 (16) T        |    0 (0.00%)    |   0 (0.00%)   |      256       |
-|    Total for 16 bit    |   15 (31.25%)   |  240 (31.25%) |      768       |
-|                        |                 |               |                |
-|       MAU total        |    19 (8.48%)   |  342 (8.35%)  |      4096      |
-|     Tagalong total     |   37 (33.04%)   |  680 (33.20%) |      2048      |
-|     Overall total      |   56 (16.67%)   | 1022 (16.63%) |      6144      |
-------------------------------------------------------------------------------
+-----------------------------------------------------------------------------
+|       PHV Group        | Containers Used |  Bits Used   | Bits Available |
+| (container bit widths) |     (% used)    |   (% used)   |                |
+-----------------------------------------------------------------------------
+|         0 (32)         |    6 (37.50%)   | 192 (37.50%) |      512       |
+|         1 (32)         |    0 (0.00%)    |  0 (0.00%)   |      512       |
+|         2 (32)         |    0 (0.00%)    |  0 (0.00%)   |      512       |
+|         3 (32)         |    0 (0.00%)    |  0 (0.00%)   |      512       |
+|    Total for 32 bit    |    6 (9.38%)    | 192 (9.38%)  |      2048      |
+|                        |                 |              |                |
+|         4 (8)          |    5 (31.25%)   | 39 (30.47%)  |      128       |
+|         5 (8)          |    2 (12.50%)   | 14 (10.94%)  |      128       |
+|         6 (8)          |    0 (0.00%)    |  0 (0.00%)   |      128       |
+|         7 (8)          |    0 (0.00%)    |  0 (0.00%)   |      128       |
+|    Total for 8 bit     |    7 (10.94%)   | 53 (10.35%)  |      512       |
+|                        |                 |              |                |
+|         8 (16)         |    7 (43.75%)   | 105 (41.02%) |      256       |
+|         9 (16)         |    1 (6.25%)    |  16 (6.25%)  |      256       |
+|        10 (16)         |    0 (0.00%)    |  0 (0.00%)   |      256       |
+|        11 (16)         |    0 (0.00%)    |  0 (0.00%)   |      256       |
+|        12 (16)         |    0 (0.00%)    |  0 (0.00%)   |      256       |
+|        13 (16)         |    0 (0.00%)    |  0 (0.00%)   |      256       |
+|    Total for 16 bit    |    8 (8.33%)    | 121 (7.88%)  |      1536      |
+|                        |                 |              |                |
+|       14 (32) T        |   11 (68.75%)   | 352 (68.75%) |      512       |
+|       15 (32) T        |    0 (0.00%)    |  0 (0.00%)   |      512       |
+|    Total for 32 bit    |   11 (34.38%)   | 352 (34.38%) |      1024      |
+|                        |                 |              |                |
+|        16 (8) T        |    8 (50.00%)   | 64 (50.00%)  |      128       |
+|        17 (8) T        |    0 (0.00%)    |  0 (0.00%)   |      128       |
+|    Total for 8 bit     |    8 (25.00%)   | 64 (25.00%)  |      256       |
+|                        |                 |              |                |
+|       18 (16) T        |   13 (81.25%)   | 208 (81.25%) |      256       |
+|       19 (16) T        |    0 (0.00%)    |  0 (0.00%)   |      256       |
+|       20 (16) T        |    0 (0.00%)    |  0 (0.00%)   |      256       |
+|    Total for 16 bit    |   13 (27.08%)   | 208 (27.08%) |      768       |
+|                        |                 |              |                |
+|       MAU total        |    21 (9.38%)   | 366 (8.94%)  |      4096      |
+|     Tagalong total     |   32 (28.57%)   | 624 (30.47%) |      2048      |
+|     Overall total      |   53 (15.77%)   | 990 (16.11%) |      6144      |
+-----------------------------------------------------------------------------
 
 Allocation state difference after promised meta allocated:
 Allocation state: Diff
@@ -3125,11 +2786,11 @@
   Group 1 32 bits -- avail 16 and promised None -- ingress promised None and remain None and req None -- egress promised None and remain None and req None -- as if deparsed False -- container_to_use None -- fails True
   Group 2 32 bits -- avail 16 and promised 1 -- ingress promised 1 and remain 15 and req 0 -- egress promised 0 and remain 15 and req 0 -- as if deparsed False -- container_to_use phv32 -- fails False
   Group 3 32 bits -- avail 16 and promised 1 -- ingress promised 1 and remain 15 and req 0 -- egress promised 0 and remain 15 and req 0 -- as if deparsed False -- container_to_use phv48 -- fails False
-  Group 4 8 bits -- avail 12 and promised None -- ingress promised None and remain None and req None -- egress promised None and remain None and req None -- as if deparsed False -- container_to_use None -- fails True
+  Group 4 8 bits -- avail 11 and promised None -- ingress promised None and remain None and req None -- egress promised None and remain None and req None -- as if deparsed False -- container_to_use None -- fails True
   Group 5 8 bits -- avail 14 and promised None -- ingress promised None and remain None and req None -- egress promised None and remain None and req None -- as if deparsed False -- container_to_use None -- fails True
   Group 6 8 bits -- avail 16 and promised None -- ingress promised None and remain None and req None -- egress promised None and remain None and req None -- as if deparsed False -- container_to_use None -- fails True
   Group 7 8 bits -- avail 16 and promised None -- ingress promised None and remain None and req None -- egress promised None and remain None and req None -- as if deparsed False -- container_to_use None -- fails True
-  Group 8 16 bits -- avail 10 and promised 1 -- ingress promised 1 and remain 9 and req 0 -- egress promised 0 and remain 8 and req 0 -- as if deparsed False -- container_to_use phv134 -- fails False
+  Group 8 16 bits -- avail 9 and promised 1 -- ingress promised 1 and remain 8 and req 0 -- egress promised 0 and remain 8 and req 0 -- as if deparsed False -- container_to_use phv135 -- fails False
   Group 9 16 bits -- avail 15 and promised None -- ingress promised None and remain None and req None -- egress promised None and remain None and req None -- as if deparsed False -- container_to_use None -- fails True
   Group 10 16 bits -- avail 16 and promised 1 -- ingress promised 1 and remain 15 and req 0 -- egress promised 0 and remain 15 and req 0 -- as if deparsed False -- container_to_use phv160 -- fails False
   Group 11 16 bits -- avail 16 and promised 1 -- ingress promised 1 and remain 15 and req 0 -- egress promised 0 and remain 15 and req 0 -- as if deparsed False -- container_to_use phv176 -- fails False
@@ -3139,7 +2800,7 @@
 >>req_alignment = None
 >>allowed_container_start_bits = None
 >>req_container = None
-***Allocating phv134[15:0] for ecmp_metadata.group_id[15:0]
+***Allocating phv135[15:0] for ecmp_metadata.group_id[15:0]
 
 ---------------------------------------
 Working on:
@@ -3166,11 +2827,11 @@
   Group 1 32 bits -- avail 16 and promised None -- ingress promised None and remain None and req None -- egress promised None and remain None and req None -- as if deparsed False -- container_to_use None -- fails True
   Group 2 32 bits -- avail 16 and promised 1 -- ingress promised 1 and remain 15 and req 0 -- egress promised 0 and remain 15 and req 0 -- as if deparsed False -- container_to_use phv32 -- fails False
   Group 3 32 bits -- avail 16 and promised 1 -- ingress promised 1 and remain 15 and req 0 -- egress promised 0 and remain 15 and req 0 -- as if deparsed False -- container_to_use phv48 -- fails False
-  Group 4 8 bits -- avail 12 and promised None -- ingress promised None and remain None and req None -- egress promised None and remain None and req None -- as if deparsed False -- container_to_use None -- fails True
+  Group 4 8 bits -- avail 11 and promised None -- ingress promised None and remain None and req None -- egress promised None and remain None and req None -- as if deparsed False -- container_to_use None -- fails True
   Group 5 8 bits -- avail 14 and promised None -- ingress promised None and remain None and req None -- egress promised None and remain None and req None -- as if deparsed False -- container_to_use None -- fails True
   Group 6 8 bits -- avail 16 and promised None -- ingress promised None and remain None and req None -- egress promised None and remain None and req None -- as if deparsed False -- container_to_use None -- fails True
   Group 7 8 bits -- avail 16 and promised None -- ingress promised None and remain None and req None -- egress promised None and remain None and req None -- as if deparsed False -- container_to_use None -- fails True
-  Group 8 16 bits -- avail 9 and promised 1 -- ingress promised 1 and remain 8 and req 0 -- egress promised 0 and remain 8 and req 0 -- as if deparsed False -- container_to_use phv135 -- fails False
+  Group 8 16 bits -- avail 8 and promised 1 -- ingress promised 1 and remain 7 and req 0 -- egress promised 0 and remain 7 and req 0 -- as if deparsed False -- container_to_use phv136 -- fails False
   Group 9 16 bits -- avail 15 and promised None -- ingress promised None and remain None and req None -- egress promised None and remain None and req None -- as if deparsed False -- container_to_use None -- fails True
   Group 10 16 bits -- avail 16 and promised 1 -- ingress promised 1 and remain 15 and req 0 -- egress promised 0 and remain 15 and req 0 -- as if deparsed False -- container_to_use phv160 -- fails False
   Group 11 16 bits -- avail 16 and promised 1 -- ingress promised 1 and remain 15 and req 0 -- egress promised 0 and remain 15 and req 0 -- as if deparsed False -- container_to_use phv176 -- fails False
@@ -3180,7 +2841,7 @@
 >>req_alignment = None
 >>allowed_container_start_bits = None
 >>req_container = None
-***Allocating phv135[15:0] for ecmp_metadata.selector[15:0]
+***Allocating phv136[15:0] for ecmp_metadata.selector[15:0]
 
 ---------------------------------------
 Working on:
@@ -3207,11 +2868,11 @@
   Group 1 32 bits -- avail 16 and promised None -- ingress promised None and remain None and req None -- egress promised None and remain None and req None -- as if deparsed False -- container_to_use None -- fails True
   Group 2 32 bits -- avail 16 and promised 1 -- ingress promised 1 and remain 15 and req 1 -- egress promised 0 and remain 12 and req 0 -- as if deparsed True -- container_to_use phv32 -- fails False
   Group 3 32 bits -- avail 16 and promised 1 -- ingress promised 1 and remain 15 and req 1 -- egress promised 0 and remain 12 and req 0 -- as if deparsed True -- container_to_use phv48 -- fails False
-  Group 4 8 bits -- avail 12 and promised 1 -- ingress promised 1 and remain 11 and req 1 -- egress promised 0 and remain 8 and req 0 -- as if deparsed True -- container_to_use phv68 -- fails False
+  Group 4 8 bits -- avail 11 and promised 1 -- ingress promised 1 and remain 10 and req 1 -- egress promised 0 and remain 8 and req 0 -- as if deparsed True -- container_to_use phv69 -- fails False
   Group 5 8 bits -- avail 14 and promised None -- ingress promised None and remain None and req None -- egress promised None and remain None and req None -- as if deparsed False -- container_to_use None -- fails True
   Group 6 8 bits -- avail 16 and promised 1 -- ingress promised 1 and remain 15 and req 1 -- egress promised 0 and remain 8 and req 0 -- as if deparsed True -- container_to_use phv96 -- fails False
   Group 7 8 bits -- avail 16 and promised 1 -- ingress promised 1 and remain 15 and req 1 -- egress promised 0 and remain 8 and req 0 -- as if deparsed True -- container_to_use phv112 -- fails False
-  Group 8 16 bits -- avail 8 and promised 1 -- ingress promised 1 and remain 7 and req 1 -- egress promised 0 and remain 0 and req 0 -- as if deparsed True -- container_to_use phv136 -- fails False
+  Group 8 16 bits -- avail 7 and promised 1 -- ingress promised 1 and remain 6 and req 1 -- egress promised 0 and remain 0 and req 0 -- as if deparsed True -- container_to_use phv137 -- fails False
   Group 9 16 bits -- avail 15 and promised None -- ingress promised None and remain None and req None -- egress promised None and remain None and req None -- as if deparsed False -- container_to_use None -- fails True
   Group 10 16 bits -- avail 16 and promised 1 -- ingress promised 1 and remain 15 and req 1 -- egress promised 0 and remain 8 and req 0 -- as if deparsed True -- container_to_use phv160 -- fails False
   Group 11 16 bits -- avail 16 and promised 1 -- ingress promised 1 and remain 15 and req 1 -- egress promised 0 and remain 8 and req 0 -- as if deparsed True -- container_to_use phv176 -- fails False
@@ -3224,8 +2885,8 @@
   case 2: looking at allowed start bits [0, 1, 2, 3, 4, 5, 6, 7]
     final start_bit = 5
   (1) msb_offset = 8
-***Allocating phv68[7:5] for ig_intr_md_for_tm.drop_ctl[2:0]
->>Event 'pa_meta_init' at time 1505215017.55
+***Allocating phv69[7:5] for ig_intr_md_for_tm.drop_ctl[2:0]
+>>Event 'pa_meta_init' at time 1505264439.16
    Took 0.16 seconds
 
 -----------------------------------------------
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/pa.results.log b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/pa.results.log
index 2c662cf..b6bce54 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/pa.results.log
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/pa.results.log
@@ -1,7 +1,7 @@
 +---------------------------------------------------------------------+
 |  Log file: pa.results.log                                           |
 |  Compiler version: 5.1.0 (fca32d1)                                  |
-|  Created on: Tue Sep 12 11:16:41 2017                               |
+|  Created on: Wed Sep 13 01:00:26 2017                               |
 +---------------------------------------------------------------------+
 
 Program: ecmp
@@ -17,36 +17,36 @@
 |         3 (32)         |    0 (0.00%)    |   0 (0.00%)   |      512       |
 |    Total for 32 bit    |    6 (9.38%)    |  192 (9.38%)  |      2048      |
 |                        |                 |               |                |
-|         4 (8)          |    5 (31.25%)   |  34 (26.56%)  |      128       |
+|         4 (8)          |    6 (37.50%)   |  42 (32.81%)  |      128       |
 |         5 (8)          |    2 (12.50%)   |  14 (10.94%)  |      128       |
 |         6 (8)          |    0 (0.00%)    |   0 (0.00%)   |      128       |
 |         7 (8)          |    0 (0.00%)    |   0 (0.00%)   |      128       |
-|    Total for 8 bit     |    7 (10.94%)   |   48 (9.38%)  |      512       |
+|    Total for 8 bit     |    8 (12.50%)   |  56 (10.94%)  |      512       |
 |                        |                 |               |                |
-|         8 (16)         |    8 (50.00%)   |  121 (47.27%) |      256       |
+|         8 (16)         |    9 (56.25%)   |  137 (53.52%) |      256       |
 |         9 (16)         |    1 (6.25%)    |   16 (6.25%)  |      256       |
 |        10 (16)         |    0 (0.00%)    |   0 (0.00%)   |      256       |
 |        11 (16)         |    0 (0.00%)    |   0 (0.00%)   |      256       |
 |        12 (16)         |    0 (0.00%)    |   0 (0.00%)   |      256       |
 |        13 (16)         |    0 (0.00%)    |   0 (0.00%)   |      256       |
-|    Total for 16 bit    |    9 (9.38%)    |  137 (8.92%)  |      1536      |
+|    Total for 16 bit    |   10 (10.42%)   |  153 (9.96%)  |      1536      |
 |                        |                 |               |                |
 |       14 (32) T        |   11 (68.75%)   |  352 (68.75%) |      512       |
 |       15 (32) T        |    0 (0.00%)    |   0 (0.00%)   |      512       |
 |    Total for 32 bit    |   11 (34.38%)   |  352 (34.38%) |      1024      |
 |                        |                 |               |                |
-|        16 (8) T        |   11 (68.75%)   |  88 (68.75%)  |      128       |
+|        16 (8) T        |    8 (50.00%)   |  64 (50.00%)  |      128       |
 |        17 (8) T        |    0 (0.00%)    |   0 (0.00%)   |      128       |
-|    Total for 8 bit     |   11 (34.38%)   |  88 (34.38%)  |      256       |
+|    Total for 8 bit     |    8 (25.00%)   |  64 (25.00%)  |      256       |
 |                        |                 |               |                |
-|       18 (16) T        |   10 (62.50%)   |  160 (62.50%) |      256       |
-|       19 (16) T        |    5 (31.25%)   |  80 (31.25%)  |      256       |
+|       18 (16) T        |   13 (81.25%)   |  208 (81.25%) |      256       |
+|       19 (16) T        |    0 (0.00%)    |   0 (0.00%)   |      256       |
 |       20 (16) T        |    0 (0.00%)    |   0 (0.00%)   |      256       |
-|    Total for 16 bit    |   15 (31.25%)   |  240 (31.25%) |      768       |
+|    Total for 16 bit    |   13 (27.08%)   |  208 (27.08%) |      768       |
 |                        |                 |               |                |
-|       MAU total        |    22 (9.82%)   |  377 (9.20%)  |      4096      |
-|     Tagalong total     |   37 (33.04%)   |  680 (33.20%) |      2048      |
-|     Overall total      |   59 (17.56%)   | 1057 (17.20%) |      6144      |
+|       MAU total        |   24 (10.71%)   |  401 (9.79%)  |      4096      |
+|     Tagalong total     |   32 (28.57%)   |  624 (30.47%) |      2048      |
+|     Overall total      |   56 (16.67%)   | 1025 (16.68%) |      6144      |
 ------------------------------------------------------------------------------
 
 --------------------------------------------
@@ -59,25 +59,27 @@
   32-bit PHV 1 (ingress): phv1[23:8] = ipv4.hdrChecksum[15:0] (tagalong capable) (deparsed)
   32-bit PHV 1 (ingress): phv1[7:0] = ipv4.srcAddr[31:24] (deparsed)
   32-bit PHV 2 (ingress): phv2[31:0] = ipv4.dstAddr[31:0] (deparsed)
-  32-bit PHV 3 (ingress): phv3[31:0] = ethernet.dstAddr[39:8] (deparsed)
-  32-bit PHV 4 (ingress): phv4[31:0] = ethernet.srcAddr[31:0] (deparsed)
-  32-bit PHV 5 (ingress): phv5[31:16] = udp.srcPort[15:0] (deparsed)
-  32-bit PHV 5 (ingress): phv5[15:0] = udp.dstPort[15:0] (deparsed)
+  32-bit PHV 3 (ingress): phv3[31:24] = tcp.dstPort[7:0] (deparsed)
+  32-bit PHV 3 (ingress): phv3[23:0] = tcp.seqNo[31:8] (tagalong capable) (deparsed)
+  32-bit PHV 4 (ingress): phv4[31:0] = ethernet.dstAddr[39:8] (deparsed)
+  32-bit PHV 5 (ingress): phv5[31:0] = ethernet.srcAddr[31:0] (deparsed)
   >> 6 in ingress and 0 in egress
 
 Allocations in Group 4 8 bits
   8-bit PHV 64 (ingress): phv64[7:0] = ipv4.srcAddr[23:16] (deparsed)
-  8-bit PHV 65 (ingress): phv65[7:0] = ethernet.dstAddr[47:40] (deparsed)
-  8-bit PHV 66 (ingress): phv66[7:0] = ethernet.srcAddr[39:32] (deparsed)
-  8-bit PHV 67 (ingress): phv67[6:6] = --validity_check--metadata_bridge[0:0] (deparsed)
-  8-bit PHV 67 (ingress): phv67[5:5] = --validity_check--udp[0:0] (deparsed)
-  8-bit PHV 67 (ingress): phv67[4:4] = --validity_check--tcp[0:0] (deparsed)
-  8-bit PHV 67 (ingress): phv67[3:3] = --validity_check--ipv4[0:0] (deparsed)
-  8-bit PHV 67 (ingress): phv67[2:2] = --validity_check--ethernet[0:0] (deparsed)
-  8-bit PHV 67 (ingress): phv67[1:1] = --validity_check--packet_out_hdr[0:0] (deparsed)
-  8-bit PHV 67 (ingress): phv67[0:0] = --validity_check--packet_in_hdr[0:0] (deparsed)
-  8-bit PHV 68 (ingress): phv68[7:5] = ig_intr_md_for_tm.drop_ctl[2:0] (deparsed)
-  >> 5 in ingress and 0 in egress
+  8-bit PHV 65 (ingress): phv65[7:0] = tcp.srcPort[15:8] (deparsed)
+  8-bit PHV 65 (ingress): phv65[7:0] = udp.srcPort[7:0] (tagalong capable) (deparsed)
+  8-bit PHV 66 (ingress): phv66[7:0] = ethernet.dstAddr[47:40] (deparsed)
+  8-bit PHV 67 (ingress): phv67[7:0] = ethernet.srcAddr[39:32] (deparsed)
+  8-bit PHV 68 (ingress): phv68[6:6] = --validity_check--metadata_bridge[0:0] (deparsed)
+  8-bit PHV 68 (ingress): phv68[5:5] = --validity_check--udp[0:0] (deparsed)
+  8-bit PHV 68 (ingress): phv68[4:4] = --validity_check--tcp[0:0] (deparsed)
+  8-bit PHV 68 (ingress): phv68[3:3] = --validity_check--ipv4[0:0] (deparsed)
+  8-bit PHV 68 (ingress): phv68[2:2] = --validity_check--ethernet[0:0] (deparsed)
+  8-bit PHV 68 (ingress): phv68[1:1] = --validity_check--packet_out_hdr[0:0] (deparsed)
+  8-bit PHV 68 (ingress): phv68[0:0] = --validity_check--packet_in_hdr[0:0] (deparsed)
+  8-bit PHV 69 (ingress): phv69[7:5] = ig_intr_md_for_tm.drop_ctl[2:0] (deparsed)
+  >> 6 in ingress and 0 in egress
 
 Allocations in Group 5 8 bits
   8-bit PHV 80 (egress): phv80[7:3] = eg_intr_md._pad7[4:0]
@@ -102,12 +104,14 @@
   16-bit PHV 129 (ingress): phv129[6:0] = packet_in_hdr._padding[6:0] (tagalong capable) (deparsed)
   16-bit PHV 130 (ingress): phv130[8:0] = ig_intr_md_for_tm.ucast_egress_port[8:0] (deparsed)
   16-bit PHV 131 (ingress): phv131[15:0] = ipv4.srcAddr[15:0] (deparsed)
-  16-bit PHV 132 (ingress): phv132[15:8] = ethernet.dstAddr[7:0] (deparsed)
-  16-bit PHV 132 (ingress): phv132[7:0] = ethernet.srcAddr[47:40] (deparsed)
-  16-bit PHV 133 (ingress): phv133[15:0] = ethernet.etherType[15:0] (deparsed)
-  16-bit PHV 134 (ingress): phv134[15:0] = ecmp_metadata.group_id[15:0]
-  16-bit PHV 135 (ingress): phv135[15:0] = ecmp_metadata.selector[15:0]
-  >> 8 in ingress and 0 in egress
+  16-bit PHV 132 (ingress): phv132[15:8] = tcp.srcPort[7:0] (deparsed)
+  16-bit PHV 132 (ingress): phv132[7:0] = tcp.dstPort[15:8] (deparsed)
+  16-bit PHV 133 (ingress): phv133[15:8] = ethernet.dstAddr[7:0] (deparsed)
+  16-bit PHV 133 (ingress): phv133[7:0] = ethernet.srcAddr[47:40] (deparsed)
+  16-bit PHV 134 (ingress): phv134[15:0] = ethernet.etherType[15:0] (deparsed)
+  16-bit PHV 135 (ingress): phv135[15:0] = ecmp_metadata.group_id[15:0]
+  16-bit PHV 136 (ingress): phv136[15:0] = ecmp_metadata.selector[15:0]
+  >> 9 in ingress and 0 in egress
 
 Allocations in Group 9 16 bits
   16-bit PHV 144 (egress): phv144[15:9] = eg_intr_md._pad0[6:0]
@@ -120,90 +124,83 @@
   32-bit PHV 256 (ingress): phv256[20:8] = ipv4.fragOffset[12:0] (tagalong capable) (deparsed)
   32-bit PHV 256 (ingress): phv256[7:0] = ipv4.ttl[7:0] (tagalong capable) (deparsed)
   32-bit PHV 257 (ingress): phv257[31:28] = tcp.dataOffset[3:0] (tagalong capable) (deparsed)
+  32-bit PHV 257 (ingress): phv257[31:16] = udp.length_[15:0] (tagalong capable) (deparsed)
   32-bit PHV 257 (ingress): phv257[27:25] = tcp.res[2:0] (tagalong capable) (deparsed)
   32-bit PHV 257 (ingress): phv257[24:22] = tcp.ecn[2:0] (tagalong capable) (deparsed)
   32-bit PHV 257 (ingress): phv257[21:16] = tcp.ctrl[5:0] (tagalong capable) (deparsed)
   32-bit PHV 257 (ingress): phv257[15:0] = tcp.window[15:0] (tagalong capable) (deparsed)
+  32-bit PHV 257 (ingress): phv257[15:0] = udp.checksum[15:0] (tagalong capable) (deparsed)
   32-bit PHV 258 (ingress): phv258[31:16] = tcp.checksum[15:0] (tagalong capable) (deparsed)
   32-bit PHV 258 (ingress): phv258[15:0] = tcp.urgentPtr[15:0] (tagalong capable) (deparsed)
-  32-bit PHV 264 (egress): phv264[31:24] = ipv4.ttl[7:0] (tagalong capable) (deparsed)
-  32-bit PHV 264 (egress): phv264[23:16] = ipv4.protocol[7:0] (tagalong capable) (deparsed)
-  32-bit PHV 264 (egress): phv264[15:0] = ipv4.hdrChecksum[15:0] (tagalong capable) (deparsed)
-  32-bit PHV 265 (egress): phv265[31:0] = ipv4.srcAddr[31:0] (tagalong capable) (deparsed)
-  32-bit PHV 266 (egress): phv266[31:0] = ipv4.dstAddr[31:0] (tagalong capable) (deparsed)
-  32-bit PHV 267 (egress): phv267[31:0] = tcp.ackNo[31:0] (tagalong capable) (deparsed)
-  32-bit PHV 267 (egress): phv267[31:16] = udp.length_[15:0] (tagalong capable) (deparsed)
-  32-bit PHV 267 (egress): phv267[15:0] = udp.checksum[15:0] (tagalong capable) (deparsed)
-  32-bit PHV 268 (egress): phv268[31:28] = tcp.dataOffset[3:0] (tagalong capable) (deparsed)
-  32-bit PHV 268 (egress): phv268[27:25] = tcp.res[2:0] (tagalong capable) (deparsed)
-  32-bit PHV 268 (egress): phv268[24:22] = tcp.ecn[2:0] (tagalong capable) (deparsed)
-  32-bit PHV 268 (egress): phv268[21:16] = tcp.ctrl[5:0] (tagalong capable) (deparsed)
-  32-bit PHV 268 (egress): phv268[15:0] = tcp.window[15:0] (tagalong capable) (deparsed)
-  32-bit PHV 269 (egress): phv269[31:16] = tcp.checksum[15:0] (tagalong capable) (deparsed)
-  32-bit PHV 269 (egress): phv269[15:0] = tcp.urgentPtr[15:0] (tagalong capable) (deparsed)
-  32-bit PHV 270 (egress): phv270[31:0] = ethernet.dstAddr[39:8] (tagalong capable) (deparsed)
-  32-bit PHV 271 (egress): phv271[31:0] = ethernet.srcAddr[31:0] (tagalong capable) (deparsed)
+  32-bit PHV 260 (egress): phv260[31:24] = ipv4.ttl[7:0] (tagalong capable) (deparsed)
+  32-bit PHV 260 (egress): phv260[23:16] = ipv4.protocol[7:0] (tagalong capable) (deparsed)
+  32-bit PHV 260 (egress): phv260[15:0] = ipv4.hdrChecksum[15:0] (tagalong capable) (deparsed)
+  32-bit PHV 261 (egress): phv261[31:0] = ipv4.srcAddr[31:0] (tagalong capable) (deparsed)
+  32-bit PHV 262 (egress): phv262[31:0] = ipv4.dstAddr[31:0] (tagalong capable) (deparsed)
+  32-bit PHV 263 (egress): phv263[31:0] = tcp.ackNo[31:0] (tagalong capable) (deparsed)
+  32-bit PHV 263 (egress): phv263[31:16] = udp.length_[15:0] (tagalong capable) (deparsed)
+  32-bit PHV 263 (egress): phv263[15:0] = udp.checksum[15:0] (tagalong capable) (deparsed)
+  32-bit PHV 264 (egress): phv264[31:28] = tcp.dataOffset[3:0] (tagalong capable) (deparsed)
+  32-bit PHV 264 (egress): phv264[27:25] = tcp.res[2:0] (tagalong capable) (deparsed)
+  32-bit PHV 264 (egress): phv264[24:22] = tcp.ecn[2:0] (tagalong capable) (deparsed)
+  32-bit PHV 264 (egress): phv264[21:16] = tcp.ctrl[5:0] (tagalong capable) (deparsed)
+  32-bit PHV 264 (egress): phv264[15:0] = tcp.window[15:0] (tagalong capable) (deparsed)
+  32-bit PHV 265 (egress): phv265[31:16] = tcp.checksum[15:0] (tagalong capable) (deparsed)
+  32-bit PHV 265 (egress): phv265[15:0] = tcp.urgentPtr[15:0] (tagalong capable) (deparsed)
+  32-bit PHV 266 (egress): phv266[31:0] = ethernet.dstAddr[39:8] (tagalong capable) (deparsed)
+  32-bit PHV 267 (egress): phv267[31:0] = ethernet.srcAddr[31:0] (tagalong capable) (deparsed)
   >> 3 in ingress and 8 in egress
 
 Allocations in Group 16 8 bits (tagalong)
   8-bit PHV 288 (ingress): phv288[7:4] = ipv4.version[3:0] (tagalong capable) (deparsed)
   8-bit PHV 288 (ingress): phv288[3:0] = ipv4.ihl[3:0] (tagalong capable) (deparsed)
-  8-bit PHV 289 (ingress): phv289[7:0] = tcp.srcPort[15:8] (tagalong capable) (deparsed)
-  8-bit PHV 289 (ingress): phv289[7:0] = udp.length_[15:8] (tagalong capable) (deparsed)
-  8-bit PHV 290 (ingress): phv290[7:0] = tcp.srcPort[7:0] (tagalong capable) (deparsed)
-  8-bit PHV 290 (ingress): phv290[7:0] = udp.length_[7:0] (tagalong capable) (deparsed)
-  8-bit PHV 291 (ingress): phv291[7:0] = tcp.dstPort[15:8] (tagalong capable) (deparsed)
-  8-bit PHV 292 (ingress): phv292[7:0] = tcp.dstPort[7:0] (tagalong capable) (deparsed)
-  8-bit PHV 296 (egress): phv296[7:4] = ipv4.version[3:0] (tagalong capable) (deparsed)
-  8-bit PHV 296 (egress): phv296[3:0] = ipv4.ihl[3:0] (tagalong capable) (deparsed)
-  8-bit PHV 297 (egress): phv297[7:0] = ipv4.diffserv[7:0] (tagalong capable) (deparsed)
-  8-bit PHV 298 (egress): phv298[7:0] = tcp.srcPort[15:8] (tagalong capable) (deparsed)
-  8-bit PHV 298 (egress): phv298[7:0] = udp.srcPort[15:8] (tagalong capable) (deparsed)
-  8-bit PHV 299 (egress): phv299[7:0] = tcp.srcPort[7:0] (tagalong capable) (deparsed)
-  8-bit PHV 299 (egress): phv299[7:0] = udp.srcPort[7:0] (tagalong capable) (deparsed)
-  8-bit PHV 300 (egress): phv300[7:0] = ethernet.dstAddr[47:40] (tagalong capable) (deparsed)
-  8-bit PHV 301 (egress): phv301[7:0] = ethernet.srcAddr[39:32] (tagalong capable) (deparsed)
-  >> 5 in ingress and 6 in egress
+  8-bit PHV 289 (ingress): phv289[7:0] = tcp.seqNo[7:0] (tagalong capable) (deparsed)
+  8-bit PHV 289 (ingress): phv289[7:0] = udp.srcPort[15:8] (tagalong capable) (deparsed)
+  8-bit PHV 292 (egress): phv292[7:4] = ipv4.version[3:0] (tagalong capable) (deparsed)
+  8-bit PHV 292 (egress): phv292[3:0] = ipv4.ihl[3:0] (tagalong capable) (deparsed)
+  8-bit PHV 293 (egress): phv293[7:0] = ipv4.diffserv[7:0] (tagalong capable) (deparsed)
+  8-bit PHV 294 (egress): phv294[7:0] = tcp.srcPort[15:8] (tagalong capable) (deparsed)
+  8-bit PHV 294 (egress): phv294[7:0] = udp.srcPort[15:8] (tagalong capable) (deparsed)
+  8-bit PHV 295 (egress): phv295[7:0] = tcp.srcPort[7:0] (tagalong capable) (deparsed)
+  8-bit PHV 295 (egress): phv295[7:0] = udp.srcPort[7:0] (tagalong capable) (deparsed)
+  8-bit PHV 296 (egress): phv296[7:0] = ethernet.dstAddr[47:40] (tagalong capable) (deparsed)
+  8-bit PHV 297 (egress): phv297[7:0] = ethernet.srcAddr[39:32] (tagalong capable) (deparsed)
+  >> 2 in ingress and 6 in egress
 
 Allocations in Group 18 16 bits (tagalong)
   16-bit PHV 320 (ingress): phv320[15:8] = ipv4.diffserv[7:0] (tagalong capable) (deparsed)
   16-bit PHV 320 (ingress): phv320[7:0] = ipv4.totalLen[15:8] (tagalong capable) (deparsed)
   16-bit PHV 321 (ingress): phv321[15:8] = ipv4.totalLen[7:0] (tagalong capable) (deparsed)
   16-bit PHV 321 (ingress): phv321[7:0] = ipv4.identification[15:8] (tagalong capable) (deparsed)
-  16-bit PHV 322 (ingress): phv322[15:0] = tcp.seqNo[31:16] (tagalong capable) (deparsed)
-  16-bit PHV 322 (ingress): phv322[15:0] = udp.checksum[15:0] (tagalong capable) (deparsed)
-  16-bit PHV 323 (ingress): phv323[15:0] = tcp.seqNo[15:0] (tagalong capable) (deparsed)
-  16-bit PHV 324 (ingress): phv324[15:0] = tcp.ackNo[31:16] (tagalong capable) (deparsed)
-  16-bit PHV 325 (ingress): phv325[15:0] = tcp.ackNo[15:0] (tagalong capable) (deparsed)
-  16-bit PHV 332 (egress): phv332[15:0] = ipv4.totalLen[15:0] (tagalong capable) (deparsed)
-  16-bit PHV 333 (egress): phv333[15:0] = ipv4.identification[15:0] (tagalong capable) (deparsed)
-  16-bit PHV 334 (egress): phv334[15:13] = ipv4.flags[2:0] (tagalong capable) (deparsed)
-  16-bit PHV 334 (egress): phv334[12:0] = ipv4.fragOffset[12:0] (tagalong capable) (deparsed)
-  16-bit PHV 335 (egress): phv335[15:0] = tcp.dstPort[15:0] (tagalong capable) (deparsed)
-  >> 6 in ingress and 4 in egress
-
-Allocations in Group 19 16 bits (tagalong)
-  16-bit PHV 336 (egress): phv336[15:0] = tcp.seqNo[31:16] (tagalong capable) (deparsed)
-  16-bit PHV 336 (egress): phv336[15:0] = udp.dstPort[15:0] (tagalong capable) (deparsed)
-  16-bit PHV 337 (egress): phv337[15:0] = tcp.seqNo[15:0] (tagalong capable) (deparsed)
-  16-bit PHV 338 (egress): phv338[15:8] = ethernet.dstAddr[7:0] (tagalong capable) (deparsed)
-  16-bit PHV 338 (egress): phv338[7:0] = ethernet.srcAddr[47:40] (tagalong capable) (deparsed)
-  16-bit PHV 339 (egress): phv339[15:0] = ethernet.etherType[15:0] (tagalong capable) (deparsed)
-  16-bit PHV 340 (egress): phv340[15:7] = packet_out_hdr.egress_port[8:0] (tagalong capable) (deparsed)
-  16-bit PHV 340 (egress): phv340[15:7] = packet_in_hdr.ingress_port[8:0] (tagalong capable) (deparsed)
-  16-bit PHV 340 (egress): phv340[6:0] = packet_out_hdr._padding[6:0] (tagalong capable) (deparsed)
-  16-bit PHV 340 (egress): phv340[6:0] = packet_in_hdr._padding[6:0] (tagalong capable) (deparsed)
-  >> 0 in ingress and 5 in egress
+  16-bit PHV 322 (ingress): phv322[15:0] = tcp.ackNo[31:16] (tagalong capable) (deparsed)
+  16-bit PHV 322 (ingress): phv322[15:0] = udp.dstPort[15:0] (tagalong capable) (deparsed)
+  16-bit PHV 323 (ingress): phv323[15:0] = tcp.ackNo[15:0] (tagalong capable) (deparsed)
+  16-bit PHV 326 (egress): phv326[15:0] = ipv4.totalLen[15:0] (tagalong capable) (deparsed)
+  16-bit PHV 327 (egress): phv327[15:0] = ipv4.identification[15:0] (tagalong capable) (deparsed)
+  16-bit PHV 328 (egress): phv328[15:13] = ipv4.flags[2:0] (tagalong capable) (deparsed)
+  16-bit PHV 328 (egress): phv328[12:0] = ipv4.fragOffset[12:0] (tagalong capable) (deparsed)
+  16-bit PHV 329 (egress): phv329[15:0] = tcp.dstPort[15:0] (tagalong capable) (deparsed)
+  16-bit PHV 329 (egress): phv329[15:0] = udp.dstPort[15:0] (tagalong capable) (deparsed)
+  16-bit PHV 330 (egress): phv330[15:0] = tcp.seqNo[31:16] (tagalong capable) (deparsed)
+  16-bit PHV 331 (egress): phv331[15:0] = tcp.seqNo[15:0] (tagalong capable) (deparsed)
+  16-bit PHV 332 (egress): phv332[15:8] = ethernet.dstAddr[7:0] (tagalong capable) (deparsed)
+  16-bit PHV 332 (egress): phv332[7:0] = ethernet.srcAddr[47:40] (tagalong capable) (deparsed)
+  16-bit PHV 333 (egress): phv333[15:0] = ethernet.etherType[15:0] (tagalong capable) (deparsed)
+  16-bit PHV 334 (egress): phv334[15:7] = packet_out_hdr.egress_port[8:0] (tagalong capable) (deparsed)
+  16-bit PHV 334 (egress): phv334[15:7] = packet_in_hdr.ingress_port[8:0] (tagalong capable) (deparsed)
+  16-bit PHV 334 (egress): phv334[6:0] = packet_out_hdr._padding[6:0] (tagalong capable) (deparsed)
+  16-bit PHV 334 (egress): phv334[6:0] = packet_in_hdr._padding[6:0] (tagalong capable) (deparsed)
+  >> 4 in ingress and 9 in egress
 
 
 Final POV layout (ingress):
- 32: --validity_check--packet_in_hdr (ingress) in container 67
- 33: --validity_check--packet_out_hdr (ingress) in container 67
- 34: --validity_check--ethernet (ingress) in container 67
- 35: --validity_check--ipv4 (ingress) in container 67
- 36: --validity_check--tcp (ingress) in container 67
- 37: --validity_check--udp (ingress) in container 67
- 38: --validity_check--metadata_bridge (ingress) in container 67
+ 32: --validity_check--packet_in_hdr (ingress) in container 68
+ 33: --validity_check--packet_out_hdr (ingress) in container 68
+ 34: --validity_check--ethernet (ingress) in container 68
+ 35: --validity_check--ipv4 (ingress) in container 68
+ 36: --validity_check--tcp (ingress) in container 68
+ 37: --validity_check--udp (ingress) in container 68
+ 38: --validity_check--metadata_bridge (ingress) in container 68
 
 Final POV layout (egress):
   0: --validity_check--packet_in_hdr (egress) in container 81
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/parde.calcfields.log b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/parde.calcfields.log
index 3377828..e9b6845 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/parde.calcfields.log
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/parde.calcfields.log
@@ -1,37 +1,35 @@
 +---------------------------------------------------------------------+
 |  Log file: parde.calcfields.log                                     |
 |  Compiler version: 5.1.0 (fca32d1)                                  |
-|  Created on: Tue Sep 12 11:16:41 2017                               |
+|  Created on: Wed Sep 13 01:00:26 2017                               |
 +---------------------------------------------------------------------+
 
 Reserving 0 16-bit ingress tphvs for residual checksums
 Reserving 0 16-bit egress tphvs for residual checksums
 Need 0 POV bits for checksum update control
-Number of reachable states from state parse_tcp//spilled : 1
-Number of reachable states from state parse_tcp : 2
+Number of reachable states from state parse_tcp : 1
 Number of reachable states from state parse_udp : 1
-Number of reachable states from state parse_ipv4 : 4
-Number of reachable states from state parse_ethernet : 5
-Number of reachable states from state parse_pkt_in : 6
-Number of reachable states from state parse_pkt_out : 6
-Number of reachable states from state default_parser : 7
-Number of reachable states from state start : 9
-Number of reachable states from state <POV initialization>_<Ingress intrinsic metadata>_<Phase 0> : 10
-Number of reachable states from state <Shim start state> : 11
+Number of reachable states from state parse_ipv4 : 3
+Number of reachable states from state parse_ethernet : 4
+Number of reachable states from state parse_pkt_in : 5
+Number of reachable states from state parse_pkt_out : 5
+Number of reachable states from state default_parser : 6
+Number of reachable states from state start : 8
+Number of reachable states from state <POV initialization>_<Ingress intrinsic metadata>_<Phase 0> : 9
+Number of reachable states from state <Shim start state> : 10
 parser_state_calculations:[
-	parse_tcp_140137374004176
-	parse_tcp_140137367945424
-	parse_udp_140137367946384
-	parse_ipv4_140137373101392
-	parse_ethernet_140137373098256
-	parse_pkt_in_140137373101328
-	parse_pkt_out_140137367947472
-	default_parser_140137367947280
-	start_140137373100368
-	<Phase 0>_140137372910288
-	<Ingress intrinsic metadata>_140137372909968
-	<POV initialization>_140137372910672
-	<Shim start state>_140137372910992
+	parse_tcp_139746977017552
+	parse_udp_139746976764496
+	parse_ipv4_139746977014096
+	parse_ethernet_139746977279504
+	parse_pkt_in_139746977016656
+	parse_pkt_out_139746976765584
+	default_parser_139746976765392
+	start_139746977016208
+	<Phase 0>_139746976989328
+	<Ingress intrinsic metadata>_139746977013520
+	<POV initialization>_139746976989712
+	<Shim start state>_139746976990032
 ]
 parser_calculations: [
 	
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/parde.config.log b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/parde.config.log
index 23dd4fa..17a34dc 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/parde.config.log
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/parde.config.log
@@ -1,7 +1,7 @@
 +---------------------------------------------------------------------+
 |  Log file: parde.config.log                                         |
 |  Compiler version: 5.1.0 (fca32d1)                                  |
-|  Created on: Tue Sep 12 11:16:41 2017                               |
+|  Created on: Wed Sep 13 01:00:26 2017                               |
 +---------------------------------------------------------------------+
 
 Configuring deparser.inp.iim.ii_phv_csum.csum_cfg[0].csum_cfg_entry[0].zero_m_s_b = 1
@@ -15994,9 +15994,9 @@
    0 | I g0w0:   [POV[31:0]]
    1 | I g0w1:   [ipv4.protocol, ipv4.hdrChecksum, ipv4.srcAddr[31:24]]
    2 | I g0w2:   [ipv4.dstAddr]
-   3 | I g0w3:   [ethernet.dstAddr[39:8]]
-   4 | I g0w4:   [ethernet.srcAddr[31:0]]
-   5 | I g0w5:   [udp.srcPort, udp.dstPort]
+   3 | I g0w3:   [tcp.dstPort[7:0], tcp.seqNo[31:8]]
+   4 | I g0w4:   [ethernet.dstAddr[39:8]]
+   5 | I g0w5:   [ethernet.srcAddr[31:0]]
    6 |   g0w6:   
    7 |   g0w7:   
    8 |   g0w8:   
@@ -16060,11 +16060,11 @@
      | 
 8 bits
   64 | I g2w0:   [ipv4.srcAddr[23:16]]
-  65 | I g2w1:   [ethernet.dstAddr[47:40]]
-  66 | I g2w2:   [ethernet.srcAddr[39:32]]
-  67 | I g2w3:   [POV[39:32]]
-  68 | I g2w4:   [ig_intr_md_for_tm.drop_ctl]
-  69 |   g2w5:   
+  65 | I g2w1:   [tcp.srcPort[15:8], udp.srcPort[7:0]]
+  66 | I g2w2:   [ethernet.dstAddr[47:40]]
+  67 | I g2w3:   [ethernet.srcAddr[39:32]]
+  68 | I g2w4:   [POV[39:32]]
+  69 | I g2w5:   [ig_intr_md_for_tm.drop_ctl]
   70 |   g2w6:   
   71 |   g2w7:   
   72 |   g2w8:   
@@ -16131,11 +16131,11 @@
  129 | I g4w1:   [packet_out_hdr.egress_port, packet_out_hdr._padding, packet_in_hdr.ingress_port, packet_in_hdr._padding]
  130 | I g4w2:   [ig_intr_md_for_tm.ucast_egress_port]
  131 | I g4w3:   [ipv4.srcAddr[15:0]]
- 132 | I g4w4:   [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]
- 133 | I g4w5:   [ethernet.etherType]
- 134 | I g4w6:   [ecmp_metadata.group_id]
- 135 | I g4w7:   [ecmp_metadata.selector]
- 136 |   g4w8:   
+ 132 | I g4w4:   [tcp.srcPort[7:0], tcp.dstPort[15:8]]
+ 133 | I g4w5:   [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]
+ 134 | I g4w6:   [ethernet.etherType]
+ 135 | I g4w7:   [ecmp_metadata.group_id]
+ 136 | I g4w8:   [ecmp_metadata.selector]
  137 |   g4w9:   
  138 |   g4w10:  
  139 |   g4w11:  
@@ -16232,21 +16232,21 @@
      | 
 32 bits
  256 | I g8w0:   [ipv4.identification[7:0], ipv4.flags, ipv4.fragOffset, ipv4.ttl]
- 257 | I g8w1:   [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]
+ 257 | I g8w1:   [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window, udp.length_, udp.checksum]
  258 | I g8w2:   [tcp.checksum, tcp.urgentPtr]
  259 |   g8w3:   
- 260 |   g8w4:   
- 261 |   g8w5:   
- 262 |   g8w6:   
- 263 |   g8w7:   
- 264 | E g8w8:   [ipv4.ttl, ipv4.protocol, ipv4.hdrChecksum]
- 265 | E g8w9:   [ipv4.srcAddr]
- 266 | E g8w10:  [ipv4.dstAddr]
- 267 | E g8w11:  [tcp.ackNo, udp.length_, udp.checksum]
- 268 | E g8w12:  [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]
- 269 | E g8w13:  [tcp.checksum, tcp.urgentPtr]
- 270 | E g8w14:  [ethernet.dstAddr[39:8]]
- 271 | E g8w15:  [ethernet.srcAddr[31:0]]
+ 260 | E g8w4:   [ipv4.ttl, ipv4.protocol, ipv4.hdrChecksum]
+ 261 | E g8w5:   [ipv4.srcAddr]
+ 262 | E g8w6:   [ipv4.dstAddr]
+ 263 | E g8w7:   [tcp.ackNo, udp.length_, udp.checksum]
+ 264 | E g8w8:   [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]
+ 265 | E g8w9:   [tcp.checksum, tcp.urgentPtr]
+ 266 | E g8w10:  [ethernet.dstAddr[39:8]]
+ 267 | E g8w11:  [ethernet.srcAddr[31:0]]
+ 268 |   g8w12:  
+ 269 |   g8w13:  
+ 270 |   g8w14:  
+ 271 |   g8w15:  
  272 |   g8w16:  
  273 |   g8w17:  
  274 |   g8w18:  
@@ -16266,19 +16266,19 @@
      | 
 8 bits
  288 | I g9w0:   [ipv4.version, ipv4.ihl]
- 289 | I g9w1:   [tcp.srcPort[15:8], udp.length_[15:8]]
- 290 | I g9w2:   [tcp.srcPort[7:0], udp.length_[7:0]]
- 291 | I g9w3:   [tcp.dstPort[15:8]]
- 292 | I g9w4:   [tcp.dstPort[7:0]]
- 293 |   g9w5:   
- 294 |   g9w6:   
- 295 |   g9w7:   
- 296 | E g9w8:   [ipv4.version, ipv4.ihl]
- 297 | E g9w9:   [ipv4.diffserv]
- 298 | E g9w10:  [tcp.srcPort[15:8], udp.srcPort[15:8]]
- 299 | E g9w11:  [tcp.srcPort[7:0], udp.srcPort[7:0]]
- 300 | E g9w12:  [ethernet.dstAddr[47:40]]
- 301 | E g9w13:  [ethernet.srcAddr[39:32]]
+ 289 | I g9w1:   [tcp.seqNo[7:0], udp.srcPort[15:8]]
+ 290 |   g9w2:   
+ 291 |   g9w3:   
+ 292 | E g9w4:   [ipv4.version, ipv4.ihl]
+ 293 | E g9w5:   [ipv4.diffserv]
+ 294 | E g9w6:   [tcp.srcPort[15:8], udp.srcPort[15:8]]
+ 295 | E g9w7:   [tcp.srcPort[7:0], udp.srcPort[7:0]]
+ 296 | E g9w8:   [ethernet.dstAddr[47:40]]
+ 297 | E g9w9:   [ethernet.srcAddr[39:32]]
+ 298 |   g9w10:  
+ 299 |   g9w11:  
+ 300 |   g9w12:  
+ 301 |   g9w13:  
  302 |   g9w14:  
  303 |   g9w15:  
  304 |   g9w16:  
@@ -16301,25 +16301,25 @@
 16 bits
  320 | I g10w0:  [ipv4.diffserv, ipv4.totalLen[15:8]]
  321 | I g10w1:  [ipv4.totalLen[7:0], ipv4.identification[15:8]]
- 322 | I g10w2:  [tcp.seqNo[31:16], udp.checksum]
- 323 | I g10w3:  [tcp.seqNo[15:0]]
- 324 | I g10w4:  [tcp.ackNo[31:16]]
- 325 | I g10w5:  [tcp.ackNo[15:0]]
- 326 |   g10w6:  
- 327 |   g10w7:  
- 328 |   g10w8:  
- 329 |   g10w9:  
- 330 |   g10w10: 
- 331 |   g10w11: 
- 332 | E g10w12: [ipv4.totalLen]
- 333 | E g10w13: [ipv4.identification]
- 334 | E g10w14: [ipv4.flags, ipv4.fragOffset]
- 335 | E g10w15: [tcp.dstPort]
- 336 | E g10w16: [tcp.seqNo[31:16], udp.dstPort]
- 337 | E g10w17: [tcp.seqNo[15:0]]
- 338 | E g10w18: [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]
- 339 | E g10w19: [ethernet.etherType]
- 340 | E g10w20: [packet_out_hdr.egress_port, packet_out_hdr._padding, packet_in_hdr.ingress_port, packet_in_hdr._padding]
+ 322 | I g10w2:  [tcp.ackNo[31:16], udp.dstPort]
+ 323 | I g10w3:  [tcp.ackNo[15:0]]
+ 324 |   g10w4:  
+ 325 |   g10w5:  
+ 326 | E g10w6:  [ipv4.totalLen]
+ 327 | E g10w7:  [ipv4.identification]
+ 328 | E g10w8:  [ipv4.flags, ipv4.fragOffset]
+ 329 | E g10w9:  [tcp.dstPort, udp.dstPort]
+ 330 | E g10w10: [tcp.seqNo[31:16]]
+ 331 | E g10w11: [tcp.seqNo[15:0]]
+ 332 | E g10w12: [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]
+ 333 | E g10w13: [ethernet.etherType]
+ 334 | E g10w14: [packet_out_hdr.egress_port, packet_out_hdr._padding, packet_in_hdr.ingress_port, packet_in_hdr._padding]
+ 335 |   g10w15: 
+ 336 |   g10w16: 
+ 337 |   g10w17: 
+ 338 |   g10w18: 
+ 339 |   g10w19: 
+ 340 |   g10w20: 
  341 |   g10w21: 
  342 |   g10w22: 
  343 |   g10w23: 
@@ -16363,7 +16363,6 @@
    7: parse_pkt_out
    8: <POV initialization>_<Ingress intrinsic metadata>_<Phase 0>
    9: start
-  10: parse_tcp//spilled
 Egress:
    0: <Shim start state>
    1: parse_ethernet
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/parde.error.log b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/parde.error.log
index 10e9c8b..cc9ca4f 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/parde.error.log
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/parde.error.log
@@ -1,6 +1,6 @@
 +---------------------------------------------------------------------+
 |  Log file: parde.error.log                                          |
 |  Compiler version: 5.1.0 (fca32d1)                                  |
-|  Created on: Tue Sep 12 11:16:41 2017                               |
+|  Created on: Wed Sep 13 01:00:26 2017                               |
 +---------------------------------------------------------------------+
 
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/parde.log b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/parde.log
index c9e0bcf..a0b09fd 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/parde.log
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/parde.log
@@ -1,7 +1,7 @@
 +---------------------------------------------------------------------+
 |  Log file: parde.log                                                |
 |  Compiler version: 5.1.0 (fca32d1)                                  |
-|  Created on: Tue Sep 12 11:16:41 2017                               |
+|  Created on: Wed Sep 13 01:00:26 2017                               |
 +---------------------------------------------------------------------+
 
 ># Begin digest init (pre-PHV)
@@ -18,14 +18,14 @@
 ># Begin unroll of HLIR parse graph
 >## Create shadow parse graph and find loops
 >## Entrypoint 'p4_parse_state.start'
-Creating shadow state: 'p4_parse_state.start' -> 'shadow_state (start, 140137368047184)'
-Creating shadow state: 'p4_parse_state.parse_pkt_in' -> 'shadow_state (parse_pkt_in, 140137373098640)'
-Creating shadow state: 'p4_parse_state.parse_ethernet' -> 'shadow_state (parse_ethernet, 140137373099280)'
-Creating shadow state: 'p4_parse_state.parse_ipv4' -> 'shadow_state (parse_ipv4, 140137373098448)'
-Creating shadow state: 'p4_parse_state.parse_tcp' -> 'shadow_state (parse_tcp, 140137373099344)'
-Creating shadow state: 'p4_parse_state.parse_udp' -> 'shadow_state (parse_udp, 140137373098064)'
-Creating shadow state: 'p4_parse_state.default_parser' -> 'shadow_state (default_parser, 140137373099408)'
-Creating shadow state: 'p4_parse_state.parse_pkt_out' -> 'shadow_state (parse_pkt_out, 140137373099472)'
+Creating shadow state: 'p4_parse_state.start' -> 'shadow_state (start, 139746977279568)'
+Creating shadow state: 'p4_parse_state.parse_pkt_in' -> 'shadow_state (parse_pkt_in, 139746977279376)'
+Creating shadow state: 'p4_parse_state.parse_ethernet' -> 'shadow_state (parse_ethernet, 139746977014608)'
+Creating shadow state: 'p4_parse_state.parse_ipv4' -> 'shadow_state (parse_ipv4, 139746977014224)'
+Creating shadow state: 'p4_parse_state.parse_tcp' -> 'shadow_state (parse_tcp, 139746977014672)'
+Creating shadow state: 'p4_parse_state.parse_udp' -> 'shadow_state (parse_udp, 139746977013840)'
+Creating shadow state: 'p4_parse_state.default_parser' -> 'shadow_state (default_parser, 139746977014736)'
+Creating shadow state: 'p4_parse_state.parse_pkt_out' -> 'shadow_state (parse_pkt_out, 139746977014800)'
 ># End unroll of HLIR parse graph
 ># Begin deparser init
 >## Create records for gress 0
@@ -89,27 +89,27 @@
 Stretch extraction of ingress_port to state <Ingress intrinsic metadata> offset 7
 Stretch extraction of ig_intr_md.ingress_port to state <_parse_bridged_ingress_intrinsic_metadata> offset 7
 ># Begin scraping deparser POV allocation from raw PHV allocation
-PHV layout: [0, 0, 0, 0, 67, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None]
+PHV layout: [0, 0, 0, 0, 68, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None]
 >## Scraping individual POV records
 POV 32 -> packet_in_hdr
 POV 33 -> packet_out_hdr
 POV 34 -> ethernet
 POV 35 -> ipv4
 POV 36 -> tcp
-POV 38 -> pov_bmeta
 POV 37 -> udp
+POV 38 -> pov_bmeta
 >## Setting up array bits
 ># End scraping deparser POV allocation from raw PHV allocation
 ># Begin parser POV rewrite
 >## Filling in POV init state
 >## Rewriting parser POV extractions
-POV for metadata_bridge -> PHV 67 |= 0x40
-POV for packet_in_hdr -> PHV 67 |= 0x1
-POV for ethernet -> PHV 67 |= 0x4
-POV for ipv4 -> PHV 67 |= 0x8
-POV for tcp -> PHV 67 |= 0x10
-POV for udp -> PHV 67 |= 0x20
-POV for packet_out_hdr -> PHV 67 |= 0x2
+POV for metadata_bridge -> PHV 68 |= 0x40
+POV for packet_in_hdr -> PHV 68 |= 0x1
+POV for ethernet -> PHV 68 |= 0x4
+POV for ipv4 -> PHV 68 |= 0x8
+POV for tcp -> PHV 68 |= 0x10
+POV for udp -> PHV 68 |= 0x20
+POV for packet_out_hdr -> PHV 68 |= 0x2
 POV for ig_intr_md -> dropped (no deparser record)
 POV for _bridged_intr_md_ -> PHV 0 |= 0x10000
 >## Sampling not detected, deparsing at least 1 POV byte
@@ -135,11 +135,6 @@
 POV for tcp -> PHV 81 |= 0x10
 POV for udp -> PHV 81 |= 0x20
 POV for packet_out_hdr -> PHV 81 |= 0x2
-Linear Chain parse_tcp -> parse_tcp//spilled
-Try merge parse_tcp <- parse_tcp//spilled
-merge output at offset 24
-Ran out of 8b extractors
-states will not be partially merged since S2 is end of chain
 Linear Chain parse_pkt_in -> parse_ethernet
 Try merge parse_pkt_in <- parse_ethernet
 Multiple paths to state S2 : parse_ethernet <- 3
@@ -199,7 +194,7 @@
 Multiple paths to state S2 : start <- 2
 Remove state <Ingress intrinsic metadata>
 Remove state <Phase 0>
-assign ids to 11 states, dir = 0
+assign ids to 10 states, dir = 0
 ------
 State : <Shim start state>
 shift: 0B
@@ -212,7 +207,7 @@
 State : parse_pkt_in
 shift: 2B
 match_reservations: []
-outputs[addr, width]: ([67, 8], [129, 16])
+outputs[addr, width]: ([68, 8], [129, 16])
 match_extractions: []
 next state parse_ethernet val 0 mask [False]
 parent state start
@@ -221,7 +216,7 @@
 State : parse_ethernet
 shift: 14B
 match_reservations: []
-outputs[addr, width]: ([67, 8], [65, 8], [3, 32], [132, 16], [66, 8], [4, 32], [133, 16])
+outputs[addr, width]: ([68, 8], [66, 8], [4, 32], [133, 16], [67, 8], [5, 32], [134, 16])
 branch on = etherType, offset = 96b, dst = parse_ethernet
 match_extractions: [match_window(hw_id=0, width=16)]
 match key = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]
@@ -234,30 +229,29 @@
 State : parse_ipv4
 shift: 20B
 match_reservations: []
-outputs[addr, width]: ([67, 8], [288, 8], [320, 16], [321, 16], [256, 32], [1, 32], [64, 8], [131, 16], [2, 32])
+outputs[addr, width]: ([68, 8], [288, 8], [320, 16], [321, 16], [256, 32], [1, 32], [64, 8], [131, 16], [2, 32])
 branch on = fragOffset, offset = 51b, dst = parse_ipv4
 branch on = protocol, offset = 72b, dst = parse_ipv4
-match_extractions: [match_window(hw_id=0, width=16), match_window(hw_id=2, width=8)]
-match key = [8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, None, None, None]
+match_extractions: [match_window(hw_id=2, width=8), match_window(hw_id=0, width=16)]
 match key = [0, 1, 2, 3, 4, 5, 6, 7]
+match key = [8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, None, None, None]
 next state parse_tcp val 6 mask [True, True, True, True, True, True, True, True, True, True, True, True, True, True, True, True, True, True, True, True, True]
 next state parse_udp val 17 mask [True, True, True, True, True, True, True, True, True, True, True, True, True, True, True, True, True, True, True, True, True]
 parent state parse_ethernet
 
 ------
 State : parse_tcp
-shift: 0B
+shift: 20B
 match_reservations: []
-outputs[addr, width]: ([67, 8], [289, 8], [290, 8], [291, 8], [322, 16], [323, 16], [324, 16], [325, 16], [257, 32], [258, 32])
+outputs[addr, width]: ([68, 8], [65, 8], [132, 16], [3, 32], [289, 8], [322, 16], [323, 16], [257, 32], [258, 32])
 match_extractions: []
-next state parse_tcp//spilled val 0 mask [False]
 parent state parse_ipv4
 
 ------
 State : parse_udp
 shift: 8B
 match_reservations: []
-outputs[addr, width]: ([67, 8], [5, 32], [289, 8], [290, 8], [322, 16])
+outputs[addr, width]: ([68, 8], [289, 8], [65, 8], [322, 16], [257, 32])
 match_extractions: []
 parent state parse_ipv4
 
@@ -277,7 +271,7 @@
 State : parse_pkt_out
 shift: 2B
 match_reservations: []
-outputs[addr, width]: ([67, 8], [129, 16])
+outputs[addr, width]: ([68, 8], [129, 16])
 match_extractions: []
 next state parse_ethernet val 0 mask [False]
 parent state default_parser
@@ -290,9 +284,9 @@
 branch on = None, offset = 0b, dst = <POV initialization>_<Ingress intrinsic metadata>_<Phase 0>
 branch on = None, offset = 64b, dst = <POV initialization>_<Ingress intrinsic metadata>_<Phase 0>
 branch promise on = ingress_port, offset = 7b, dst = default_parser
-match_extractions: [match_window(hw_id=0, width=16), match_window(hw_id=2, width=8)]
-match key = [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, 8]
+match_extractions: [match_window(hw_id=2, width=8), match_window(hw_id=0, width=16)]
 match key = [0, 1, 2, 3, 4, 5, 6, 7]
+match key = [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, 8]
 next state start val 0 mask [False]
 parent state <Shim start state>
 
@@ -300,7 +294,7 @@
 State : start
 shift: 0B
 match_reservations: [match_window(hw_id=0, width=16)]
-outputs[addr, width]: ([67, 8],)
+outputs[addr, width]: ([68, 8],)
 branch on = None, offset = 96b, dst = start
 match_extractions: [match_window(hw_id=2, width=8)]
 match key = [0, 1, 2, 3, 4, 5, 6, 7]
@@ -308,14 +302,6 @@
 next state default_parser val 0 mask [False]
 parent state <POV initialization>_<Ingress intrinsic metadata>_<Phase 0>
 
-------
-State : parse_tcp//spilled
-shift: 20B
-match_reservations: []
-outputs[addr, width]: ([292, 8],)
-match_extractions: []
-parent state parse_tcp
-
 Linear Chain parse_pkt_in -> parse_ethernet
 Try merge parse_pkt_in <- parse_ethernet
 Multiple paths to state S2 : parse_ethernet <- 3
@@ -435,7 +421,7 @@
 State : parse_ethernet
 shift: 14B
 match_reservations: []
-outputs[addr, width]: ([81, 8], [300, 8], [270, 32], [338, 16], [301, 8], [271, 32], [339, 16])
+outputs[addr, width]: ([81, 8], [296, 8], [266, 32], [332, 16], [297, 8], [267, 32], [333, 16])
 branch on = etherType, offset = 96b, dst = parse_ethernet
 match_extractions: [match_window(hw_id=0, width=16)]
 match key = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]
@@ -448,12 +434,12 @@
 State : parse_ipv4
 shift: 20B
 match_reservations: []
-outputs[addr, width]: ([81, 8], [296, 8], [297, 8], [332, 16], [333, 16], [334, 16], [264, 32], [265, 32], [266, 32])
+outputs[addr, width]: ([81, 8], [292, 8], [293, 8], [326, 16], [327, 16], [328, 16], [260, 32], [261, 32], [262, 32])
 branch on = fragOffset, offset = 51b, dst = parse_ipv4
 branch on = protocol, offset = 72b, dst = parse_ipv4
-match_extractions: [match_window(hw_id=0, width=16), match_window(hw_id=2, width=8)]
-match key = [8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, None, None, None]
+match_extractions: [match_window(hw_id=2, width=8), match_window(hw_id=0, width=16)]
 match key = [0, 1, 2, 3, 4, 5, 6, 7]
+match key = [8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, None, None, None]
 next state parse_tcp val 6 mask [True, True, True, True, True, True, True, True, True, True, True, True, True, True, True, True, True, True, True, True, True]
 next state parse_udp val 17 mask [True, True, True, True, True, True, True, True, True, True, True, True, True, True, True, True, True, True, True, True, True]
 parent state parse_ethernet
@@ -462,7 +448,7 @@
 State : parse_tcp
 shift: 20B
 match_reservations: []
-outputs[addr, width]: ([81, 8], [298, 8], [299, 8], [335, 16], [336, 16], [337, 16], [267, 32], [268, 32], [269, 32])
+outputs[addr, width]: ([81, 8], [294, 8], [295, 8], [329, 16], [330, 16], [331, 16], [263, 32], [264, 32], [265, 32])
 match_extractions: []
 parent state parse_ipv4
 
@@ -470,7 +456,7 @@
 State : parse_udp
 shift: 8B
 match_reservations: []
-outputs[addr, width]: ([81, 8], [298, 8], [299, 8], [336, 16], [267, 32])
+outputs[addr, width]: ([81, 8], [294, 8], [295, 8], [329, 16], [263, 32])
 match_extractions: []
 parent state parse_ipv4
 
@@ -490,7 +476,7 @@
 State : parse_pkt_out
 shift: 2B
 match_reservations: []
-outputs[addr, width]: ([81, 8], [340, 16])
+outputs[addr, width]: ([81, 8], [334, 16])
 match_extractions: []
 next state parse_ethernet val 0 mask [False]
 parent state default_parser
@@ -503,9 +489,9 @@
 branch on = None, offset = 24b, dst = <POV initialization>_<Egress intrinsic metadata>_<POV skip>_<_parse_bridged_ingress_intrinsic_metadata>_start
 branch on = None, offset = 168b, dst = <POV initialization>_<Egress intrinsic metadata>_<POV skip>_<_parse_bridged_ingress_intrinsic_metadata>_start
 branch promise on = ingress_port, offset = 63b, dst = default_parser
-match_extractions: [match_window(hw_id=0, width=16), match_window(hw_id=2, width=8), match_window(hw_id=3, width=8)]
-match key = [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None]
+match_extractions: [match_window(hw_id=2, width=8), match_window(hw_id=0, width=16), match_window(hw_id=3, width=8)]
 match key = [8, 9, 10, 11, 12, 13, 14, 15]
+match key = [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None]
 match key = [0, 1, 2, 3, 4, 5, 6, 7]
 next state parse_pkt_in val 0 mask [True, True, True, True, True, True, True, True]
 next state default_parser val 0 mask [False]
@@ -515,7 +501,7 @@
 State : parse_pkt_in
 shift: 2B
 match_reservations: []
-outputs[addr, width]: ([81, 8], [340, 16])
+outputs[addr, width]: ([81, 8], [334, 16])
 match_extractions: []
 next state parse_ethernet val 0 mask [False]
 parent state <POV initialization>_<Egress intrinsic metadata>_<POV skip>_<_parse_bridged_ingress_intrinsic_metadata>_start
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/parser.characterize.log b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/parser.characterize.log
index 7e22359..15b2723 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/parser.characterize.log
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/parser.characterize.log
@@ -1,6 +1,6 @@
 +---------------------------------------------------------------------+
 |  Log file: parser.characterize.log                                  |
 |  Compiler version: 5.1.0 (fca32d1)                                  |
-|  Created on: Tue Sep 12 11:16:41 2017                               |
+|  Created on: Wed Sep 13 01:00:26 2017                               |
 +---------------------------------------------------------------------+
 
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/transform.log b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/transform.log
index 5cd34c4..7994e7e 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/transform.log
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/transform.log
@@ -1,7 +1,7 @@
 +---------------------------------------------------------------------+
 |  Log file: transform.log                                            |
 |  Compiler version: 5.1.0 (fca32d1)                                  |
-|  Created on: Tue Sep 12 11:16:41 2017                               |
+|  Created on: Wed Sep 13 01:00:26 2017                               |
 +---------------------------------------------------------------------+
 
 -------------------------------
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/name_lookup.c b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/name_lookup.c
index a1252ec..080748a 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/name_lookup.c
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/name_lookup.c
@@ -77,17 +77,17 @@
         break;
         case 3 :
         {
-          return "I [ethernet.dstAddr[39:8]]";
+          return "I [tcp.dstPort[7:0], tcp.seqNo[31:8]]";
         }
         break;
         case 4 :
         {
-          return "I [ethernet.srcAddr[31:0]]";
+          return "I [ethernet.dstAddr[39:8]]";
         }
         break;
         case 5 :
         {
-          return "I [udp.srcPort, udp.dstPort]";
+          return "I [ethernet.srcAddr[31:0]]";
         }
         break;
         case 64 :
@@ -97,21 +97,26 @@
         break;
         case 65 :
         {
-          return "I [ethernet.dstAddr[47:40]]";
+          return "I [tcp.srcPort[15:8], udp.srcPort[7:0]]";
         }
         break;
         case 66 :
         {
-          return "I [ethernet.srcAddr[39:32]]";
+          return "I [ethernet.dstAddr[47:40]]";
         }
         break;
         case 67 :
         {
-          return "I [POV[39:32]]";
+          return "I [ethernet.srcAddr[39:32]]";
         }
         break;
         case 68 :
         {
+          return "I [POV[39:32]]";
+        }
+        break;
+        case 69 :
+        {
           return "I [ig_intr_md_for_tm.drop_ctl]";
         }
         break;
@@ -147,21 +152,26 @@
         break;
         case 132 :
         {
-          return "I [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]";
+          return "I [tcp.srcPort[7:0], tcp.dstPort[15:8]]";
         }
         break;
         case 133 :
         {
-          return "I [ethernet.etherType]";
+          return "I [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]";
         }
         break;
         case 134 :
         {
-          return "I [ecmp_metadata.group_id]";
+          return "I [ethernet.etherType]";
         }
         break;
         case 135 :
         {
+          return "I [ecmp_metadata.group_id]";
+        }
+        break;
+        case 136 :
+        {
           return "I [ecmp_metadata.selector]";
         }
         break;
@@ -177,7 +187,7 @@
         break;
         case 257 :
         {
-          return "I [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]";
+          return "I [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window, udp.length_, udp.checksum]";
         }
         break;
         case 258 :
@@ -185,42 +195,42 @@
           return "I [tcp.checksum, tcp.urgentPtr]";
         }
         break;
-        case 264 :
+        case 260 :
         {
           return "E [ipv4.ttl, ipv4.protocol, ipv4.hdrChecksum]";
         }
         break;
-        case 265 :
+        case 261 :
         {
           return "E [ipv4.srcAddr]";
         }
         break;
-        case 266 :
+        case 262 :
         {
           return "E [ipv4.dstAddr]";
         }
         break;
-        case 267 :
+        case 263 :
         {
           return "E [tcp.ackNo, udp.length_, udp.checksum]";
         }
         break;
-        case 268 :
+        case 264 :
         {
           return "E [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]";
         }
         break;
-        case 269 :
+        case 265 :
         {
           return "E [tcp.checksum, tcp.urgentPtr]";
         }
         break;
-        case 270 :
+        case 266 :
         {
           return "E [ethernet.dstAddr[39:8]]";
         }
         break;
-        case 271 :
+        case 267 :
         {
           return "E [ethernet.srcAddr[31:0]]";
         }
@@ -232,50 +242,35 @@
         break;
         case 289 :
         {
-          return "I [tcp.srcPort[15:8], udp.length_[15:8]]";
-        }
-        break;
-        case 290 :
-        {
-          return "I [tcp.srcPort[7:0], udp.length_[7:0]]";
-        }
-        break;
-        case 291 :
-        {
-          return "I [tcp.dstPort[15:8]]";
+          return "I [tcp.seqNo[7:0], udp.srcPort[15:8]]";
         }
         break;
         case 292 :
         {
-          return "I [tcp.dstPort[7:0]]";
-        }
-        break;
-        case 296 :
-        {
           return "E [ipv4.version, ipv4.ihl]";
         }
         break;
-        case 297 :
+        case 293 :
         {
           return "E [ipv4.diffserv]";
         }
         break;
-        case 298 :
+        case 294 :
         {
           return "E [tcp.srcPort[15:8], udp.srcPort[15:8]]";
         }
         break;
-        case 299 :
+        case 295 :
         {
           return "E [tcp.srcPort[7:0], udp.srcPort[7:0]]";
         }
         break;
-        case 300 :
+        case 296 :
         {
           return "E [ethernet.dstAddr[47:40]]";
         }
         break;
-        case 301 :
+        case 297 :
         {
           return "E [ethernet.srcAddr[39:32]]";
         }
@@ -292,65 +287,55 @@
         break;
         case 322 :
         {
-          return "I [tcp.seqNo[31:16], udp.checksum]";
+          return "I [tcp.ackNo[31:16], udp.dstPort]";
         }
         break;
         case 323 :
         {
-          return "I [tcp.seqNo[15:0]]";
-        }
-        break;
-        case 324 :
-        {
-          return "I [tcp.ackNo[31:16]]";
-        }
-        break;
-        case 325 :
-        {
           return "I [tcp.ackNo[15:0]]";
         }
         break;
-        case 332 :
+        case 326 :
         {
           return "E [ipv4.totalLen]";
         }
         break;
-        case 333 :
+        case 327 :
         {
           return "E [ipv4.identification]";
         }
         break;
-        case 334 :
+        case 328 :
         {
           return "E [ipv4.flags, ipv4.fragOffset]";
         }
         break;
-        case 335 :
+        case 329 :
         {
-          return "E [tcp.dstPort]";
+          return "E [tcp.dstPort, udp.dstPort]";
         }
         break;
-        case 336 :
+        case 330 :
         {
-          return "E [tcp.seqNo[31:16], udp.dstPort]";
+          return "E [tcp.seqNo[31:16]]";
         }
         break;
-        case 337 :
+        case 331 :
         {
           return "E [tcp.seqNo[15:0]]";
         }
         break;
-        case 338 :
+        case 332 :
         {
           return "E [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]";
         }
         break;
-        case 339 :
+        case 333 :
         {
           return "E [ethernet.etherType]";
         }
         break;
-        case 340 :
+        case 334 :
         {
           return "E [packet_out_hdr.egress_port, packet_out_hdr._padding, packet_in_hdr.ingress_port, packet_in_hdr._padding]";
         }
@@ -378,17 +363,17 @@
         break;
         case 3 :
         {
-          return "I [ethernet.dstAddr[39:8]]";
+          return "I [tcp.dstPort[7:0], tcp.seqNo[31:8]]";
         }
         break;
         case 4 :
         {
-          return "I [ethernet.srcAddr[31:0]]";
+          return "I [ethernet.dstAddr[39:8]]";
         }
         break;
         case 5 :
         {
-          return "I [udp.srcPort, udp.dstPort]";
+          return "I [ethernet.srcAddr[31:0]]";
         }
         break;
         case 64 :
@@ -398,21 +383,26 @@
         break;
         case 65 :
         {
-          return "I [ethernet.dstAddr[47:40]]";
+          return "I [tcp.srcPort[15:8], udp.srcPort[7:0]]";
         }
         break;
         case 66 :
         {
-          return "I [ethernet.srcAddr[39:32]]";
+          return "I [ethernet.dstAddr[47:40]]";
         }
         break;
         case 67 :
         {
-          return "I [POV[39:32]]";
+          return "I [ethernet.srcAddr[39:32]]";
         }
         break;
         case 68 :
         {
+          return "I [POV[39:32]]";
+        }
+        break;
+        case 69 :
+        {
           return "I [ig_intr_md_for_tm.drop_ctl]";
         }
         break;
@@ -448,21 +438,26 @@
         break;
         case 132 :
         {
-          return "I [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]";
+          return "I [tcp.srcPort[7:0], tcp.dstPort[15:8]]";
         }
         break;
         case 133 :
         {
-          return "I [ethernet.etherType]";
+          return "I [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]";
         }
         break;
         case 134 :
         {
-          return "I [ecmp_metadata.group_id]";
+          return "I [ethernet.etherType]";
         }
         break;
         case 135 :
         {
+          return "I [ecmp_metadata.group_id]";
+        }
+        break;
+        case 136 :
+        {
           return "I [ecmp_metadata.selector]";
         }
         break;
@@ -478,7 +473,7 @@
         break;
         case 257 :
         {
-          return "I [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]";
+          return "I [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window, udp.length_, udp.checksum]";
         }
         break;
         case 258 :
@@ -486,42 +481,42 @@
           return "I [tcp.checksum, tcp.urgentPtr]";
         }
         break;
-        case 264 :
+        case 260 :
         {
           return "E [ipv4.ttl, ipv4.protocol, ipv4.hdrChecksum]";
         }
         break;
-        case 265 :
+        case 261 :
         {
           return "E [ipv4.srcAddr]";
         }
         break;
-        case 266 :
+        case 262 :
         {
           return "E [ipv4.dstAddr]";
         }
         break;
-        case 267 :
+        case 263 :
         {
           return "E [tcp.ackNo, udp.length_, udp.checksum]";
         }
         break;
-        case 268 :
+        case 264 :
         {
           return "E [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]";
         }
         break;
-        case 269 :
+        case 265 :
         {
           return "E [tcp.checksum, tcp.urgentPtr]";
         }
         break;
-        case 270 :
+        case 266 :
         {
           return "E [ethernet.dstAddr[39:8]]";
         }
         break;
-        case 271 :
+        case 267 :
         {
           return "E [ethernet.srcAddr[31:0]]";
         }
@@ -533,50 +528,35 @@
         break;
         case 289 :
         {
-          return "I [tcp.srcPort[15:8], udp.length_[15:8]]";
-        }
-        break;
-        case 290 :
-        {
-          return "I [tcp.srcPort[7:0], udp.length_[7:0]]";
-        }
-        break;
-        case 291 :
-        {
-          return "I [tcp.dstPort[15:8]]";
+          return "I [tcp.seqNo[7:0], udp.srcPort[15:8]]";
         }
         break;
         case 292 :
         {
-          return "I [tcp.dstPort[7:0]]";
-        }
-        break;
-        case 296 :
-        {
           return "E [ipv4.version, ipv4.ihl]";
         }
         break;
-        case 297 :
+        case 293 :
         {
           return "E [ipv4.diffserv]";
         }
         break;
-        case 298 :
+        case 294 :
         {
           return "E [tcp.srcPort[15:8], udp.srcPort[15:8]]";
         }
         break;
-        case 299 :
+        case 295 :
         {
           return "E [tcp.srcPort[7:0], udp.srcPort[7:0]]";
         }
         break;
-        case 300 :
+        case 296 :
         {
           return "E [ethernet.dstAddr[47:40]]";
         }
         break;
-        case 301 :
+        case 297 :
         {
           return "E [ethernet.srcAddr[39:32]]";
         }
@@ -593,65 +573,55 @@
         break;
         case 322 :
         {
-          return "I [tcp.seqNo[31:16], udp.checksum]";
+          return "I [tcp.ackNo[31:16], udp.dstPort]";
         }
         break;
         case 323 :
         {
-          return "I [tcp.seqNo[15:0]]";
-        }
-        break;
-        case 324 :
-        {
-          return "I [tcp.ackNo[31:16]]";
-        }
-        break;
-        case 325 :
-        {
           return "I [tcp.ackNo[15:0]]";
         }
         break;
-        case 332 :
+        case 326 :
         {
           return "E [ipv4.totalLen]";
         }
         break;
-        case 333 :
+        case 327 :
         {
           return "E [ipv4.identification]";
         }
         break;
-        case 334 :
+        case 328 :
         {
           return "E [ipv4.flags, ipv4.fragOffset]";
         }
         break;
-        case 335 :
+        case 329 :
         {
-          return "E [tcp.dstPort]";
+          return "E [tcp.dstPort, udp.dstPort]";
         }
         break;
-        case 336 :
+        case 330 :
         {
-          return "E [tcp.seqNo[31:16], udp.dstPort]";
+          return "E [tcp.seqNo[31:16]]";
         }
         break;
-        case 337 :
+        case 331 :
         {
           return "E [tcp.seqNo[15:0]]";
         }
         break;
-        case 338 :
+        case 332 :
         {
           return "E [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]";
         }
         break;
-        case 339 :
+        case 333 :
         {
           return "E [ethernet.etherType]";
         }
         break;
-        case 340 :
+        case 334 :
         {
           return "E [packet_out_hdr.egress_port, packet_out_hdr._padding, packet_in_hdr.ingress_port, packet_in_hdr._padding]";
         }
@@ -679,17 +649,17 @@
         break;
         case 3 :
         {
-          return "I [ethernet.dstAddr[39:8]]";
+          return "I [tcp.dstPort[7:0], tcp.seqNo[31:8]]";
         }
         break;
         case 4 :
         {
-          return "I [ethernet.srcAddr[31:0]]";
+          return "I [ethernet.dstAddr[39:8]]";
         }
         break;
         case 5 :
         {
-          return "I [udp.srcPort, udp.dstPort]";
+          return "I [ethernet.srcAddr[31:0]]";
         }
         break;
         case 64 :
@@ -699,21 +669,26 @@
         break;
         case 65 :
         {
-          return "I [ethernet.dstAddr[47:40]]";
+          return "I [tcp.srcPort[15:8], udp.srcPort[7:0]]";
         }
         break;
         case 66 :
         {
-          return "I [ethernet.srcAddr[39:32]]";
+          return "I [ethernet.dstAddr[47:40]]";
         }
         break;
         case 67 :
         {
-          return "I [POV[39:32]]";
+          return "I [ethernet.srcAddr[39:32]]";
         }
         break;
         case 68 :
         {
+          return "I [POV[39:32]]";
+        }
+        break;
+        case 69 :
+        {
           return "I [ig_intr_md_for_tm.drop_ctl]";
         }
         break;
@@ -749,21 +724,26 @@
         break;
         case 132 :
         {
-          return "I [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]";
+          return "I [tcp.srcPort[7:0], tcp.dstPort[15:8]]";
         }
         break;
         case 133 :
         {
-          return "I [ethernet.etherType]";
+          return "I [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]";
         }
         break;
         case 134 :
         {
-          return "I [ecmp_metadata.group_id]";
+          return "I [ethernet.etherType]";
         }
         break;
         case 135 :
         {
+          return "I [ecmp_metadata.group_id]";
+        }
+        break;
+        case 136 :
+        {
           return "I [ecmp_metadata.selector]";
         }
         break;
@@ -779,7 +759,7 @@
         break;
         case 257 :
         {
-          return "I [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]";
+          return "I [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window, udp.length_, udp.checksum]";
         }
         break;
         case 258 :
@@ -787,42 +767,42 @@
           return "I [tcp.checksum, tcp.urgentPtr]";
         }
         break;
-        case 264 :
+        case 260 :
         {
           return "E [ipv4.ttl, ipv4.protocol, ipv4.hdrChecksum]";
         }
         break;
-        case 265 :
+        case 261 :
         {
           return "E [ipv4.srcAddr]";
         }
         break;
-        case 266 :
+        case 262 :
         {
           return "E [ipv4.dstAddr]";
         }
         break;
-        case 267 :
+        case 263 :
         {
           return "E [tcp.ackNo, udp.length_, udp.checksum]";
         }
         break;
-        case 268 :
+        case 264 :
         {
           return "E [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]";
         }
         break;
-        case 269 :
+        case 265 :
         {
           return "E [tcp.checksum, tcp.urgentPtr]";
         }
         break;
-        case 270 :
+        case 266 :
         {
           return "E [ethernet.dstAddr[39:8]]";
         }
         break;
-        case 271 :
+        case 267 :
         {
           return "E [ethernet.srcAddr[31:0]]";
         }
@@ -834,50 +814,35 @@
         break;
         case 289 :
         {
-          return "I [tcp.srcPort[15:8], udp.length_[15:8]]";
-        }
-        break;
-        case 290 :
-        {
-          return "I [tcp.srcPort[7:0], udp.length_[7:0]]";
-        }
-        break;
-        case 291 :
-        {
-          return "I [tcp.dstPort[15:8]]";
+          return "I [tcp.seqNo[7:0], udp.srcPort[15:8]]";
         }
         break;
         case 292 :
         {
-          return "I [tcp.dstPort[7:0]]";
-        }
-        break;
-        case 296 :
-        {
           return "E [ipv4.version, ipv4.ihl]";
         }
         break;
-        case 297 :
+        case 293 :
         {
           return "E [ipv4.diffserv]";
         }
         break;
-        case 298 :
+        case 294 :
         {
           return "E [tcp.srcPort[15:8], udp.srcPort[15:8]]";
         }
         break;
-        case 299 :
+        case 295 :
         {
           return "E [tcp.srcPort[7:0], udp.srcPort[7:0]]";
         }
         break;
-        case 300 :
+        case 296 :
         {
           return "E [ethernet.dstAddr[47:40]]";
         }
         break;
-        case 301 :
+        case 297 :
         {
           return "E [ethernet.srcAddr[39:32]]";
         }
@@ -894,65 +859,55 @@
         break;
         case 322 :
         {
-          return "I [tcp.seqNo[31:16], udp.checksum]";
+          return "I [tcp.ackNo[31:16], udp.dstPort]";
         }
         break;
         case 323 :
         {
-          return "I [tcp.seqNo[15:0]]";
-        }
-        break;
-        case 324 :
-        {
-          return "I [tcp.ackNo[31:16]]";
-        }
-        break;
-        case 325 :
-        {
           return "I [tcp.ackNo[15:0]]";
         }
         break;
-        case 332 :
+        case 326 :
         {
           return "E [ipv4.totalLen]";
         }
         break;
-        case 333 :
+        case 327 :
         {
           return "E [ipv4.identification]";
         }
         break;
-        case 334 :
+        case 328 :
         {
           return "E [ipv4.flags, ipv4.fragOffset]";
         }
         break;
-        case 335 :
+        case 329 :
         {
-          return "E [tcp.dstPort]";
+          return "E [tcp.dstPort, udp.dstPort]";
         }
         break;
-        case 336 :
+        case 330 :
         {
-          return "E [tcp.seqNo[31:16], udp.dstPort]";
+          return "E [tcp.seqNo[31:16]]";
         }
         break;
-        case 337 :
+        case 331 :
         {
           return "E [tcp.seqNo[15:0]]";
         }
         break;
-        case 338 :
+        case 332 :
         {
           return "E [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]";
         }
         break;
-        case 339 :
+        case 333 :
         {
           return "E [ethernet.etherType]";
         }
         break;
-        case 340 :
+        case 334 :
         {
           return "E [packet_out_hdr.egress_port, packet_out_hdr._padding, packet_in_hdr.ingress_port, packet_in_hdr._padding]";
         }
@@ -980,17 +935,17 @@
         break;
         case 3 :
         {
-          return "I [ethernet.dstAddr[39:8]]";
+          return "I [tcp.dstPort[7:0], tcp.seqNo[31:8]]";
         }
         break;
         case 4 :
         {
-          return "I [ethernet.srcAddr[31:0]]";
+          return "I [ethernet.dstAddr[39:8]]";
         }
         break;
         case 5 :
         {
-          return "I [udp.srcPort, udp.dstPort]";
+          return "I [ethernet.srcAddr[31:0]]";
         }
         break;
         case 64 :
@@ -1000,21 +955,26 @@
         break;
         case 65 :
         {
-          return "I [ethernet.dstAddr[47:40]]";
+          return "I [tcp.srcPort[15:8], udp.srcPort[7:0]]";
         }
         break;
         case 66 :
         {
-          return "I [ethernet.srcAddr[39:32]]";
+          return "I [ethernet.dstAddr[47:40]]";
         }
         break;
         case 67 :
         {
-          return "I [POV[39:32]]";
+          return "I [ethernet.srcAddr[39:32]]";
         }
         break;
         case 68 :
         {
+          return "I [POV[39:32]]";
+        }
+        break;
+        case 69 :
+        {
           return "I [ig_intr_md_for_tm.drop_ctl]";
         }
         break;
@@ -1050,21 +1010,26 @@
         break;
         case 132 :
         {
-          return "I [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]";
+          return "I [tcp.srcPort[7:0], tcp.dstPort[15:8]]";
         }
         break;
         case 133 :
         {
-          return "I [ethernet.etherType]";
+          return "I [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]";
         }
         break;
         case 134 :
         {
-          return "I [ecmp_metadata.group_id]";
+          return "I [ethernet.etherType]";
         }
         break;
         case 135 :
         {
+          return "I [ecmp_metadata.group_id]";
+        }
+        break;
+        case 136 :
+        {
           return "I [ecmp_metadata.selector]";
         }
         break;
@@ -1080,7 +1045,7 @@
         break;
         case 257 :
         {
-          return "I [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]";
+          return "I [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window, udp.length_, udp.checksum]";
         }
         break;
         case 258 :
@@ -1088,42 +1053,42 @@
           return "I [tcp.checksum, tcp.urgentPtr]";
         }
         break;
-        case 264 :
+        case 260 :
         {
           return "E [ipv4.ttl, ipv4.protocol, ipv4.hdrChecksum]";
         }
         break;
-        case 265 :
+        case 261 :
         {
           return "E [ipv4.srcAddr]";
         }
         break;
-        case 266 :
+        case 262 :
         {
           return "E [ipv4.dstAddr]";
         }
         break;
-        case 267 :
+        case 263 :
         {
           return "E [tcp.ackNo, udp.length_, udp.checksum]";
         }
         break;
-        case 268 :
+        case 264 :
         {
           return "E [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]";
         }
         break;
-        case 269 :
+        case 265 :
         {
           return "E [tcp.checksum, tcp.urgentPtr]";
         }
         break;
-        case 270 :
+        case 266 :
         {
           return "E [ethernet.dstAddr[39:8]]";
         }
         break;
-        case 271 :
+        case 267 :
         {
           return "E [ethernet.srcAddr[31:0]]";
         }
@@ -1135,50 +1100,35 @@
         break;
         case 289 :
         {
-          return "I [tcp.srcPort[15:8], udp.length_[15:8]]";
-        }
-        break;
-        case 290 :
-        {
-          return "I [tcp.srcPort[7:0], udp.length_[7:0]]";
-        }
-        break;
-        case 291 :
-        {
-          return "I [tcp.dstPort[15:8]]";
+          return "I [tcp.seqNo[7:0], udp.srcPort[15:8]]";
         }
         break;
         case 292 :
         {
-          return "I [tcp.dstPort[7:0]]";
-        }
-        break;
-        case 296 :
-        {
           return "E [ipv4.version, ipv4.ihl]";
         }
         break;
-        case 297 :
+        case 293 :
         {
           return "E [ipv4.diffserv]";
         }
         break;
-        case 298 :
+        case 294 :
         {
           return "E [tcp.srcPort[15:8], udp.srcPort[15:8]]";
         }
         break;
-        case 299 :
+        case 295 :
         {
           return "E [tcp.srcPort[7:0], udp.srcPort[7:0]]";
         }
         break;
-        case 300 :
+        case 296 :
         {
           return "E [ethernet.dstAddr[47:40]]";
         }
         break;
-        case 301 :
+        case 297 :
         {
           return "E [ethernet.srcAddr[39:32]]";
         }
@@ -1195,65 +1145,55 @@
         break;
         case 322 :
         {
-          return "I [tcp.seqNo[31:16], udp.checksum]";
+          return "I [tcp.ackNo[31:16], udp.dstPort]";
         }
         break;
         case 323 :
         {
-          return "I [tcp.seqNo[15:0]]";
-        }
-        break;
-        case 324 :
-        {
-          return "I [tcp.ackNo[31:16]]";
-        }
-        break;
-        case 325 :
-        {
           return "I [tcp.ackNo[15:0]]";
         }
         break;
-        case 332 :
+        case 326 :
         {
           return "E [ipv4.totalLen]";
         }
         break;
-        case 333 :
+        case 327 :
         {
           return "E [ipv4.identification]";
         }
         break;
-        case 334 :
+        case 328 :
         {
           return "E [ipv4.flags, ipv4.fragOffset]";
         }
         break;
-        case 335 :
+        case 329 :
         {
-          return "E [tcp.dstPort]";
+          return "E [tcp.dstPort, udp.dstPort]";
         }
         break;
-        case 336 :
+        case 330 :
         {
-          return "E [tcp.seqNo[31:16], udp.dstPort]";
+          return "E [tcp.seqNo[31:16]]";
         }
         break;
-        case 337 :
+        case 331 :
         {
           return "E [tcp.seqNo[15:0]]";
         }
         break;
-        case 338 :
+        case 332 :
         {
           return "E [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]";
         }
         break;
-        case 339 :
+        case 333 :
         {
           return "E [ethernet.etherType]";
         }
         break;
-        case 340 :
+        case 334 :
         {
           return "E [packet_out_hdr.egress_port, packet_out_hdr._padding, packet_in_hdr.ingress_port, packet_in_hdr._padding]";
         }
@@ -1281,17 +1221,17 @@
         break;
         case 3 :
         {
-          return "I [ethernet.dstAddr[39:8]]";
+          return "I [tcp.dstPort[7:0], tcp.seqNo[31:8]]";
         }
         break;
         case 4 :
         {
-          return "I [ethernet.srcAddr[31:0]]";
+          return "I [ethernet.dstAddr[39:8]]";
         }
         break;
         case 5 :
         {
-          return "I [udp.srcPort, udp.dstPort]";
+          return "I [ethernet.srcAddr[31:0]]";
         }
         break;
         case 64 :
@@ -1301,21 +1241,26 @@
         break;
         case 65 :
         {
-          return "I [ethernet.dstAddr[47:40]]";
+          return "I [tcp.srcPort[15:8], udp.srcPort[7:0]]";
         }
         break;
         case 66 :
         {
-          return "I [ethernet.srcAddr[39:32]]";
+          return "I [ethernet.dstAddr[47:40]]";
         }
         break;
         case 67 :
         {
-          return "I [POV[39:32]]";
+          return "I [ethernet.srcAddr[39:32]]";
         }
         break;
         case 68 :
         {
+          return "I [POV[39:32]]";
+        }
+        break;
+        case 69 :
+        {
           return "I [ig_intr_md_for_tm.drop_ctl]";
         }
         break;
@@ -1351,21 +1296,26 @@
         break;
         case 132 :
         {
-          return "I [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]";
+          return "I [tcp.srcPort[7:0], tcp.dstPort[15:8]]";
         }
         break;
         case 133 :
         {
-          return "I [ethernet.etherType]";
+          return "I [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]";
         }
         break;
         case 134 :
         {
-          return "I [ecmp_metadata.group_id]";
+          return "I [ethernet.etherType]";
         }
         break;
         case 135 :
         {
+          return "I [ecmp_metadata.group_id]";
+        }
+        break;
+        case 136 :
+        {
           return "I [ecmp_metadata.selector]";
         }
         break;
@@ -1381,7 +1331,7 @@
         break;
         case 257 :
         {
-          return "I [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]";
+          return "I [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window, udp.length_, udp.checksum]";
         }
         break;
         case 258 :
@@ -1389,42 +1339,42 @@
           return "I [tcp.checksum, tcp.urgentPtr]";
         }
         break;
-        case 264 :
+        case 260 :
         {
           return "E [ipv4.ttl, ipv4.protocol, ipv4.hdrChecksum]";
         }
         break;
-        case 265 :
+        case 261 :
         {
           return "E [ipv4.srcAddr]";
         }
         break;
-        case 266 :
+        case 262 :
         {
           return "E [ipv4.dstAddr]";
         }
         break;
-        case 267 :
+        case 263 :
         {
           return "E [tcp.ackNo, udp.length_, udp.checksum]";
         }
         break;
-        case 268 :
+        case 264 :
         {
           return "E [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]";
         }
         break;
-        case 269 :
+        case 265 :
         {
           return "E [tcp.checksum, tcp.urgentPtr]";
         }
         break;
-        case 270 :
+        case 266 :
         {
           return "E [ethernet.dstAddr[39:8]]";
         }
         break;
-        case 271 :
+        case 267 :
         {
           return "E [ethernet.srcAddr[31:0]]";
         }
@@ -1436,50 +1386,35 @@
         break;
         case 289 :
         {
-          return "I [tcp.srcPort[15:8], udp.length_[15:8]]";
-        }
-        break;
-        case 290 :
-        {
-          return "I [tcp.srcPort[7:0], udp.length_[7:0]]";
-        }
-        break;
-        case 291 :
-        {
-          return "I [tcp.dstPort[15:8]]";
+          return "I [tcp.seqNo[7:0], udp.srcPort[15:8]]";
         }
         break;
         case 292 :
         {
-          return "I [tcp.dstPort[7:0]]";
-        }
-        break;
-        case 296 :
-        {
           return "E [ipv4.version, ipv4.ihl]";
         }
         break;
-        case 297 :
+        case 293 :
         {
           return "E [ipv4.diffserv]";
         }
         break;
-        case 298 :
+        case 294 :
         {
           return "E [tcp.srcPort[15:8], udp.srcPort[15:8]]";
         }
         break;
-        case 299 :
+        case 295 :
         {
           return "E [tcp.srcPort[7:0], udp.srcPort[7:0]]";
         }
         break;
-        case 300 :
+        case 296 :
         {
           return "E [ethernet.dstAddr[47:40]]";
         }
         break;
-        case 301 :
+        case 297 :
         {
           return "E [ethernet.srcAddr[39:32]]";
         }
@@ -1496,65 +1431,55 @@
         break;
         case 322 :
         {
-          return "I [tcp.seqNo[31:16], udp.checksum]";
+          return "I [tcp.ackNo[31:16], udp.dstPort]";
         }
         break;
         case 323 :
         {
-          return "I [tcp.seqNo[15:0]]";
-        }
-        break;
-        case 324 :
-        {
-          return "I [tcp.ackNo[31:16]]";
-        }
-        break;
-        case 325 :
-        {
           return "I [tcp.ackNo[15:0]]";
         }
         break;
-        case 332 :
+        case 326 :
         {
           return "E [ipv4.totalLen]";
         }
         break;
-        case 333 :
+        case 327 :
         {
           return "E [ipv4.identification]";
         }
         break;
-        case 334 :
+        case 328 :
         {
           return "E [ipv4.flags, ipv4.fragOffset]";
         }
         break;
-        case 335 :
+        case 329 :
         {
-          return "E [tcp.dstPort]";
+          return "E [tcp.dstPort, udp.dstPort]";
         }
         break;
-        case 336 :
+        case 330 :
         {
-          return "E [tcp.seqNo[31:16], udp.dstPort]";
+          return "E [tcp.seqNo[31:16]]";
         }
         break;
-        case 337 :
+        case 331 :
         {
           return "E [tcp.seqNo[15:0]]";
         }
         break;
-        case 338 :
+        case 332 :
         {
           return "E [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]";
         }
         break;
-        case 339 :
+        case 333 :
         {
           return "E [ethernet.etherType]";
         }
         break;
-        case 340 :
+        case 334 :
         {
           return "E [packet_out_hdr.egress_port, packet_out_hdr._padding, packet_in_hdr.ingress_port, packet_in_hdr._padding]";
         }
@@ -1582,17 +1507,17 @@
         break;
         case 3 :
         {
-          return "I [ethernet.dstAddr[39:8]]";
+          return "I [tcp.dstPort[7:0], tcp.seqNo[31:8]]";
         }
         break;
         case 4 :
         {
-          return "I [ethernet.srcAddr[31:0]]";
+          return "I [ethernet.dstAddr[39:8]]";
         }
         break;
         case 5 :
         {
-          return "I [udp.srcPort, udp.dstPort]";
+          return "I [ethernet.srcAddr[31:0]]";
         }
         break;
         case 64 :
@@ -1602,21 +1527,26 @@
         break;
         case 65 :
         {
-          return "I [ethernet.dstAddr[47:40]]";
+          return "I [tcp.srcPort[15:8], udp.srcPort[7:0]]";
         }
         break;
         case 66 :
         {
-          return "I [ethernet.srcAddr[39:32]]";
+          return "I [ethernet.dstAddr[47:40]]";
         }
         break;
         case 67 :
         {
-          return "I [POV[39:32]]";
+          return "I [ethernet.srcAddr[39:32]]";
         }
         break;
         case 68 :
         {
+          return "I [POV[39:32]]";
+        }
+        break;
+        case 69 :
+        {
           return "I [ig_intr_md_for_tm.drop_ctl]";
         }
         break;
@@ -1652,21 +1582,26 @@
         break;
         case 132 :
         {
-          return "I [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]";
+          return "I [tcp.srcPort[7:0], tcp.dstPort[15:8]]";
         }
         break;
         case 133 :
         {
-          return "I [ethernet.etherType]";
+          return "I [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]";
         }
         break;
         case 134 :
         {
-          return "I [ecmp_metadata.group_id]";
+          return "I [ethernet.etherType]";
         }
         break;
         case 135 :
         {
+          return "I [ecmp_metadata.group_id]";
+        }
+        break;
+        case 136 :
+        {
           return "I [ecmp_metadata.selector]";
         }
         break;
@@ -1682,7 +1617,7 @@
         break;
         case 257 :
         {
-          return "I [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]";
+          return "I [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window, udp.length_, udp.checksum]";
         }
         break;
         case 258 :
@@ -1690,42 +1625,42 @@
           return "I [tcp.checksum, tcp.urgentPtr]";
         }
         break;
-        case 264 :
+        case 260 :
         {
           return "E [ipv4.ttl, ipv4.protocol, ipv4.hdrChecksum]";
         }
         break;
-        case 265 :
+        case 261 :
         {
           return "E [ipv4.srcAddr]";
         }
         break;
-        case 266 :
+        case 262 :
         {
           return "E [ipv4.dstAddr]";
         }
         break;
-        case 267 :
+        case 263 :
         {
           return "E [tcp.ackNo, udp.length_, udp.checksum]";
         }
         break;
-        case 268 :
+        case 264 :
         {
           return "E [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]";
         }
         break;
-        case 269 :
+        case 265 :
         {
           return "E [tcp.checksum, tcp.urgentPtr]";
         }
         break;
-        case 270 :
+        case 266 :
         {
           return "E [ethernet.dstAddr[39:8]]";
         }
         break;
-        case 271 :
+        case 267 :
         {
           return "E [ethernet.srcAddr[31:0]]";
         }
@@ -1737,50 +1672,35 @@
         break;
         case 289 :
         {
-          return "I [tcp.srcPort[15:8], udp.length_[15:8]]";
-        }
-        break;
-        case 290 :
-        {
-          return "I [tcp.srcPort[7:0], udp.length_[7:0]]";
-        }
-        break;
-        case 291 :
-        {
-          return "I [tcp.dstPort[15:8]]";
+          return "I [tcp.seqNo[7:0], udp.srcPort[15:8]]";
         }
         break;
         case 292 :
         {
-          return "I [tcp.dstPort[7:0]]";
-        }
-        break;
-        case 296 :
-        {
           return "E [ipv4.version, ipv4.ihl]";
         }
         break;
-        case 297 :
+        case 293 :
         {
           return "E [ipv4.diffserv]";
         }
         break;
-        case 298 :
+        case 294 :
         {
           return "E [tcp.srcPort[15:8], udp.srcPort[15:8]]";
         }
         break;
-        case 299 :
+        case 295 :
         {
           return "E [tcp.srcPort[7:0], udp.srcPort[7:0]]";
         }
         break;
-        case 300 :
+        case 296 :
         {
           return "E [ethernet.dstAddr[47:40]]";
         }
         break;
-        case 301 :
+        case 297 :
         {
           return "E [ethernet.srcAddr[39:32]]";
         }
@@ -1797,65 +1717,55 @@
         break;
         case 322 :
         {
-          return "I [tcp.seqNo[31:16], udp.checksum]";
+          return "I [tcp.ackNo[31:16], udp.dstPort]";
         }
         break;
         case 323 :
         {
-          return "I [tcp.seqNo[15:0]]";
-        }
-        break;
-        case 324 :
-        {
-          return "I [tcp.ackNo[31:16]]";
-        }
-        break;
-        case 325 :
-        {
           return "I [tcp.ackNo[15:0]]";
         }
         break;
-        case 332 :
+        case 326 :
         {
           return "E [ipv4.totalLen]";
         }
         break;
-        case 333 :
+        case 327 :
         {
           return "E [ipv4.identification]";
         }
         break;
-        case 334 :
+        case 328 :
         {
           return "E [ipv4.flags, ipv4.fragOffset]";
         }
         break;
-        case 335 :
+        case 329 :
         {
-          return "E [tcp.dstPort]";
+          return "E [tcp.dstPort, udp.dstPort]";
         }
         break;
-        case 336 :
+        case 330 :
         {
-          return "E [tcp.seqNo[31:16], udp.dstPort]";
+          return "E [tcp.seqNo[31:16]]";
         }
         break;
-        case 337 :
+        case 331 :
         {
           return "E [tcp.seqNo[15:0]]";
         }
         break;
-        case 338 :
+        case 332 :
         {
           return "E [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]";
         }
         break;
-        case 339 :
+        case 333 :
         {
           return "E [ethernet.etherType]";
         }
         break;
-        case 340 :
+        case 334 :
         {
           return "E [packet_out_hdr.egress_port, packet_out_hdr._padding, packet_in_hdr.ingress_port, packet_in_hdr._padding]";
         }
@@ -1883,17 +1793,17 @@
         break;
         case 3 :
         {
-          return "I [ethernet.dstAddr[39:8]]";
+          return "I [tcp.dstPort[7:0], tcp.seqNo[31:8]]";
         }
         break;
         case 4 :
         {
-          return "I [ethernet.srcAddr[31:0]]";
+          return "I [ethernet.dstAddr[39:8]]";
         }
         break;
         case 5 :
         {
-          return "I [udp.srcPort, udp.dstPort]";
+          return "I [ethernet.srcAddr[31:0]]";
         }
         break;
         case 64 :
@@ -1903,21 +1813,26 @@
         break;
         case 65 :
         {
-          return "I [ethernet.dstAddr[47:40]]";
+          return "I [tcp.srcPort[15:8], udp.srcPort[7:0]]";
         }
         break;
         case 66 :
         {
-          return "I [ethernet.srcAddr[39:32]]";
+          return "I [ethernet.dstAddr[47:40]]";
         }
         break;
         case 67 :
         {
-          return "I [POV[39:32]]";
+          return "I [ethernet.srcAddr[39:32]]";
         }
         break;
         case 68 :
         {
+          return "I [POV[39:32]]";
+        }
+        break;
+        case 69 :
+        {
           return "I [ig_intr_md_for_tm.drop_ctl]";
         }
         break;
@@ -1953,21 +1868,26 @@
         break;
         case 132 :
         {
-          return "I [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]";
+          return "I [tcp.srcPort[7:0], tcp.dstPort[15:8]]";
         }
         break;
         case 133 :
         {
-          return "I [ethernet.etherType]";
+          return "I [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]";
         }
         break;
         case 134 :
         {
-          return "I [ecmp_metadata.group_id]";
+          return "I [ethernet.etherType]";
         }
         break;
         case 135 :
         {
+          return "I [ecmp_metadata.group_id]";
+        }
+        break;
+        case 136 :
+        {
           return "I [ecmp_metadata.selector]";
         }
         break;
@@ -1983,7 +1903,7 @@
         break;
         case 257 :
         {
-          return "I [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]";
+          return "I [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window, udp.length_, udp.checksum]";
         }
         break;
         case 258 :
@@ -1991,42 +1911,42 @@
           return "I [tcp.checksum, tcp.urgentPtr]";
         }
         break;
-        case 264 :
+        case 260 :
         {
           return "E [ipv4.ttl, ipv4.protocol, ipv4.hdrChecksum]";
         }
         break;
-        case 265 :
+        case 261 :
         {
           return "E [ipv4.srcAddr]";
         }
         break;
-        case 266 :
+        case 262 :
         {
           return "E [ipv4.dstAddr]";
         }
         break;
-        case 267 :
+        case 263 :
         {
           return "E [tcp.ackNo, udp.length_, udp.checksum]";
         }
         break;
-        case 268 :
+        case 264 :
         {
           return "E [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]";
         }
         break;
-        case 269 :
+        case 265 :
         {
           return "E [tcp.checksum, tcp.urgentPtr]";
         }
         break;
-        case 270 :
+        case 266 :
         {
           return "E [ethernet.dstAddr[39:8]]";
         }
         break;
-        case 271 :
+        case 267 :
         {
           return "E [ethernet.srcAddr[31:0]]";
         }
@@ -2038,50 +1958,35 @@
         break;
         case 289 :
         {
-          return "I [tcp.srcPort[15:8], udp.length_[15:8]]";
-        }
-        break;
-        case 290 :
-        {
-          return "I [tcp.srcPort[7:0], udp.length_[7:0]]";
-        }
-        break;
-        case 291 :
-        {
-          return "I [tcp.dstPort[15:8]]";
+          return "I [tcp.seqNo[7:0], udp.srcPort[15:8]]";
         }
         break;
         case 292 :
         {
-          return "I [tcp.dstPort[7:0]]";
-        }
-        break;
-        case 296 :
-        {
           return "E [ipv4.version, ipv4.ihl]";
         }
         break;
-        case 297 :
+        case 293 :
         {
           return "E [ipv4.diffserv]";
         }
         break;
-        case 298 :
+        case 294 :
         {
           return "E [tcp.srcPort[15:8], udp.srcPort[15:8]]";
         }
         break;
-        case 299 :
+        case 295 :
         {
           return "E [tcp.srcPort[7:0], udp.srcPort[7:0]]";
         }
         break;
-        case 300 :
+        case 296 :
         {
           return "E [ethernet.dstAddr[47:40]]";
         }
         break;
-        case 301 :
+        case 297 :
         {
           return "E [ethernet.srcAddr[39:32]]";
         }
@@ -2098,65 +2003,55 @@
         break;
         case 322 :
         {
-          return "I [tcp.seqNo[31:16], udp.checksum]";
+          return "I [tcp.ackNo[31:16], udp.dstPort]";
         }
         break;
         case 323 :
         {
-          return "I [tcp.seqNo[15:0]]";
-        }
-        break;
-        case 324 :
-        {
-          return "I [tcp.ackNo[31:16]]";
-        }
-        break;
-        case 325 :
-        {
           return "I [tcp.ackNo[15:0]]";
         }
         break;
-        case 332 :
+        case 326 :
         {
           return "E [ipv4.totalLen]";
         }
         break;
-        case 333 :
+        case 327 :
         {
           return "E [ipv4.identification]";
         }
         break;
-        case 334 :
+        case 328 :
         {
           return "E [ipv4.flags, ipv4.fragOffset]";
         }
         break;
-        case 335 :
+        case 329 :
         {
-          return "E [tcp.dstPort]";
+          return "E [tcp.dstPort, udp.dstPort]";
         }
         break;
-        case 336 :
+        case 330 :
         {
-          return "E [tcp.seqNo[31:16], udp.dstPort]";
+          return "E [tcp.seqNo[31:16]]";
         }
         break;
-        case 337 :
+        case 331 :
         {
           return "E [tcp.seqNo[15:0]]";
         }
         break;
-        case 338 :
+        case 332 :
         {
           return "E [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]";
         }
         break;
-        case 339 :
+        case 333 :
         {
           return "E [ethernet.etherType]";
         }
         break;
-        case 340 :
+        case 334 :
         {
           return "E [packet_out_hdr.egress_port, packet_out_hdr._padding, packet_in_hdr.ingress_port, packet_in_hdr._padding]";
         }
@@ -2184,17 +2079,17 @@
         break;
         case 3 :
         {
-          return "I [ethernet.dstAddr[39:8]]";
+          return "I [tcp.dstPort[7:0], tcp.seqNo[31:8]]";
         }
         break;
         case 4 :
         {
-          return "I [ethernet.srcAddr[31:0]]";
+          return "I [ethernet.dstAddr[39:8]]";
         }
         break;
         case 5 :
         {
-          return "I [udp.srcPort, udp.dstPort]";
+          return "I [ethernet.srcAddr[31:0]]";
         }
         break;
         case 64 :
@@ -2204,21 +2099,26 @@
         break;
         case 65 :
         {
-          return "I [ethernet.dstAddr[47:40]]";
+          return "I [tcp.srcPort[15:8], udp.srcPort[7:0]]";
         }
         break;
         case 66 :
         {
-          return "I [ethernet.srcAddr[39:32]]";
+          return "I [ethernet.dstAddr[47:40]]";
         }
         break;
         case 67 :
         {
-          return "I [POV[39:32]]";
+          return "I [ethernet.srcAddr[39:32]]";
         }
         break;
         case 68 :
         {
+          return "I [POV[39:32]]";
+        }
+        break;
+        case 69 :
+        {
           return "I [ig_intr_md_for_tm.drop_ctl]";
         }
         break;
@@ -2254,21 +2154,26 @@
         break;
         case 132 :
         {
-          return "I [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]";
+          return "I [tcp.srcPort[7:0], tcp.dstPort[15:8]]";
         }
         break;
         case 133 :
         {
-          return "I [ethernet.etherType]";
+          return "I [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]";
         }
         break;
         case 134 :
         {
-          return "I [ecmp_metadata.group_id]";
+          return "I [ethernet.etherType]";
         }
         break;
         case 135 :
         {
+          return "I [ecmp_metadata.group_id]";
+        }
+        break;
+        case 136 :
+        {
           return "I [ecmp_metadata.selector]";
         }
         break;
@@ -2284,7 +2189,7 @@
         break;
         case 257 :
         {
-          return "I [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]";
+          return "I [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window, udp.length_, udp.checksum]";
         }
         break;
         case 258 :
@@ -2292,42 +2197,42 @@
           return "I [tcp.checksum, tcp.urgentPtr]";
         }
         break;
-        case 264 :
+        case 260 :
         {
           return "E [ipv4.ttl, ipv4.protocol, ipv4.hdrChecksum]";
         }
         break;
-        case 265 :
+        case 261 :
         {
           return "E [ipv4.srcAddr]";
         }
         break;
-        case 266 :
+        case 262 :
         {
           return "E [ipv4.dstAddr]";
         }
         break;
-        case 267 :
+        case 263 :
         {
           return "E [tcp.ackNo, udp.length_, udp.checksum]";
         }
         break;
-        case 268 :
+        case 264 :
         {
           return "E [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]";
         }
         break;
-        case 269 :
+        case 265 :
         {
           return "E [tcp.checksum, tcp.urgentPtr]";
         }
         break;
-        case 270 :
+        case 266 :
         {
           return "E [ethernet.dstAddr[39:8]]";
         }
         break;
-        case 271 :
+        case 267 :
         {
           return "E [ethernet.srcAddr[31:0]]";
         }
@@ -2339,50 +2244,35 @@
         break;
         case 289 :
         {
-          return "I [tcp.srcPort[15:8], udp.length_[15:8]]";
-        }
-        break;
-        case 290 :
-        {
-          return "I [tcp.srcPort[7:0], udp.length_[7:0]]";
-        }
-        break;
-        case 291 :
-        {
-          return "I [tcp.dstPort[15:8]]";
+          return "I [tcp.seqNo[7:0], udp.srcPort[15:8]]";
         }
         break;
         case 292 :
         {
-          return "I [tcp.dstPort[7:0]]";
-        }
-        break;
-        case 296 :
-        {
           return "E [ipv4.version, ipv4.ihl]";
         }
         break;
-        case 297 :
+        case 293 :
         {
           return "E [ipv4.diffserv]";
         }
         break;
-        case 298 :
+        case 294 :
         {
           return "E [tcp.srcPort[15:8], udp.srcPort[15:8]]";
         }
         break;
-        case 299 :
+        case 295 :
         {
           return "E [tcp.srcPort[7:0], udp.srcPort[7:0]]";
         }
         break;
-        case 300 :
+        case 296 :
         {
           return "E [ethernet.dstAddr[47:40]]";
         }
         break;
-        case 301 :
+        case 297 :
         {
           return "E [ethernet.srcAddr[39:32]]";
         }
@@ -2399,65 +2289,55 @@
         break;
         case 322 :
         {
-          return "I [tcp.seqNo[31:16], udp.checksum]";
+          return "I [tcp.ackNo[31:16], udp.dstPort]";
         }
         break;
         case 323 :
         {
-          return "I [tcp.seqNo[15:0]]";
-        }
-        break;
-        case 324 :
-        {
-          return "I [tcp.ackNo[31:16]]";
-        }
-        break;
-        case 325 :
-        {
           return "I [tcp.ackNo[15:0]]";
         }
         break;
-        case 332 :
+        case 326 :
         {
           return "E [ipv4.totalLen]";
         }
         break;
-        case 333 :
+        case 327 :
         {
           return "E [ipv4.identification]";
         }
         break;
-        case 334 :
+        case 328 :
         {
           return "E [ipv4.flags, ipv4.fragOffset]";
         }
         break;
-        case 335 :
+        case 329 :
         {
-          return "E [tcp.dstPort]";
+          return "E [tcp.dstPort, udp.dstPort]";
         }
         break;
-        case 336 :
+        case 330 :
         {
-          return "E [tcp.seqNo[31:16], udp.dstPort]";
+          return "E [tcp.seqNo[31:16]]";
         }
         break;
-        case 337 :
+        case 331 :
         {
           return "E [tcp.seqNo[15:0]]";
         }
         break;
-        case 338 :
+        case 332 :
         {
           return "E [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]";
         }
         break;
-        case 339 :
+        case 333 :
         {
           return "E [ethernet.etherType]";
         }
         break;
-        case 340 :
+        case 334 :
         {
           return "E [packet_out_hdr.egress_port, packet_out_hdr._padding, packet_in_hdr.ingress_port, packet_in_hdr._padding]";
         }
@@ -2485,17 +2365,17 @@
         break;
         case 3 :
         {
-          return "I [ethernet.dstAddr[39:8]]";
+          return "I [tcp.dstPort[7:0], tcp.seqNo[31:8]]";
         }
         break;
         case 4 :
         {
-          return "I [ethernet.srcAddr[31:0]]";
+          return "I [ethernet.dstAddr[39:8]]";
         }
         break;
         case 5 :
         {
-          return "I [udp.srcPort, udp.dstPort]";
+          return "I [ethernet.srcAddr[31:0]]";
         }
         break;
         case 64 :
@@ -2505,21 +2385,26 @@
         break;
         case 65 :
         {
-          return "I [ethernet.dstAddr[47:40]]";
+          return "I [tcp.srcPort[15:8], udp.srcPort[7:0]]";
         }
         break;
         case 66 :
         {
-          return "I [ethernet.srcAddr[39:32]]";
+          return "I [ethernet.dstAddr[47:40]]";
         }
         break;
         case 67 :
         {
-          return "I [POV[39:32]]";
+          return "I [ethernet.srcAddr[39:32]]";
         }
         break;
         case 68 :
         {
+          return "I [POV[39:32]]";
+        }
+        break;
+        case 69 :
+        {
           return "I [ig_intr_md_for_tm.drop_ctl]";
         }
         break;
@@ -2555,21 +2440,26 @@
         break;
         case 132 :
         {
-          return "I [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]";
+          return "I [tcp.srcPort[7:0], tcp.dstPort[15:8]]";
         }
         break;
         case 133 :
         {
-          return "I [ethernet.etherType]";
+          return "I [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]";
         }
         break;
         case 134 :
         {
-          return "I [ecmp_metadata.group_id]";
+          return "I [ethernet.etherType]";
         }
         break;
         case 135 :
         {
+          return "I [ecmp_metadata.group_id]";
+        }
+        break;
+        case 136 :
+        {
           return "I [ecmp_metadata.selector]";
         }
         break;
@@ -2585,7 +2475,7 @@
         break;
         case 257 :
         {
-          return "I [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]";
+          return "I [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window, udp.length_, udp.checksum]";
         }
         break;
         case 258 :
@@ -2593,42 +2483,42 @@
           return "I [tcp.checksum, tcp.urgentPtr]";
         }
         break;
-        case 264 :
+        case 260 :
         {
           return "E [ipv4.ttl, ipv4.protocol, ipv4.hdrChecksum]";
         }
         break;
-        case 265 :
+        case 261 :
         {
           return "E [ipv4.srcAddr]";
         }
         break;
-        case 266 :
+        case 262 :
         {
           return "E [ipv4.dstAddr]";
         }
         break;
-        case 267 :
+        case 263 :
         {
           return "E [tcp.ackNo, udp.length_, udp.checksum]";
         }
         break;
-        case 268 :
+        case 264 :
         {
           return "E [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]";
         }
         break;
-        case 269 :
+        case 265 :
         {
           return "E [tcp.checksum, tcp.urgentPtr]";
         }
         break;
-        case 270 :
+        case 266 :
         {
           return "E [ethernet.dstAddr[39:8]]";
         }
         break;
-        case 271 :
+        case 267 :
         {
           return "E [ethernet.srcAddr[31:0]]";
         }
@@ -2640,50 +2530,35 @@
         break;
         case 289 :
         {
-          return "I [tcp.srcPort[15:8], udp.length_[15:8]]";
-        }
-        break;
-        case 290 :
-        {
-          return "I [tcp.srcPort[7:0], udp.length_[7:0]]";
-        }
-        break;
-        case 291 :
-        {
-          return "I [tcp.dstPort[15:8]]";
+          return "I [tcp.seqNo[7:0], udp.srcPort[15:8]]";
         }
         break;
         case 292 :
         {
-          return "I [tcp.dstPort[7:0]]";
-        }
-        break;
-        case 296 :
-        {
           return "E [ipv4.version, ipv4.ihl]";
         }
         break;
-        case 297 :
+        case 293 :
         {
           return "E [ipv4.diffserv]";
         }
         break;
-        case 298 :
+        case 294 :
         {
           return "E [tcp.srcPort[15:8], udp.srcPort[15:8]]";
         }
         break;
-        case 299 :
+        case 295 :
         {
           return "E [tcp.srcPort[7:0], udp.srcPort[7:0]]";
         }
         break;
-        case 300 :
+        case 296 :
         {
           return "E [ethernet.dstAddr[47:40]]";
         }
         break;
-        case 301 :
+        case 297 :
         {
           return "E [ethernet.srcAddr[39:32]]";
         }
@@ -2700,65 +2575,55 @@
         break;
         case 322 :
         {
-          return "I [tcp.seqNo[31:16], udp.checksum]";
+          return "I [tcp.ackNo[31:16], udp.dstPort]";
         }
         break;
         case 323 :
         {
-          return "I [tcp.seqNo[15:0]]";
-        }
-        break;
-        case 324 :
-        {
-          return "I [tcp.ackNo[31:16]]";
-        }
-        break;
-        case 325 :
-        {
           return "I [tcp.ackNo[15:0]]";
         }
         break;
-        case 332 :
+        case 326 :
         {
           return "E [ipv4.totalLen]";
         }
         break;
-        case 333 :
+        case 327 :
         {
           return "E [ipv4.identification]";
         }
         break;
-        case 334 :
+        case 328 :
         {
           return "E [ipv4.flags, ipv4.fragOffset]";
         }
         break;
-        case 335 :
+        case 329 :
         {
-          return "E [tcp.dstPort]";
+          return "E [tcp.dstPort, udp.dstPort]";
         }
         break;
-        case 336 :
+        case 330 :
         {
-          return "E [tcp.seqNo[31:16], udp.dstPort]";
+          return "E [tcp.seqNo[31:16]]";
         }
         break;
-        case 337 :
+        case 331 :
         {
           return "E [tcp.seqNo[15:0]]";
         }
         break;
-        case 338 :
+        case 332 :
         {
           return "E [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]";
         }
         break;
-        case 339 :
+        case 333 :
         {
           return "E [ethernet.etherType]";
         }
         break;
-        case 340 :
+        case 334 :
         {
           return "E [packet_out_hdr.egress_port, packet_out_hdr._padding, packet_in_hdr.ingress_port, packet_in_hdr._padding]";
         }
@@ -2786,17 +2651,17 @@
         break;
         case 3 :
         {
-          return "I [ethernet.dstAddr[39:8]]";
+          return "I [tcp.dstPort[7:0], tcp.seqNo[31:8]]";
         }
         break;
         case 4 :
         {
-          return "I [ethernet.srcAddr[31:0]]";
+          return "I [ethernet.dstAddr[39:8]]";
         }
         break;
         case 5 :
         {
-          return "I [udp.srcPort, udp.dstPort]";
+          return "I [ethernet.srcAddr[31:0]]";
         }
         break;
         case 64 :
@@ -2806,21 +2671,26 @@
         break;
         case 65 :
         {
-          return "I [ethernet.dstAddr[47:40]]";
+          return "I [tcp.srcPort[15:8], udp.srcPort[7:0]]";
         }
         break;
         case 66 :
         {
-          return "I [ethernet.srcAddr[39:32]]";
+          return "I [ethernet.dstAddr[47:40]]";
         }
         break;
         case 67 :
         {
-          return "I [POV[39:32]]";
+          return "I [ethernet.srcAddr[39:32]]";
         }
         break;
         case 68 :
         {
+          return "I [POV[39:32]]";
+        }
+        break;
+        case 69 :
+        {
           return "I [ig_intr_md_for_tm.drop_ctl]";
         }
         break;
@@ -2856,21 +2726,26 @@
         break;
         case 132 :
         {
-          return "I [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]";
+          return "I [tcp.srcPort[7:0], tcp.dstPort[15:8]]";
         }
         break;
         case 133 :
         {
-          return "I [ethernet.etherType]";
+          return "I [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]";
         }
         break;
         case 134 :
         {
-          return "I [ecmp_metadata.group_id]";
+          return "I [ethernet.etherType]";
         }
         break;
         case 135 :
         {
+          return "I [ecmp_metadata.group_id]";
+        }
+        break;
+        case 136 :
+        {
           return "I [ecmp_metadata.selector]";
         }
         break;
@@ -2886,7 +2761,7 @@
         break;
         case 257 :
         {
-          return "I [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]";
+          return "I [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window, udp.length_, udp.checksum]";
         }
         break;
         case 258 :
@@ -2894,42 +2769,42 @@
           return "I [tcp.checksum, tcp.urgentPtr]";
         }
         break;
-        case 264 :
+        case 260 :
         {
           return "E [ipv4.ttl, ipv4.protocol, ipv4.hdrChecksum]";
         }
         break;
-        case 265 :
+        case 261 :
         {
           return "E [ipv4.srcAddr]";
         }
         break;
-        case 266 :
+        case 262 :
         {
           return "E [ipv4.dstAddr]";
         }
         break;
-        case 267 :
+        case 263 :
         {
           return "E [tcp.ackNo, udp.length_, udp.checksum]";
         }
         break;
-        case 268 :
+        case 264 :
         {
           return "E [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]";
         }
         break;
-        case 269 :
+        case 265 :
         {
           return "E [tcp.checksum, tcp.urgentPtr]";
         }
         break;
-        case 270 :
+        case 266 :
         {
           return "E [ethernet.dstAddr[39:8]]";
         }
         break;
-        case 271 :
+        case 267 :
         {
           return "E [ethernet.srcAddr[31:0]]";
         }
@@ -2941,50 +2816,35 @@
         break;
         case 289 :
         {
-          return "I [tcp.srcPort[15:8], udp.length_[15:8]]";
-        }
-        break;
-        case 290 :
-        {
-          return "I [tcp.srcPort[7:0], udp.length_[7:0]]";
-        }
-        break;
-        case 291 :
-        {
-          return "I [tcp.dstPort[15:8]]";
+          return "I [tcp.seqNo[7:0], udp.srcPort[15:8]]";
         }
         break;
         case 292 :
         {
-          return "I [tcp.dstPort[7:0]]";
-        }
-        break;
-        case 296 :
-        {
           return "E [ipv4.version, ipv4.ihl]";
         }
         break;
-        case 297 :
+        case 293 :
         {
           return "E [ipv4.diffserv]";
         }
         break;
-        case 298 :
+        case 294 :
         {
           return "E [tcp.srcPort[15:8], udp.srcPort[15:8]]";
         }
         break;
-        case 299 :
+        case 295 :
         {
           return "E [tcp.srcPort[7:0], udp.srcPort[7:0]]";
         }
         break;
-        case 300 :
+        case 296 :
         {
           return "E [ethernet.dstAddr[47:40]]";
         }
         break;
-        case 301 :
+        case 297 :
         {
           return "E [ethernet.srcAddr[39:32]]";
         }
@@ -3001,65 +2861,55 @@
         break;
         case 322 :
         {
-          return "I [tcp.seqNo[31:16], udp.checksum]";
+          return "I [tcp.ackNo[31:16], udp.dstPort]";
         }
         break;
         case 323 :
         {
-          return "I [tcp.seqNo[15:0]]";
-        }
-        break;
-        case 324 :
-        {
-          return "I [tcp.ackNo[31:16]]";
-        }
-        break;
-        case 325 :
-        {
           return "I [tcp.ackNo[15:0]]";
         }
         break;
-        case 332 :
+        case 326 :
         {
           return "E [ipv4.totalLen]";
         }
         break;
-        case 333 :
+        case 327 :
         {
           return "E [ipv4.identification]";
         }
         break;
-        case 334 :
+        case 328 :
         {
           return "E [ipv4.flags, ipv4.fragOffset]";
         }
         break;
-        case 335 :
+        case 329 :
         {
-          return "E [tcp.dstPort]";
+          return "E [tcp.dstPort, udp.dstPort]";
         }
         break;
-        case 336 :
+        case 330 :
         {
-          return "E [tcp.seqNo[31:16], udp.dstPort]";
+          return "E [tcp.seqNo[31:16]]";
         }
         break;
-        case 337 :
+        case 331 :
         {
           return "E [tcp.seqNo[15:0]]";
         }
         break;
-        case 338 :
+        case 332 :
         {
           return "E [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]";
         }
         break;
-        case 339 :
+        case 333 :
         {
           return "E [ethernet.etherType]";
         }
         break;
-        case 340 :
+        case 334 :
         {
           return "E [packet_out_hdr.egress_port, packet_out_hdr._padding, packet_in_hdr.ingress_port, packet_in_hdr._padding]";
         }
@@ -3087,17 +2937,17 @@
         break;
         case 3 :
         {
-          return "I [ethernet.dstAddr[39:8]]";
+          return "I [tcp.dstPort[7:0], tcp.seqNo[31:8]]";
         }
         break;
         case 4 :
         {
-          return "I [ethernet.srcAddr[31:0]]";
+          return "I [ethernet.dstAddr[39:8]]";
         }
         break;
         case 5 :
         {
-          return "I [udp.srcPort, udp.dstPort]";
+          return "I [ethernet.srcAddr[31:0]]";
         }
         break;
         case 64 :
@@ -3107,21 +2957,26 @@
         break;
         case 65 :
         {
-          return "I [ethernet.dstAddr[47:40]]";
+          return "I [tcp.srcPort[15:8], udp.srcPort[7:0]]";
         }
         break;
         case 66 :
         {
-          return "I [ethernet.srcAddr[39:32]]";
+          return "I [ethernet.dstAddr[47:40]]";
         }
         break;
         case 67 :
         {
-          return "I [POV[39:32]]";
+          return "I [ethernet.srcAddr[39:32]]";
         }
         break;
         case 68 :
         {
+          return "I [POV[39:32]]";
+        }
+        break;
+        case 69 :
+        {
           return "I [ig_intr_md_for_tm.drop_ctl]";
         }
         break;
@@ -3157,21 +3012,26 @@
         break;
         case 132 :
         {
-          return "I [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]";
+          return "I [tcp.srcPort[7:0], tcp.dstPort[15:8]]";
         }
         break;
         case 133 :
         {
-          return "I [ethernet.etherType]";
+          return "I [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]";
         }
         break;
         case 134 :
         {
-          return "I [ecmp_metadata.group_id]";
+          return "I [ethernet.etherType]";
         }
         break;
         case 135 :
         {
+          return "I [ecmp_metadata.group_id]";
+        }
+        break;
+        case 136 :
+        {
           return "I [ecmp_metadata.selector]";
         }
         break;
@@ -3187,7 +3047,7 @@
         break;
         case 257 :
         {
-          return "I [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]";
+          return "I [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window, udp.length_, udp.checksum]";
         }
         break;
         case 258 :
@@ -3195,42 +3055,42 @@
           return "I [tcp.checksum, tcp.urgentPtr]";
         }
         break;
-        case 264 :
+        case 260 :
         {
           return "E [ipv4.ttl, ipv4.protocol, ipv4.hdrChecksum]";
         }
         break;
-        case 265 :
+        case 261 :
         {
           return "E [ipv4.srcAddr]";
         }
         break;
-        case 266 :
+        case 262 :
         {
           return "E [ipv4.dstAddr]";
         }
         break;
-        case 267 :
+        case 263 :
         {
           return "E [tcp.ackNo, udp.length_, udp.checksum]";
         }
         break;
-        case 268 :
+        case 264 :
         {
           return "E [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]";
         }
         break;
-        case 269 :
+        case 265 :
         {
           return "E [tcp.checksum, tcp.urgentPtr]";
         }
         break;
-        case 270 :
+        case 266 :
         {
           return "E [ethernet.dstAddr[39:8]]";
         }
         break;
-        case 271 :
+        case 267 :
         {
           return "E [ethernet.srcAddr[31:0]]";
         }
@@ -3242,50 +3102,35 @@
         break;
         case 289 :
         {
-          return "I [tcp.srcPort[15:8], udp.length_[15:8]]";
-        }
-        break;
-        case 290 :
-        {
-          return "I [tcp.srcPort[7:0], udp.length_[7:0]]";
-        }
-        break;
-        case 291 :
-        {
-          return "I [tcp.dstPort[15:8]]";
+          return "I [tcp.seqNo[7:0], udp.srcPort[15:8]]";
         }
         break;
         case 292 :
         {
-          return "I [tcp.dstPort[7:0]]";
-        }
-        break;
-        case 296 :
-        {
           return "E [ipv4.version, ipv4.ihl]";
         }
         break;
-        case 297 :
+        case 293 :
         {
           return "E [ipv4.diffserv]";
         }
         break;
-        case 298 :
+        case 294 :
         {
           return "E [tcp.srcPort[15:8], udp.srcPort[15:8]]";
         }
         break;
-        case 299 :
+        case 295 :
         {
           return "E [tcp.srcPort[7:0], udp.srcPort[7:0]]";
         }
         break;
-        case 300 :
+        case 296 :
         {
           return "E [ethernet.dstAddr[47:40]]";
         }
         break;
-        case 301 :
+        case 297 :
         {
           return "E [ethernet.srcAddr[39:32]]";
         }
@@ -3302,65 +3147,55 @@
         break;
         case 322 :
         {
-          return "I [tcp.seqNo[31:16], udp.checksum]";
+          return "I [tcp.ackNo[31:16], udp.dstPort]";
         }
         break;
         case 323 :
         {
-          return "I [tcp.seqNo[15:0]]";
-        }
-        break;
-        case 324 :
-        {
-          return "I [tcp.ackNo[31:16]]";
-        }
-        break;
-        case 325 :
-        {
           return "I [tcp.ackNo[15:0]]";
         }
         break;
-        case 332 :
+        case 326 :
         {
           return "E [ipv4.totalLen]";
         }
         break;
-        case 333 :
+        case 327 :
         {
           return "E [ipv4.identification]";
         }
         break;
-        case 334 :
+        case 328 :
         {
           return "E [ipv4.flags, ipv4.fragOffset]";
         }
         break;
-        case 335 :
+        case 329 :
         {
-          return "E [tcp.dstPort]";
+          return "E [tcp.dstPort, udp.dstPort]";
         }
         break;
-        case 336 :
+        case 330 :
         {
-          return "E [tcp.seqNo[31:16], udp.dstPort]";
+          return "E [tcp.seqNo[31:16]]";
         }
         break;
-        case 337 :
+        case 331 :
         {
           return "E [tcp.seqNo[15:0]]";
         }
         break;
-        case 338 :
+        case 332 :
         {
           return "E [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]";
         }
         break;
-        case 339 :
+        case 333 :
         {
           return "E [ethernet.etherType]";
         }
         break;
-        case 340 :
+        case 334 :
         {
           return "E [packet_out_hdr.egress_port, packet_out_hdr._padding, packet_in_hdr.ingress_port, packet_in_hdr._padding]";
         }
@@ -3388,17 +3223,17 @@
         break;
         case 3 :
         {
-          return "I [ethernet.dstAddr[39:8]]";
+          return "I [tcp.dstPort[7:0], tcp.seqNo[31:8]]";
         }
         break;
         case 4 :
         {
-          return "I [ethernet.srcAddr[31:0]]";
+          return "I [ethernet.dstAddr[39:8]]";
         }
         break;
         case 5 :
         {
-          return "I [udp.srcPort, udp.dstPort]";
+          return "I [ethernet.srcAddr[31:0]]";
         }
         break;
         case 64 :
@@ -3408,21 +3243,26 @@
         break;
         case 65 :
         {
-          return "I [ethernet.dstAddr[47:40]]";
+          return "I [tcp.srcPort[15:8], udp.srcPort[7:0]]";
         }
         break;
         case 66 :
         {
-          return "I [ethernet.srcAddr[39:32]]";
+          return "I [ethernet.dstAddr[47:40]]";
         }
         break;
         case 67 :
         {
-          return "I [POV[39:32]]";
+          return "I [ethernet.srcAddr[39:32]]";
         }
         break;
         case 68 :
         {
+          return "I [POV[39:32]]";
+        }
+        break;
+        case 69 :
+        {
           return "I [ig_intr_md_for_tm.drop_ctl]";
         }
         break;
@@ -3458,21 +3298,26 @@
         break;
         case 132 :
         {
-          return "I [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]";
+          return "I [tcp.srcPort[7:0], tcp.dstPort[15:8]]";
         }
         break;
         case 133 :
         {
-          return "I [ethernet.etherType]";
+          return "I [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]";
         }
         break;
         case 134 :
         {
-          return "I [ecmp_metadata.group_id]";
+          return "I [ethernet.etherType]";
         }
         break;
         case 135 :
         {
+          return "I [ecmp_metadata.group_id]";
+        }
+        break;
+        case 136 :
+        {
           return "I [ecmp_metadata.selector]";
         }
         break;
@@ -3488,7 +3333,7 @@
         break;
         case 257 :
         {
-          return "I [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]";
+          return "I [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window, udp.length_, udp.checksum]";
         }
         break;
         case 258 :
@@ -3496,42 +3341,42 @@
           return "I [tcp.checksum, tcp.urgentPtr]";
         }
         break;
-        case 264 :
+        case 260 :
         {
           return "E [ipv4.ttl, ipv4.protocol, ipv4.hdrChecksum]";
         }
         break;
-        case 265 :
+        case 261 :
         {
           return "E [ipv4.srcAddr]";
         }
         break;
-        case 266 :
+        case 262 :
         {
           return "E [ipv4.dstAddr]";
         }
         break;
-        case 267 :
+        case 263 :
         {
           return "E [tcp.ackNo, udp.length_, udp.checksum]";
         }
         break;
-        case 268 :
+        case 264 :
         {
           return "E [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]";
         }
         break;
-        case 269 :
+        case 265 :
         {
           return "E [tcp.checksum, tcp.urgentPtr]";
         }
         break;
-        case 270 :
+        case 266 :
         {
           return "E [ethernet.dstAddr[39:8]]";
         }
         break;
-        case 271 :
+        case 267 :
         {
           return "E [ethernet.srcAddr[31:0]]";
         }
@@ -3543,50 +3388,35 @@
         break;
         case 289 :
         {
-          return "I [tcp.srcPort[15:8], udp.length_[15:8]]";
-        }
-        break;
-        case 290 :
-        {
-          return "I [tcp.srcPort[7:0], udp.length_[7:0]]";
-        }
-        break;
-        case 291 :
-        {
-          return "I [tcp.dstPort[15:8]]";
+          return "I [tcp.seqNo[7:0], udp.srcPort[15:8]]";
         }
         break;
         case 292 :
         {
-          return "I [tcp.dstPort[7:0]]";
-        }
-        break;
-        case 296 :
-        {
           return "E [ipv4.version, ipv4.ihl]";
         }
         break;
-        case 297 :
+        case 293 :
         {
           return "E [ipv4.diffserv]";
         }
         break;
-        case 298 :
+        case 294 :
         {
           return "E [tcp.srcPort[15:8], udp.srcPort[15:8]]";
         }
         break;
-        case 299 :
+        case 295 :
         {
           return "E [tcp.srcPort[7:0], udp.srcPort[7:0]]";
         }
         break;
-        case 300 :
+        case 296 :
         {
           return "E [ethernet.dstAddr[47:40]]";
         }
         break;
-        case 301 :
+        case 297 :
         {
           return "E [ethernet.srcAddr[39:32]]";
         }
@@ -3603,65 +3433,55 @@
         break;
         case 322 :
         {
-          return "I [tcp.seqNo[31:16], udp.checksum]";
+          return "I [tcp.ackNo[31:16], udp.dstPort]";
         }
         break;
         case 323 :
         {
-          return "I [tcp.seqNo[15:0]]";
-        }
-        break;
-        case 324 :
-        {
-          return "I [tcp.ackNo[31:16]]";
-        }
-        break;
-        case 325 :
-        {
           return "I [tcp.ackNo[15:0]]";
         }
         break;
-        case 332 :
+        case 326 :
         {
           return "E [ipv4.totalLen]";
         }
         break;
-        case 333 :
+        case 327 :
         {
           return "E [ipv4.identification]";
         }
         break;
-        case 334 :
+        case 328 :
         {
           return "E [ipv4.flags, ipv4.fragOffset]";
         }
         break;
-        case 335 :
+        case 329 :
         {
-          return "E [tcp.dstPort]";
+          return "E [tcp.dstPort, udp.dstPort]";
         }
         break;
-        case 336 :
+        case 330 :
         {
-          return "E [tcp.seqNo[31:16], udp.dstPort]";
+          return "E [tcp.seqNo[31:16]]";
         }
         break;
-        case 337 :
+        case 331 :
         {
           return "E [tcp.seqNo[15:0]]";
         }
         break;
-        case 338 :
+        case 332 :
         {
           return "E [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]";
         }
         break;
-        case 339 :
+        case 333 :
         {
           return "E [ethernet.etherType]";
         }
         break;
-        case 340 :
+        case 334 :
         {
           return "E [packet_out_hdr.egress_port, packet_out_hdr._padding, packet_in_hdr.ingress_port, packet_in_hdr._padding]";
         }
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/tofino.bin b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/tofino.bin
index dc11a6e..182b15d 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/tofino.bin
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/tofino.bin
Binary files differ
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