diff --git a/iom-dc/LEAF-C1-SW1.cfg b/iom-dc/LEAF-C1-SW1.cfg
index d138f73..7899045 100644
--- a/iom-dc/LEAF-C1-SW1.cfg
+++ b/iom-dc/LEAF-C1-SW1.cfg
@@ -502,6 +502,198 @@ interfaces {
             }
         }
     }
+    ae2 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:01:02:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 48;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae3 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:01:03:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 48;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae4 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:01:04:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 48;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae5 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:01:05:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 48;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae6 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:01:06:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 48;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae7 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:01:07:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 48;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae8 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:01:08:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 48;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae9 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:01:09:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 48;
+                }
+                storm-control default;
+            }
+        }
+    }
     ae10 {
         mtu 9216;
         esi {
@@ -742,30 +934,6 @@ interfaces {
             }
         }
     }
-    ae2 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:01:02:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 48;
-                }
-                storm-control default;
-            }
-        }
-    }
     ae20 {
         mtu 9216;
         esi {
@@ -1006,30 +1174,6 @@ interfaces {
             }
         }
     }
-    ae3 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:01:03:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 48;
-                }
-                storm-control default;
-            }
-        }
-    }
     ae30 {
         mtu 9216;
         esi {
@@ -1078,150 +1222,6 @@ interfaces {
             }
         }
     }
-    ae4 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:01:04:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 48;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae5 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:01:05:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 48;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae6 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:01:06:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 48;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae7 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:01:07:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 48;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae8 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:01:08:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 48;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae9 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:01:09:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 48;
-                }
-                storm-control default;
-            }
-        }
-    }
     em0 {
         unit 0 {
             family inet {
@@ -1353,14 +1353,6 @@ switch-options {
     }
 }
 vlans {
-    vl48 {
-        description "DMZ VLAN";
-        vlan-id 48;
-        l3-interface irb.48;
-        vxlan {
-            vni 48;
-        }
-    }
     vl44 {
         description "Main Data Vlan";
         vlan-id 44;
@@ -1369,4 +1361,12 @@ vlans {
             vni 44;
         }
     }
+    vl48 {
+        description "DMZ VLAN";
+        vlan-id 48;
+        l3-interface irb.48;
+        vxlan {
+            vni 48;
+        }
+    }
 }
diff --git a/iom-dc/LEAF-C1-SW2.cfg b/iom-dc/LEAF-C1-SW2.cfg
index 2c38958..de8507a 100644
--- a/iom-dc/LEAF-C1-SW2.cfg
+++ b/iom-dc/LEAF-C1-SW2.cfg
@@ -482,6 +482,198 @@ interfaces {
             }
         }
     }
+    ae2 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:01:02:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 48;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae3 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:01:03:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 48;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae4 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:01:04:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 48;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae5 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:01:05:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 48;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae6 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:01:06:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 48;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae7 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:01:07:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 48;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae8 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:01:08:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 48;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae9 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:01:09:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 48;
+                }
+                storm-control default;
+            }
+        }
+    }
     ae10 {
         mtu 9216;
         esi {
@@ -722,30 +914,6 @@ interfaces {
             }
         }
     }
-    ae2 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:01:02:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 48;
-                }
-                storm-control default;
-            }
-        }
-    }
     ae20 {
         mtu 9216;
         esi {
@@ -986,30 +1154,6 @@ interfaces {
             }
         }
     }
-    ae3 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:01:03:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 48;
-                }
-                storm-control default;
-            }
-        }
-    }
     ae30 {
         mtu 9216;
         esi {
@@ -1058,150 +1202,6 @@ interfaces {
             }
         }
     }
-    ae4 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:01:04:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 48;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae5 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:01:05:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 48;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae6 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:01:06:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 48;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae7 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:01:07:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 48;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae8 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:01:08:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 48;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae9 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:01:09:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 48;
-                }
-                storm-control default;
-            }
-        }
-    }
     em0 {
         unit 0 {
             family inet {
@@ -1333,14 +1333,6 @@ switch-options {
     }
 }
 vlans {
-    vl48 {
-        description "DMZ VLAN";
-        vlan-id 48;
-        l3-interface irb.48;
-        vxlan {
-            vni 48;
-        }
-    }
     vl44 {
         description "Main Data Vlan";
         vlan-id 44;
@@ -1349,4 +1341,12 @@ vlans {
             vni 44;
         }
     }
+    vl48 {
+        description "DMZ VLAN";
+        vlan-id 48;
+        l3-interface irb.48;
+        vxlan {
+            vni 48;
+        }
+    }
 }
diff --git a/iom-dc/LEAF-C10-SW1.cfg b/iom-dc/LEAF-C10-SW1.cfg
index 3655cee..3dcf5e7 100644
--- a/iom-dc/LEAF-C10-SW1.cfg
+++ b/iom-dc/LEAF-C10-SW1.cfg
@@ -482,6 +482,198 @@ interfaces {
             }
         }
     }
+    ae2 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:10:02:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae3 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:10:03:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae4 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:10:04:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae5 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:10:05:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae6 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:10:06:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae7 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:10:07:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae8 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:10:08:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae9 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:10:09:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
     ae10 {
         mtu 9216;
         esi {
@@ -722,30 +914,6 @@ interfaces {
             }
         }
     }
-    ae2 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:10:02:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
     ae20 {
         mtu 9216;
         esi {
@@ -986,30 +1154,6 @@ interfaces {
             }
         }
     }
-    ae3 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:10:03:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
     ae30 {
         mtu 9216;
         esi {
@@ -1058,150 +1202,6 @@ interfaces {
             }
         }
     }
-    ae4 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:10:04:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae5 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:10:05:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae6 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:10:06:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae7 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:10:07:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae8 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:10:08:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae9 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:10:09:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
     em0 {
         unit 0 {
             family inet {
diff --git a/iom-dc/LEAF-C10-SW2.cfg b/iom-dc/LEAF-C10-SW2.cfg
index 3683f6a..eb8e697 100644
--- a/iom-dc/LEAF-C10-SW2.cfg
+++ b/iom-dc/LEAF-C10-SW2.cfg
@@ -482,6 +482,198 @@ interfaces {
             }
         }
     }
+    ae2 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:10:02:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae3 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:10:03:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae4 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:10:04:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae5 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:10:05:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae6 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:10:06:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae7 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:10:07:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae8 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:10:08:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae9 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:10:09:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
     ae10 {
         mtu 9216;
         esi {
@@ -722,30 +914,6 @@ interfaces {
             }
         }
     }
-    ae2 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:10:02:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
     ae20 {
         mtu 9216;
         esi {
@@ -986,30 +1154,6 @@ interfaces {
             }
         }
     }
-    ae3 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:10:03:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
     ae30 {
         mtu 9216;
         esi {
@@ -1058,150 +1202,6 @@ interfaces {
             }
         }
     }
-    ae4 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:10:04:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae5 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:10:05:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae6 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:10:06:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae7 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:10:07:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae8 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:10:08:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae9 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:10:09:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
     em0 {
         unit 0 {
             family inet {
diff --git a/iom-dc/LEAF-C11-SW1.cfg b/iom-dc/LEAF-C11-SW1.cfg
index 48439af..ef1a817 100644
--- a/iom-dc/LEAF-C11-SW1.cfg
+++ b/iom-dc/LEAF-C11-SW1.cfg
@@ -482,6 +482,198 @@ interfaces {
             }
         }
     }
+    ae2 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:11:02:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae3 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:11:03:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae4 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:11:04:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae5 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:11:05:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae6 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:11:06:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae7 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:11:07:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae8 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:11:08:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae9 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:11:09:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
     ae10 {
         mtu 9216;
         esi {
@@ -722,30 +914,6 @@ interfaces {
             }
         }
     }
-    ae2 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:11:02:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
     ae20 {
         mtu 9216;
         esi {
@@ -986,30 +1154,6 @@ interfaces {
             }
         }
     }
-    ae3 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:11:03:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
     ae30 {
         mtu 9216;
         esi {
@@ -1058,150 +1202,6 @@ interfaces {
             }
         }
     }
-    ae4 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:11:04:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae5 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:11:05:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae6 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:11:06:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae7 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:11:07:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae8 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:11:08:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae9 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:11:09:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
     em0 {
         unit 0 {
             family inet {
diff --git a/iom-dc/LEAF-C11-SW2.cfg b/iom-dc/LEAF-C11-SW2.cfg
index 684d0fc..af63f5d 100644
--- a/iom-dc/LEAF-C11-SW2.cfg
+++ b/iom-dc/LEAF-C11-SW2.cfg
@@ -482,6 +482,198 @@ interfaces {
             }
         }
     }
+    ae2 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:11:02:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae3 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:11:03:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae4 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:11:04:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae5 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:11:05:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae6 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:11:06:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae7 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:11:07:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae8 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:11:08:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae9 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:11:09:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
     ae10 {
         mtu 9216;
         esi {
@@ -722,30 +914,6 @@ interfaces {
             }
         }
     }
-    ae2 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:11:02:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
     ae20 {
         mtu 9216;
         esi {
@@ -986,30 +1154,6 @@ interfaces {
             }
         }
     }
-    ae3 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:11:03:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
     ae30 {
         mtu 9216;
         esi {
@@ -1058,150 +1202,6 @@ interfaces {
             }
         }
     }
-    ae4 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:11:04:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae5 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:11:05:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae6 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:11:06:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae7 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:11:07:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae8 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:11:08:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae9 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:11:09:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
     em0 {
         unit 0 {
             family inet {
diff --git a/iom-dc/LEAF-C12-SW1.cfg b/iom-dc/LEAF-C12-SW1.cfg
index 8f964a4..afbbd3c 100644
--- a/iom-dc/LEAF-C12-SW1.cfg
+++ b/iom-dc/LEAF-C12-SW1.cfg
@@ -482,6 +482,198 @@ interfaces {
             }
         }
     }
+    ae2 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:12:02:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae3 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:12:03:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae4 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:12:04:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae5 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:12:05:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae6 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:12:06:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae7 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:12:07:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae8 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:12:08:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae9 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:12:09:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
     ae10 {
         mtu 9216;
         esi {
@@ -722,30 +914,6 @@ interfaces {
             }
         }
     }
-    ae2 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:12:02:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
     ae20 {
         mtu 9216;
         esi {
@@ -986,30 +1154,6 @@ interfaces {
             }
         }
     }
-    ae3 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:12:03:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
     ae30 {
         mtu 9216;
         esi {
@@ -1058,150 +1202,6 @@ interfaces {
             }
         }
     }
-    ae4 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:12:04:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae5 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:12:05:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae6 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:12:06:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae7 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:12:07:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae8 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:12:08:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae9 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:12:09:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
     em0 {
         unit 0 {
             family inet {
diff --git a/iom-dc/LEAF-C12-SW2.cfg b/iom-dc/LEAF-C12-SW2.cfg
index 4ffc55a..1bbb296 100644
--- a/iom-dc/LEAF-C12-SW2.cfg
+++ b/iom-dc/LEAF-C12-SW2.cfg
@@ -482,6 +482,198 @@ interfaces {
             }
         }
     }
+    ae2 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:12:02:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae3 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:12:03:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae4 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:12:04:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae5 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:12:05:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae6 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:12:06:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae7 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:12:07:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae8 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:12:08:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae9 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:12:09:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
     ae10 {
         mtu 9216;
         esi {
@@ -722,30 +914,6 @@ interfaces {
             }
         }
     }
-    ae2 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:12:02:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
     ae20 {
         mtu 9216;
         esi {
@@ -986,30 +1154,6 @@ interfaces {
             }
         }
     }
-    ae3 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:12:03:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
     ae30 {
         mtu 9216;
         esi {
@@ -1058,150 +1202,6 @@ interfaces {
             }
         }
     }
-    ae4 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:12:04:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae5 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:12:05:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae6 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:12:06:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae7 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:12:07:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae8 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:12:08:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae9 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:12:09:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
     em0 {
         unit 0 {
             family inet {
diff --git a/iom-dc/LEAF-C13-SW1.cfg b/iom-dc/LEAF-C13-SW1.cfg
index 892a427..6a37d45 100644
--- a/iom-dc/LEAF-C13-SW1.cfg
+++ b/iom-dc/LEAF-C13-SW1.cfg
@@ -482,6 +482,198 @@ interfaces {
             }
         }
     }
+    ae2 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:13:02:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae3 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:13:03:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae4 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:13:04:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae5 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:13:05:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae6 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:13:06:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae7 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:13:07:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae8 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:13:08:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae9 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:13:09:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
     ae10 {
         mtu 9216;
         esi {
@@ -722,30 +914,6 @@ interfaces {
             }
         }
     }
-    ae2 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:13:02:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
     ae20 {
         mtu 9216;
         esi {
@@ -986,30 +1154,6 @@ interfaces {
             }
         }
     }
-    ae3 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:13:03:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
     ae30 {
         mtu 9216;
         esi {
@@ -1058,150 +1202,6 @@ interfaces {
             }
         }
     }
-    ae4 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:13:04:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae5 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:13:05:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae6 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:13:06:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae7 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:13:07:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae8 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:13:08:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae9 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:13:09:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
     em0 {
         unit 0 {
             family inet {
diff --git a/iom-dc/LEAF-C13-SW2.cfg b/iom-dc/LEAF-C13-SW2.cfg
index c1cb05b..b667c3c 100644
--- a/iom-dc/LEAF-C13-SW2.cfg
+++ b/iom-dc/LEAF-C13-SW2.cfg
@@ -482,6 +482,198 @@ interfaces {
             }
         }
     }
+    ae2 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:13:02:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae3 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:13:03:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae4 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:13:04:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae5 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:13:05:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae6 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:13:06:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae7 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:13:07:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae8 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:13:08:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae9 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:13:09:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
     ae10 {
         mtu 9216;
         esi {
@@ -722,30 +914,6 @@ interfaces {
             }
         }
     }
-    ae2 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:13:02:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
     ae20 {
         mtu 9216;
         esi {
@@ -986,30 +1154,6 @@ interfaces {
             }
         }
     }
-    ae3 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:13:03:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
     ae30 {
         mtu 9216;
         esi {
@@ -1058,150 +1202,6 @@ interfaces {
             }
         }
     }
-    ae4 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:13:04:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae5 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:13:05:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae6 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:13:06:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae7 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:13:07:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae8 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:13:08:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae9 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:13:09:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
     em0 {
         unit 0 {
             family inet {
diff --git a/iom-dc/LEAF-C14-SW1.cfg b/iom-dc/LEAF-C14-SW1.cfg
index ce84383..b485191 100644
--- a/iom-dc/LEAF-C14-SW1.cfg
+++ b/iom-dc/LEAF-C14-SW1.cfg
@@ -482,6 +482,198 @@ interfaces {
             }
         }
     }
+    ae2 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:14:02:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae3 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:14:03:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae4 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:14:04:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae5 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:14:05:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae6 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:14:06:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae7 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:14:07:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae8 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:14:08:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae9 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:14:09:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
     ae10 {
         mtu 9216;
         esi {
@@ -722,30 +914,6 @@ interfaces {
             }
         }
     }
-    ae2 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:14:02:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
     ae20 {
         mtu 9216;
         esi {
@@ -986,30 +1154,6 @@ interfaces {
             }
         }
     }
-    ae3 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:14:03:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
     ae30 {
         mtu 9216;
         esi {
@@ -1058,150 +1202,6 @@ interfaces {
             }
         }
     }
-    ae4 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:14:04:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae5 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:14:05:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae6 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:14:06:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae7 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:14:07:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae8 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:14:08:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae9 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:14:09:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
     em0 {
         unit 0 {
             family inet {
diff --git a/iom-dc/LEAF-C14-SW2.cfg b/iom-dc/LEAF-C14-SW2.cfg
index a0fd46f..09ad806 100644
--- a/iom-dc/LEAF-C14-SW2.cfg
+++ b/iom-dc/LEAF-C14-SW2.cfg
@@ -482,6 +482,198 @@ interfaces {
             }
         }
     }
+    ae2 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:14:02:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae3 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:14:03:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae4 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:14:04:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae5 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:14:05:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae6 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:14:06:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae7 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:14:07:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae8 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:14:08:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae9 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:14:09:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
     ae10 {
         mtu 9216;
         esi {
@@ -722,30 +914,6 @@ interfaces {
             }
         }
     }
-    ae2 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:14:02:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
     ae20 {
         mtu 9216;
         esi {
@@ -986,30 +1154,6 @@ interfaces {
             }
         }
     }
-    ae3 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:14:03:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
     ae30 {
         mtu 9216;
         esi {
@@ -1058,150 +1202,6 @@ interfaces {
             }
         }
     }
-    ae4 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:14:04:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae5 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:14:05:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae6 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:14:06:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae7 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:14:07:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae8 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:14:08:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae9 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:14:09:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
     em0 {
         unit 0 {
             family inet {
diff --git a/iom-dc/LEAF-C2-SW1.cfg b/iom-dc/LEAF-C2-SW1.cfg
index 3fc7967..9673a1a 100644
--- a/iom-dc/LEAF-C2-SW1.cfg
+++ b/iom-dc/LEAF-C2-SW1.cfg
@@ -482,6 +482,198 @@ interfaces {
             }
         }
     }
+    ae2 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:02:02:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 48;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae3 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:02:03:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 48;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae4 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:02:04:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 48;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae5 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:02:05:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 48;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae6 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:02:06:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 48;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae7 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:02:07:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 48;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae8 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:02:08:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 48;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae9 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:02:09:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 48;
+                }
+                storm-control default;
+            }
+        }
+    }
     ae10 {
         mtu 9216;
         esi {
@@ -722,30 +914,6 @@ interfaces {
             }
         }
     }
-    ae2 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:02:02:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 48;
-                }
-                storm-control default;
-            }
-        }
-    }
     ae20 {
         mtu 9216;
         esi {
@@ -986,30 +1154,6 @@ interfaces {
             }
         }
     }
-    ae3 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:02:03:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 48;
-                }
-                storm-control default;
-            }
-        }
-    }
     ae30 {
         mtu 9216;
         esi {
@@ -1058,150 +1202,6 @@ interfaces {
             }
         }
     }
-    ae4 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:02:04:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 48;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae5 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:02:05:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 48;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae6 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:02:06:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 48;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae7 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:02:07:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 48;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae8 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:02:08:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 48;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae9 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:02:09:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 48;
-                }
-                storm-control default;
-            }
-        }
-    }
     em0 {
         unit 0 {
             family inet {
@@ -1333,14 +1333,6 @@ switch-options {
     }
 }
 vlans {
-    vl48 {
-        description "DMZ VLAN";
-        vlan-id 48;
-        l3-interface irb.48;
-        vxlan {
-            vni 48;
-        }
-    }
     vl44 {
         description "Main Data Vlan";
         vlan-id 44;
@@ -1349,4 +1341,12 @@ vlans {
             vni 44;
         }
     }
+    vl48 {
+        description "DMZ VLAN";
+        vlan-id 48;
+        l3-interface irb.48;
+        vxlan {
+            vni 48;
+        }
+    }
 }
diff --git a/iom-dc/LEAF-C2-SW2.cfg b/iom-dc/LEAF-C2-SW2.cfg
index 6b0f4e8..ef6ad0e 100644
--- a/iom-dc/LEAF-C2-SW2.cfg
+++ b/iom-dc/LEAF-C2-SW2.cfg
@@ -482,6 +482,198 @@ interfaces {
             }
         }
     }
+    ae2 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:02:02:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 48;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae3 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:02:03:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 48;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae4 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:02:04:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 48;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae5 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:02:05:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 48;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae6 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:02:06:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 48;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae7 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:02:07:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 48;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae8 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:02:08:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 48;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae9 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:02:09:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 48;
+                }
+                storm-control default;
+            }
+        }
+    }
     ae10 {
         mtu 9216;
         esi {
@@ -722,30 +914,6 @@ interfaces {
             }
         }
     }
-    ae2 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:02:02:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 48;
-                }
-                storm-control default;
-            }
-        }
-    }
     ae20 {
         mtu 9216;
         esi {
@@ -986,30 +1154,6 @@ interfaces {
             }
         }
     }
-    ae3 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:02:03:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 48;
-                }
-                storm-control default;
-            }
-        }
-    }
     ae30 {
         mtu 9216;
         esi {
@@ -1058,150 +1202,6 @@ interfaces {
             }
         }
     }
-    ae4 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:02:04:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 48;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae5 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:02:05:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 48;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae6 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:02:06:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 48;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae7 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:02:07:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 48;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae8 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:02:08:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 48;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae9 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:02:09:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 48;
-                }
-                storm-control default;
-            }
-        }
-    }
     em0 {
         unit 0 {
             family inet {
@@ -1333,14 +1333,6 @@ switch-options {
     }
 }
 vlans {
-    vl48 {
-        description "DMZ VLAN";
-        vlan-id 48;
-        l3-interface irb.48;
-        vxlan {
-            vni 48;
-        }
-    }
     vl44 {
         description "Main Data Vlan";
         vlan-id 44;
@@ -1349,4 +1341,12 @@ vlans {
             vni 44;
         }
     }
+    vl48 {
+        description "DMZ VLAN";
+        vlan-id 48;
+        l3-interface irb.48;
+        vxlan {
+            vni 48;
+        }
+    }
 }
diff --git a/iom-dc/LEAF-C3-SW1.cfg b/iom-dc/LEAF-C3-SW1.cfg
index 440e9c4..2084bea 100644
--- a/iom-dc/LEAF-C3-SW1.cfg
+++ b/iom-dc/LEAF-C3-SW1.cfg
@@ -482,6 +482,198 @@ interfaces {
             }
         }
     }
+    ae2 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:03:02:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae3 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:03:03:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae4 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:03:04:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae5 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:03:05:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae6 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:03:06:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae7 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:03:07:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae8 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:03:08:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae9 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:03:09:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
     ae10 {
         mtu 9216;
         esi {
@@ -722,30 +914,6 @@ interfaces {
             }
         }
     }
-    ae2 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:03:02:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
     ae20 {
         mtu 9216;
         esi {
@@ -986,30 +1154,6 @@ interfaces {
             }
         }
     }
-    ae3 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:03:03:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
     ae30 {
         mtu 9216;
         esi {
@@ -1058,150 +1202,6 @@ interfaces {
             }
         }
     }
-    ae4 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:03:04:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae5 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:03:05:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae6 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:03:06:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae7 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:03:07:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae8 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:03:08:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae9 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:03:09:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
     em0 {
         unit 0 {
             family inet {
diff --git a/iom-dc/LEAF-C3-SW2.cfg b/iom-dc/LEAF-C3-SW2.cfg
index bd57809..d2e0889 100644
--- a/iom-dc/LEAF-C3-SW2.cfg
+++ b/iom-dc/LEAF-C3-SW2.cfg
@@ -482,6 +482,198 @@ interfaces {
             }
         }
     }
+    ae2 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:03:02:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae3 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:03:03:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae4 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:03:04:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae5 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:03:05:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae6 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:03:06:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae7 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:03:07:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae8 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:03:08:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae9 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:03:09:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
     ae10 {
         mtu 9216;
         esi {
@@ -722,30 +914,6 @@ interfaces {
             }
         }
     }
-    ae2 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:03:02:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
     ae20 {
         mtu 9216;
         esi {
@@ -986,30 +1154,6 @@ interfaces {
             }
         }
     }
-    ae3 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:03:03:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
     ae30 {
         mtu 9216;
         esi {
@@ -1058,150 +1202,6 @@ interfaces {
             }
         }
     }
-    ae4 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:03:04:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae5 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:03:05:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae6 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:03:06:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae7 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:03:07:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae8 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:03:08:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae9 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:03:09:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
     em0 {
         unit 0 {
             family inet {
diff --git a/iom-dc/LEAF-C4-SW1.cfg b/iom-dc/LEAF-C4-SW1.cfg
index e169410..50de0c3 100644
--- a/iom-dc/LEAF-C4-SW1.cfg
+++ b/iom-dc/LEAF-C4-SW1.cfg
@@ -504,6 +504,198 @@ interfaces {
             }
         }
     }
+    ae2 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:04:02:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae3 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:04:03:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae4 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:04:04:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae5 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:04:05:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae6 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:04:06:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae7 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:04:07:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae8 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:04:08:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae9 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:04:09:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
     ae10 {
         mtu 9216;
         esi {
@@ -744,30 +936,6 @@ interfaces {
             }
         }
     }
-    ae2 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:04:02:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
     ae20 {
         mtu 9216;
         esi {
@@ -1008,30 +1176,6 @@ interfaces {
             }
         }
     }
-    ae3 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:04:03:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
     ae30 {
         mtu 9216;
         esi {
@@ -1080,102 +1224,6 @@ interfaces {
             }
         }
     }
-    ae4 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:04:04:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae5 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:04:05:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae6 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:04:06:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae7 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:04:07:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
     ae70 {
         description "LAG for Cloud Direct Connects to London";
         mtu 9216;
@@ -1226,54 +1274,6 @@ interfaces {
             }
         }
     }
-    ae8 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:04:08:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae9 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:04:09:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
     em0 {
         unit 0 {
             family inet {
diff --git a/iom-dc/LEAF-C4-SW2.cfg b/iom-dc/LEAF-C4-SW2.cfg
index 19471ca..46cf38f 100644
--- a/iom-dc/LEAF-C4-SW2.cfg
+++ b/iom-dc/LEAF-C4-SW2.cfg
@@ -504,6 +504,198 @@ interfaces {
             }
         }
     }
+    ae2 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:04:02:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae3 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:04:03:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae4 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:04:04:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae5 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:04:05:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae6 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:04:06:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae7 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:04:07:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae8 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:04:08:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae9 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:04:09:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
     ae10 {
         mtu 9216;
         esi {
@@ -744,30 +936,6 @@ interfaces {
             }
         }
     }
-    ae2 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:04:02:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
     ae20 {
         mtu 9216;
         esi {
@@ -1008,30 +1176,6 @@ interfaces {
             }
         }
     }
-    ae3 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:04:03:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
     ae30 {
         mtu 9216;
         esi {
@@ -1080,102 +1224,6 @@ interfaces {
             }
         }
     }
-    ae4 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:04:04:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae5 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:04:05:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae6 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:04:06:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae7 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:04:07:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
     ae70 {
         description "LAG for Cloud Direct Connects to London";
         mtu 9216;
@@ -1226,54 +1274,6 @@ interfaces {
             }
         }
     }
-    ae8 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:04:08:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae9 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:04:09:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
     em0 {
         unit 0 {
             family inet {
diff --git a/iom-dc/LEAF-C5-SW1.cfg b/iom-dc/LEAF-C5-SW1.cfg
index 4357f18..10d9d95 100644
--- a/iom-dc/LEAF-C5-SW1.cfg
+++ b/iom-dc/LEAF-C5-SW1.cfg
@@ -482,6 +482,198 @@ interfaces {
             }
         }
     }
+    ae2 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:05:02:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae3 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:05:03:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae4 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:05:04:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae5 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:05:05:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae6 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:05:06:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae7 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:05:07:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae8 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:05:08:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae9 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:05:09:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
     ae10 {
         mtu 9216;
         esi {
@@ -722,30 +914,6 @@ interfaces {
             }
         }
     }
-    ae2 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:05:02:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
     ae20 {
         mtu 9216;
         esi {
@@ -986,30 +1154,6 @@ interfaces {
             }
         }
     }
-    ae3 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:05:03:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
     ae30 {
         mtu 9216;
         esi {
@@ -1058,150 +1202,6 @@ interfaces {
             }
         }
     }
-    ae4 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:05:04:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae5 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:05:05:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae6 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:05:06:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae7 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:05:07:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae8 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:05:08:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae9 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:05:09:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
     em0 {
         unit 0 {
             family inet {
diff --git a/iom-dc/LEAF-C5-SW2.cfg b/iom-dc/LEAF-C5-SW2.cfg
index 43ec51d..8a94e14 100644
--- a/iom-dc/LEAF-C5-SW2.cfg
+++ b/iom-dc/LEAF-C5-SW2.cfg
@@ -482,6 +482,198 @@ interfaces {
             }
         }
     }
+    ae2 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:05:02:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae3 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:05:03:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae4 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:05:04:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae5 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:05:05:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae6 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:05:06:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae7 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:05:07:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae8 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:05:08:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae9 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:05:09:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
     ae10 {
         mtu 9216;
         esi {
@@ -722,30 +914,6 @@ interfaces {
             }
         }
     }
-    ae2 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:05:02:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
     ae20 {
         mtu 9216;
         esi {
@@ -986,30 +1154,6 @@ interfaces {
             }
         }
     }
-    ae3 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:05:03:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
     ae30 {
         mtu 9216;
         esi {
@@ -1058,150 +1202,6 @@ interfaces {
             }
         }
     }
-    ae4 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:05:04:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae5 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:05:05:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae6 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:05:06:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae7 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:05:07:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae8 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:05:08:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae9 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:05:09:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
     em0 {
         unit 0 {
             family inet {
diff --git a/iom-dc/LEAF-C6-SW1.cfg b/iom-dc/LEAF-C6-SW1.cfg
index a85b408..67568dd 100644
--- a/iom-dc/LEAF-C6-SW1.cfg
+++ b/iom-dc/LEAF-C6-SW1.cfg
@@ -482,6 +482,198 @@ interfaces {
             }
         }
     }
+    ae2 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:06:02:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae3 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:06:03:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae4 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:06:04:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae5 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:06:05:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae6 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:06:06:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae7 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:06:07:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae8 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:06:08:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae9 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:06:09:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
     ae10 {
         mtu 9216;
         esi {
@@ -722,30 +914,6 @@ interfaces {
             }
         }
     }
-    ae2 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:06:02:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
     ae20 {
         mtu 9216;
         esi {
@@ -986,30 +1154,6 @@ interfaces {
             }
         }
     }
-    ae3 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:06:03:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
     ae30 {
         mtu 9216;
         esi {
@@ -1058,150 +1202,6 @@ interfaces {
             }
         }
     }
-    ae4 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:06:04:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae5 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:06:05:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae6 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:06:06:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae7 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:06:07:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae8 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:06:08:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae9 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:06:09:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
     em0 {
         unit 0 {
             family inet {
@@ -1361,14 +1361,6 @@ vlans {
             vni 47;
         }
     }
-    vl127 {
-        description "Vlan for Second Fibre Link to Clarendon house";
-        vlan-id 127;
-        l3-interface irb.127;
-        vxlan {
-            vni 127;
-        }
-    }
     vl54 {
         description "VLAN54";
         vlan-id 54;
@@ -1377,4 +1369,12 @@ vlans {
             vni 54;
         }
     }
+    vl127 {
+        description "Vlan for Second Fibre Link to Clarendon house";
+        vlan-id 127;
+        l3-interface irb.127;
+        vxlan {
+            vni 127;
+        }
+    }
 }
diff --git a/iom-dc/LEAF-C6-SW2.cfg b/iom-dc/LEAF-C6-SW2.cfg
index 4ddbed4..e23248a 100644
--- a/iom-dc/LEAF-C6-SW2.cfg
+++ b/iom-dc/LEAF-C6-SW2.cfg
@@ -517,6 +517,198 @@ interfaces {
             }
         }
     }
+    ae2 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:06:02:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae3 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:06:03:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae4 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:06:04:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae5 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:06:05:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae6 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:06:06:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae7 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:06:07:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae8 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:06:08:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae9 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:06:09:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
     ae10 {
         mtu 9216;
         esi {
@@ -757,30 +949,6 @@ interfaces {
             }
         }
     }
-    ae2 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:06:02:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
     ae20 {
         mtu 9216;
         esi {
@@ -1021,30 +1189,6 @@ interfaces {
             }
         }
     }
-    ae3 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:06:03:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
     ae30 {
         mtu 9216;
         esi {
@@ -1093,54 +1237,6 @@ interfaces {
             }
         }
     }
-    ae4 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:06:04:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae5 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:06:05:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
     ae51 {
         description "Temporary LAG to Dell S2-C1-S4K-SWx";
         mtu 9216;
@@ -1162,30 +1258,6 @@ interfaces {
             }
         }
     }
-    ae6 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:06:06:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
     ae60 {
         description "LAN Connection to Node 0 of SRX-HB01 cluster";
         mtu 9216;
@@ -1236,78 +1308,6 @@ interfaces {
             }
         }
     }
-    ae7 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:06:07:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae8 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:06:08:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae9 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:06:09:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
     em0 {
         unit 0 {
             family inet {
@@ -1467,14 +1467,6 @@ vlans {
             vni 47;
         }
     }
-    vl127 {
-        description "Vlan for Second Fibre Link to Clarendon house";
-        vlan-id 127;
-        l3-interface irb.127;
-        vxlan {
-            vni 127;
-        }
-    }
     vl54 {
         description "VLAN54";
         vlan-id 54;
@@ -1483,4 +1475,12 @@ vlans {
             vni 54;
         }
     }
+    vl127 {
+        description "Vlan for Second Fibre Link to Clarendon house";
+        vlan-id 127;
+        l3-interface irb.127;
+        vxlan {
+            vni 127;
+        }
+    }
 }
diff --git a/iom-dc/LEAF-C8-SW1.cfg b/iom-dc/LEAF-C8-SW1.cfg
index 012b393..df71209 100644
--- a/iom-dc/LEAF-C8-SW1.cfg
+++ b/iom-dc/LEAF-C8-SW1.cfg
@@ -497,6 +497,198 @@ interfaces {
             }
         }
     }
+    ae2 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:08:02:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae3 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:08:03:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae4 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:08:04:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae5 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:08:05:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae6 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:08:06:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae7 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:08:07:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae8 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:08:08:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae9 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:08:09:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
     ae10 {
         mtu 9216;
         esi {
@@ -569,31 +761,6 @@ interfaces {
             }
         }
     }
-    ae126 {
-        description "Managed WAN link to Clarendon House";
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:08:7e:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode trunk;
-                vlan {
-                    members [ 48 126 211 ];
-                }
-                storm-control default;
-            }
-        }
-    }
     ae13 {
         mtu 9216;
         esi {
@@ -762,30 +929,6 @@ interfaces {
             }
         }
     }
-    ae2 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:08:02:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
     ae20 {
         mtu 9216;
         esi {
@@ -930,30 +1073,6 @@ interfaces {
             }
         }
     }
-    ae3 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:08:03:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
     ae33 {
         mtu 9216;
         esi {
@@ -978,30 +1097,6 @@ interfaces {
             }
         }
     }
-    ae4 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:08:04:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
     ae44 {
         description "4G Link to Old Comms on IOM-DC-3750-1";
         mtu 9216;
@@ -1052,7 +1147,8 @@ interfaces {
             }
         }
     }
-    ae5 {
+    ae126 {
+        description "Managed WAN link to Clarendon House";
         mtu 9216;
         esi {
             auto-derive {
@@ -1063,110 +1159,14 @@ interfaces {
         aggregated-ether-options {
             lacp {
                 periodic fast;
-                system-id 00:00:08:05:00:01;
+                system-id 00:00:08:7e:00:01;
             }
         }
         unit 0 {
             family ethernet-switching {
-                interface-mode access;
+                interface-mode trunk;
                 vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae6 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:08:06:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae7 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:08:07:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae8 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:08:08:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae9 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:08:09:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
+                    members [ 48 126 211 ];
                 }
                 storm-control default;
             }
@@ -1327,20 +1327,20 @@ switch-options {
     }
 }
 vlans {
-    vl193 {
-        description "Cato connection for WAN 1 via Hurricane Networks";
-        vlan-id 193;
-        l3-interface irb.193;
+    vl28 {
+        description "New vlan for the 4G link to old network";
+        vlan-id 28;
+        l3-interface irb.28;
         vxlan {
-            vni 193;
+            vni 28;
         }
     }
-    vl194 {
-        description "Cato connection for WAN 2 via Domicilium Transit Internet";
-        vlan-id 194;
-        l3-interface irb.194;
+    vl44 {
+        description "Main Data Vlan";
+        vlan-id 44;
+        l3-interface irb.44;
         vxlan {
-            vni 194;
+            vni 44;
         }
     }
     vl48 {
@@ -1359,20 +1359,20 @@ vlans {
             vni 166;
         }
     }
-    vl44 {
-        description "Main Data Vlan";
-        vlan-id 44;
-        l3-interface irb.44;
+    vl193 {
+        description "Cato connection for WAN 1 via Hurricane Networks";
+        vlan-id 193;
+        l3-interface irb.193;
         vxlan {
-            vni 44;
+            vni 193;
         }
     }
-    vl28 {
-        description "New vlan for the 4G link to old network";
-        vlan-id 28;
-        l3-interface irb.28;
+    vl194 {
+        description "Cato connection for WAN 2 via Domicilium Transit Internet";
+        vlan-id 194;
+        l3-interface irb.194;
         vxlan {
-            vni 28;
+            vni 194;
         }
     }
 }
diff --git a/iom-dc/LEAF-C8-SW2.cfg b/iom-dc/LEAF-C8-SW2.cfg
index 589aa78..840855c 100644
--- a/iom-dc/LEAF-C8-SW2.cfg
+++ b/iom-dc/LEAF-C8-SW2.cfg
@@ -532,6 +532,198 @@ interfaces {
             }
         }
     }
+    ae2 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:08:02:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae3 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:08:03:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae4 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:08:04:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae5 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:08:05:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae6 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:08:06:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae7 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:08:07:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae8 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:08:08:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae9 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:08:09:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
     ae10 {
         mtu 9216;
         esi {
@@ -604,31 +796,6 @@ interfaces {
             }
         }
     }
-    ae126 {
-        description "Managed WAN link to Clarendon House";
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:08:7e:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode trunk;
-                vlan {
-                    members [ 48 126 211 ];
-                }
-                storm-control default;
-            }
-        }
-    }
     ae13 {
         mtu 9216;
         esi {
@@ -797,30 +964,6 @@ interfaces {
             }
         }
     }
-    ae2 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:08:02:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
     ae20 {
         mtu 9216;
         esi {
@@ -965,30 +1108,6 @@ interfaces {
             }
         }
     }
-    ae3 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:08:03:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
     ae34 {
         mtu 9216;
         esi {
@@ -1013,30 +1132,6 @@ interfaces {
             }
         }
     }
-    ae4 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:08:04:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
     ae44 {
         description "4G Link to Old Comms on IOM-DC-3750-1";
         mtu 9216;
@@ -1087,30 +1182,6 @@ interfaces {
             }
         }
     }
-    ae5 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:08:05:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
     ae51 {
         description "Temporary LAG to Dell S2-C1-S4K-SWx";
         mtu 9216;
@@ -1132,30 +1203,6 @@ interfaces {
             }
         }
     }
-    ae6 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:08:06:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
     ae60 {
         description "LAN Connection to Node 0 of SRX-HB01 cluster";
         mtu 9216;
@@ -1206,7 +1253,8 @@ interfaces {
             }
         }
     }
-    ae7 {
+    ae126 {
+        description "Managed WAN link to Clarendon House";
         mtu 9216;
         esi {
             auto-derive {
@@ -1217,62 +1265,14 @@ interfaces {
         aggregated-ether-options {
             lacp {
                 periodic fast;
-                system-id 00:00:08:07:00:01;
+                system-id 00:00:08:7e:00:01;
             }
         }
         unit 0 {
             family ethernet-switching {
-                interface-mode access;
+                interface-mode trunk;
                 vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae8 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:08:08:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae9 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:08:09:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
+                    members [ 48 126 211 ];
                 }
                 storm-control default;
             }
@@ -1433,20 +1433,20 @@ switch-options {
     }
 }
 vlans {
-    vl193 {
-        description "Cato connection for WAN 1 via Hurricane Networks";
-        vlan-id 193;
-        l3-interface irb.193;
+    vl28 {
+        description "New vlan for the 4G link to old network";
+        vlan-id 28;
+        l3-interface irb.28;
         vxlan {
-            vni 193;
+            vni 28;
         }
     }
-    vl194 {
-        description "Cato connection for WAN 2 via Domicilium Transit Internet";
-        vlan-id 194;
-        l3-interface irb.194;
+    vl44 {
+        description "Main Data Vlan";
+        vlan-id 44;
+        l3-interface irb.44;
         vxlan {
-            vni 194;
+            vni 44;
         }
     }
     vl48 {
@@ -1465,20 +1465,20 @@ vlans {
             vni 166;
         }
     }
-    vl44 {
-        description "Main Data Vlan";
-        vlan-id 44;
-        l3-interface irb.44;
+    vl193 {
+        description "Cato connection for WAN 1 via Hurricane Networks";
+        vlan-id 193;
+        l3-interface irb.193;
         vxlan {
-            vni 44;
+            vni 193;
         }
     }
-    vl28 {
-        description "New vlan for the 4G link to old network";
-        vlan-id 28;
-        l3-interface irb.28;
+    vl194 {
+        description "Cato connection for WAN 2 via Domicilium Transit Internet";
+        vlan-id 194;
+        l3-interface irb.194;
         vxlan {
-            vni 28;
+            vni 194;
         }
     }
 }
diff --git a/iom-dc/LEAF-C9-SW1.cfg b/iom-dc/LEAF-C9-SW1.cfg
index 188d4ef..09398c0 100644
--- a/iom-dc/LEAF-C9-SW1.cfg
+++ b/iom-dc/LEAF-C9-SW1.cfg
@@ -482,6 +482,198 @@ interfaces {
             }
         }
     }
+    ae2 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:09:02:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae3 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:09:03:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae4 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:09:04:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae5 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:09:05:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae6 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:09:06:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae7 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:09:07:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae8 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:09:08:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae9 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:09:09:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
     ae10 {
         mtu 9216;
         esi {
@@ -722,30 +914,6 @@ interfaces {
             }
         }
     }
-    ae2 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:09:02:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
     ae20 {
         mtu 9216;
         esi {
@@ -986,30 +1154,6 @@ interfaces {
             }
         }
     }
-    ae3 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:09:03:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
     ae30 {
         mtu 9216;
         esi {
@@ -1058,150 +1202,6 @@ interfaces {
             }
         }
     }
-    ae4 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:09:04:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae5 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:09:05:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae6 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:09:06:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae7 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:09:07:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae8 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:09:08:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae9 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:09:09:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
     em0 {
         unit 0 {
             family inet {
diff --git a/iom-dc/LEAF-C9-SW2.cfg b/iom-dc/LEAF-C9-SW2.cfg
index e92abe4..13d25d0 100644
--- a/iom-dc/LEAF-C9-SW2.cfg
+++ b/iom-dc/LEAF-C9-SW2.cfg
@@ -482,6 +482,198 @@ interfaces {
             }
         }
     }
+    ae2 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:09:02:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae3 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:09:03:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae4 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:09:04:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae5 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:09:05:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae6 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:09:06:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae7 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:09:07:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae8 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:09:08:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
+    ae9 {
+        mtu 9216;
+        esi {
+            auto-derive {
+                lacp;
+            }
+            all-active;
+        }
+        aggregated-ether-options {
+            lacp {
+                periodic fast;
+                system-id 00:00:09:09:00:01;
+            }
+        }
+        unit 0 {
+            family ethernet-switching {
+                interface-mode access;
+                vlan {
+                    members 44;
+                }
+                storm-control default;
+            }
+        }
+    }
     ae10 {
         mtu 9216;
         esi {
@@ -722,30 +914,6 @@ interfaces {
             }
         }
     }
-    ae2 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:09:02:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
     ae20 {
         mtu 9216;
         esi {
@@ -986,30 +1154,6 @@ interfaces {
             }
         }
     }
-    ae3 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:09:03:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
     ae30 {
         mtu 9216;
         esi {
@@ -1058,150 +1202,6 @@ interfaces {
             }
         }
     }
-    ae4 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:09:04:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae5 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:09:05:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae6 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:09:06:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae7 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:09:07:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae8 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:09:08:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
-    ae9 {
-        mtu 9216;
-        esi {
-            auto-derive {
-                lacp;
-            }
-            all-active;
-        }
-        aggregated-ether-options {
-            lacp {
-                periodic fast;
-                system-id 00:00:09:09:00:01;
-            }
-        }
-        unit 0 {
-            family ethernet-switching {
-                interface-mode access;
-                vlan {
-                    members 44;
-                }
-                storm-control default;
-            }
-        }
-    }
     em0 {
         unit 0 {
             family inet {