diff --git a/10-Top/bcmioc/top.bob b/10-Top/bcmioc/top.bob
index 3ac312129d7ed4b504785efe777ffaad9a80c30c..67082b178dfd696b104f0c189763999fc37b0c16 100644
--- a/10-Top/bcmioc/top.bob
+++ b/10-Top/bcmioc/top.bob
@@ -195,16 +195,16 @@
       <HV_EN>true</HV_EN>
       <P>$(CONTROL_GROUP):</P>
       <R>$(AMC_NAME):</R>
-      <SYSTEM1>$(CONTROL_GROUP):PBI-BCM-001:</SYSTEM1>
-      <SYSTEM10>$(CONTROL_GROUP):PBI-BCM-010:</SYSTEM10>
-      <SYSTEM2>$(CONTROL_GROUP):PBI-BCM-002:</SYSTEM2>
-      <SYSTEM3>$(CONTROL_GROUP):PBI-BCM-003:</SYSTEM3>
-      <SYSTEM4>$(CONTROL_GROUP):PBI-BCM-004:</SYSTEM4>
-      <SYSTEM5>$(CONTROL_GROUP):PBI-BCM-005:</SYSTEM5>
-      <SYSTEM6>$(CONTROL_GROUP):PBI-BCM-006:</SYSTEM6>
-      <SYSTEM7>$(CONTROL_GROUP):PBI-BCM-007:</SYSTEM7>
-      <SYSTEM8>$(CONTROL_GROUP):PBI-BCM-008:</SYSTEM8>
-      <SYSTEM9>$(CONTROL_GROUP):PBI-BCM-009:</SYSTEM9>
+      <SYSTEM1>DTL-030:PBI-BCM-001:</SYSTEM1>
+      <SYSTEM10>$(P)$(R)AI10-</SYSTEM10>
+      <SYSTEM2>DTL-040:PBI-BCM-001:</SYSTEM2>
+      <SYSTEM3>DTL-050:PBI-BCM-001:</SYSTEM3>
+      <SYSTEM4>$(P)$(R)AI4-</SYSTEM4>
+      <SYSTEM5>$(P)$(R)AI5-</SYSTEM5>
+      <SYSTEM6>$(P)$(R)AI6-</SYSTEM6>
+      <SYSTEM7>$(P)$(R)AI7-</SYSTEM7>
+      <SYSTEM8>$(P)$(R)AI8-</SYSTEM8>
+      <SYSTEM9>$(P)$(R)AI9-</SYSTEM9>
     </macros>
     <file>../../99-Shared/adsis8300bcm/bcm_inst.bob</file>
     <x>10</x>
@@ -213,7 +213,33 @@
     <height>170</height>
   </widget>
   <widget type="embedded" version="2.0.0">
-    <name>Embedded Display_6</name>
+    <name>Embedded Display_12</name>
+    <macros>
+      <AMC_NAME>Ctrl-AMC-110</AMC_NAME>
+      <CONTROL_GROUP>PBI-BCMT1</CONTROL_GROUP>
+      <EVR_DEV>EVR-101</EVR_DEV>
+      <HV_EN>true</HV_EN>
+      <P>PBI-BCMT1:</P>
+      <R>Ctrl-AMC-110:</R>
+      <SYSTEM1>TS4-ISrc:PBI-BCM-001:</SYSTEM1>
+      <SYSTEM10>$(P)$(R)AI10-</SYSTEM10>
+      <SYSTEM2>TS4-LEBT:PBI-BCM-001:</SYSTEM2>
+      <SYSTEM3>$(P)$(R)AI3-</SYSTEM3>
+      <SYSTEM4>$(P)$(R)AI4-</SYSTEM4>
+      <SYSTEM5>$(P)$(R)AI5-</SYSTEM5>
+      <SYSTEM6>$(P)$(R)AI6-</SYSTEM6>
+      <SYSTEM7>$(P)$(R)AI7-</SYSTEM7>
+      <SYSTEM8>$(P)$(R)AI8-</SYSTEM8>
+      <SYSTEM9>$(P)$(R)AI9-</SYSTEM9>
+    </macros>
+    <file>../../99-Shared/adsis8300bcm/bcm_inst.bob</file>
+    <x>830</x>
+    <y>230</y>
+    <width>410</width>
+    <height>170</height>
+  </widget>
+  <widget type="embedded" version="2.0.0">
+    <name>Embedded Display_13</name>
     <macros>
       <AMC_NAME>Ctrl-AMC-210</AMC_NAME>
       <CONTROL_GROUP>PBI-BCM02</CONTROL_GROUP>
@@ -221,16 +247,16 @@
       <HV_EN>true</HV_EN>
       <P>$(CONTROL_GROUP):</P>
       <R>$(AMC_NAME):</R>
-      <SYSTEM1>$(CONTROL_GROUP):PBI-BCM-201:</SYSTEM1>
-      <SYSTEM10>$(CONTROL_GROUP):PBI-BCM-210:</SYSTEM10>
-      <SYSTEM2>$(CONTROL_GROUP):PBI-BCM-202:</SYSTEM2>
-      <SYSTEM3>$(CONTROL_GROUP):PBI-BCM-203:</SYSTEM3>
-      <SYSTEM4>$(CONTROL_GROUP):PBI-BCM-204:</SYSTEM4>
-      <SYSTEM5>$(CONTROL_GROUP):PBI-BCM-205:</SYSTEM5>
-      <SYSTEM6>$(CONTROL_GROUP):PBI-BCM-206:</SYSTEM6>
-      <SYSTEM7>$(CONTROL_GROUP):PBI-BCM-207:</SYSTEM7>
-      <SYSTEM8>$(CONTROL_GROUP):PBI-BCM-208:</SYSTEM8>
-      <SYSTEM9>$(CONTROL_GROUP):PBI-BCM-209:</SYSTEM9>
+      <SYSTEM1>DTL-030:PBI-BCM-201:</SYSTEM1>
+      <SYSTEM10>$(P)$(R)AI10-</SYSTEM10>
+      <SYSTEM2>DTL-040:PBI-BCM-201:</SYSTEM2>
+      <SYSTEM3>DTL-050:PBI-BCM-201:</SYSTEM3>
+      <SYSTEM4>$(P)$(R)AI4-</SYSTEM4>
+      <SYSTEM5>$(P)$(R)AI5-</SYSTEM5>
+      <SYSTEM6>$(P)$(R)AI6-</SYSTEM6>
+      <SYSTEM7>$(P)$(R)AI7-</SYSTEM7>
+      <SYSTEM8>$(P)$(R)AI8-</SYSTEM8>
+      <SYSTEM9>$(P)$(R)AI9-</SYSTEM9>
     </macros>
     <file>../../99-Shared/adsis8300bcm/bcm_inst.bob</file>
     <x>10</x>
@@ -239,111 +265,111 @@
     <height>170</height>
   </widget>
   <widget type="embedded" version="2.0.0">
-    <name>Embedded Display_7</name>
+    <name>Embedded Display_15</name>
     <macros>
       <AMC_NAME>Ctrl-AMC-110</AMC_NAME>
-      <CONTROL_GROUP>PBI-BCM04</CONTROL_GROUP>
+      <CONTROL_GROUP>PBI-BCM03</CONTROL_GROUP>
       <EVR_DEV>EVR-101</EVR_DEV>
       <HV_EN>true</HV_EN>
       <P>$(CONTROL_GROUP):</P>
       <R>$(AMC_NAME):</R>
-      <SYSTEM1>$(CONTROL_GROUP):PBI-BCM-001:</SYSTEM1>
-      <SYSTEM10>$(CONTROL_GROUP):PBI-BCM-010:</SYSTEM10>
-      <SYSTEM2>$(CONTROL_GROUP):PBI-BCM-002:</SYSTEM2>
-      <SYSTEM3>$(CONTROL_GROUP):PBI-BCM-003:</SYSTEM3>
-      <SYSTEM4>$(CONTROL_GROUP):PBI-BCM-004:</SYSTEM4>
-      <SYSTEM5>$(CONTROL_GROUP):PBI-BCM-005:</SYSTEM5>
-      <SYSTEM6>$(CONTROL_GROUP):PBI-BCM-006:</SYSTEM6>
-      <SYSTEM7>$(CONTROL_GROUP):PBI-BCM-007:</SYSTEM7>
-      <SYSTEM8>$(CONTROL_GROUP):PBI-BCM-008:</SYSTEM8>
-      <SYSTEM9>$(CONTROL_GROUP):PBI-BCM-009:</SYSTEM9>
+      <SYSTEM1>MBL-010LWU:PBI-BCM-001:</SYSTEM1>
+      <SYSTEM10>$(P)$(R)AI10-</SYSTEM10>
+      <SYSTEM2>$(P)$(R)AI2-</SYSTEM2>
+      <SYSTEM3>$(P)$(R)AI3-</SYSTEM3>
+      <SYSTEM4>$(P)$(R)AI4-</SYSTEM4>
+      <SYSTEM5>$(P)$(R)AI5-</SYSTEM5>
+      <SYSTEM6>$(P)$(R)AI6-</SYSTEM6>
+      <SYSTEM7>$(P)$(R)AI7-</SYSTEM7>
+      <SYSTEM8>$(P)$(R)AI8-</SYSTEM8>
+      <SYSTEM9>$(P)$(R)AI9-</SYSTEM9>
     </macros>
     <file>../../99-Shared/adsis8300bcm/bcm_inst.bob</file>
     <x>420</x>
-    <y>230</y>
+    <y>60</y>
     <width>410</width>
     <height>170</height>
   </widget>
   <widget type="embedded" version="2.0.0">
-    <name>Embedded Display_8</name>
+    <name>Embedded Display_16</name>
     <macros>
       <AMC_NAME>Ctrl-AMC-110</AMC_NAME>
-      <CONTROL_GROUP>PBI-BCM05</CONTROL_GROUP>
+      <CONTROL_GROUP>PBI-BCM04</CONTROL_GROUP>
       <EVR_DEV>EVR-101</EVR_DEV>
       <HV_EN>true</HV_EN>
       <P>$(CONTROL_GROUP):</P>
       <R>$(AMC_NAME):</R>
-      <SYSTEM1>$(CONTROL_GROUP):PBI-BCM-001:</SYSTEM1>
-      <SYSTEM10>$(CONTROL_GROUP):PBI-BCM-010:</SYSTEM10>
-      <SYSTEM2>$(CONTROL_GROUP):PBI-BCM-002:</SYSTEM2>
-      <SYSTEM3>$(CONTROL_GROUP):PBI-BCM-003:</SYSTEM3>
-      <SYSTEM4>$(CONTROL_GROUP):PBI-BCM-004:</SYSTEM4>
-      <SYSTEM5>$(CONTROL_GROUP):PBI-BCM-005:</SYSTEM5>
-      <SYSTEM6>$(CONTROL_GROUP):PBI-BCM-006:</SYSTEM6>
-      <SYSTEM7>$(CONTROL_GROUP):PBI-BCM-007:</SYSTEM7>
-      <SYSTEM8>$(CONTROL_GROUP):PBI-BCM-008:</SYSTEM8>
-      <SYSTEM9>$(CONTROL_GROUP):PBI-BCM-009:</SYSTEM9>
+      <SYSTEM1>HBL-010LWU:PBI-BCM-001:</SYSTEM1>
+      <SYSTEM10>$(P)$(R)AI10-</SYSTEM10>
+      <SYSTEM2>$(P)$(R)AI2-</SYSTEM2>
+      <SYSTEM3>$(P)$(R)AI3-</SYSTEM3>
+      <SYSTEM4>$(P)$(R)AI4-</SYSTEM4>
+      <SYSTEM5>$(P)$(R)AI5-</SYSTEM5>
+      <SYSTEM6>$(P)$(R)AI6-</SYSTEM6>
+      <SYSTEM7>$(P)$(R)AI7-</SYSTEM7>
+      <SYSTEM8>$(P)$(R)AI8-</SYSTEM8>
+      <SYSTEM9>$(P)$(R)AI9-</SYSTEM9>
     </macros>
     <file>../../99-Shared/adsis8300bcm/bcm_inst.bob</file>
     <x>420</x>
-    <y>400</y>
+    <y>230</y>
     <width>410</width>
     <height>170</height>
   </widget>
   <widget type="embedded" version="2.0.0">
-    <name>Embedded Display_9</name>
+    <name>Embedded Display_17</name>
     <macros>
       <AMC_NAME>Ctrl-AMC-110</AMC_NAME>
-      <CONTROL_GROUP>PBI-BCM06</CONTROL_GROUP>
+      <CONTROL_GROUP>PBI-BCM05</CONTROL_GROUP>
       <EVR_DEV>EVR-101</EVR_DEV>
       <HV_EN>true</HV_EN>
       <P>$(CONTROL_GROUP):</P>
       <R>$(AMC_NAME):</R>
-      <SYSTEM1>$(CONTROL_GROUP):PBI-BCM-001:</SYSTEM1>
-      <SYSTEM10>$(CONTROL_GROUP):PBI-BCM-010:</SYSTEM10>
-      <SYSTEM2>$(CONTROL_GROUP):PBI-BCM-002:</SYSTEM2>
-      <SYSTEM3>$(CONTROL_GROUP):PBI-BCM-003:</SYSTEM3>
-      <SYSTEM4>$(CONTROL_GROUP):PBI-BCM-004:</SYSTEM4>
-      <SYSTEM5>$(CONTROL_GROUP):PBI-BCM-005:</SYSTEM5>
-      <SYSTEM6>$(CONTROL_GROUP):PBI-BCM-006:</SYSTEM6>
-      <SYSTEM7>$(CONTROL_GROUP):PBI-BCM-007:</SYSTEM7>
-      <SYSTEM8>$(CONTROL_GROUP):PBI-BCM-008:</SYSTEM8>
-      <SYSTEM9>$(CONTROL_GROUP):PBI-BCM-009:</SYSTEM9>
+      <SYSTEM1>HEBT-010LWU:PBI-BCM-001:</SYSTEM1>
+      <SYSTEM10>$(P)$(R)AI10-</SYSTEM10>
+      <SYSTEM2>$(P)$(R)AI2-</SYSTEM2>
+      <SYSTEM3>$(P)$(R)AI3-</SYSTEM3>
+      <SYSTEM4>$(P)$(R)AI4-</SYSTEM4>
+      <SYSTEM5>$(P)$(R)AI5-</SYSTEM5>
+      <SYSTEM6>$(P)$(R)AI6-</SYSTEM6>
+      <SYSTEM7>$(P)$(R)AI7-</SYSTEM7>
+      <SYSTEM8>$(P)$(R)AI8-</SYSTEM8>
+      <SYSTEM9>$(P)$(R)AI9-</SYSTEM9>
     </macros>
     <file>../../99-Shared/adsis8300bcm/bcm_inst.bob</file>
     <x>420</x>
-    <y>570</y>
+    <y>400</y>
     <width>410</width>
     <height>170</height>
   </widget>
   <widget type="embedded" version="2.0.0">
-    <name>Embedded Display_10</name>
+    <name>Embedded Display_18</name>
     <macros>
       <AMC_NAME>Ctrl-AMC-110</AMC_NAME>
-      <CONTROL_GROUP>PBI-BCM03</CONTROL_GROUP>
+      <CONTROL_GROUP>PBI-BCM06</CONTROL_GROUP>
       <EVR_DEV>EVR-101</EVR_DEV>
       <HV_EN>true</HV_EN>
       <P>$(CONTROL_GROUP):</P>
       <R>$(AMC_NAME):</R>
-      <SYSTEM1>$(CONTROL_GROUP):PBI-BCM-001:</SYSTEM1>
-      <SYSTEM10>$(CONTROL_GROUP):PBI-BCM-010:</SYSTEM10>
-      <SYSTEM2>$(CONTROL_GROUP):PBI-BCM-002:</SYSTEM2>
-      <SYSTEM3>$(CONTROL_GROUP):PBI-BCM-003:</SYSTEM3>
-      <SYSTEM4>$(CONTROL_GROUP):PBI-BCM-004:</SYSTEM4>
-      <SYSTEM5>$(CONTROL_GROUP):PBI-BCM-005:</SYSTEM5>
-      <SYSTEM6>$(CONTROL_GROUP):PBI-BCM-006:</SYSTEM6>
-      <SYSTEM7>$(CONTROL_GROUP):PBI-BCM-007:</SYSTEM7>
-      <SYSTEM8>$(CONTROL_GROUP):PBI-BCM-008:</SYSTEM8>
-      <SYSTEM9>$(CONTROL_GROUP):PBI-BCM-009:</SYSTEM9>
+      <SYSTEM1>HEBT-160LWU:PBI-BCM-001:</SYSTEM1>
+      <SYSTEM10>$(P)$(R)AI10-</SYSTEM10>
+      <SYSTEM2>A2T-010LWU:PBI-BCM-001:</SYSTEM2>
+      <SYSTEM3>DmpL-010Drf:PBI-BCM-001:</SYSTEM3>
+      <SYSTEM4>$(P)$(R)AI4-</SYSTEM4>
+      <SYSTEM5>$(P)$(R)AI5-</SYSTEM5>
+      <SYSTEM6>$(P)$(R)AI6-</SYSTEM6>
+      <SYSTEM7>$(P)$(R)AI7-</SYSTEM7>
+      <SYSTEM8>$(P)$(R)AI8-</SYSTEM8>
+      <SYSTEM9>$(P)$(R)AI9-</SYSTEM9>
     </macros>
     <file>../../99-Shared/adsis8300bcm/bcm_inst.bob</file>
     <x>420</x>
-    <y>60</y>
+    <y>570</y>
     <width>410</width>
     <height>170</height>
   </widget>
   <widget type="embedded" version="2.0.0">
-    <name>Embedded Display_11</name>
+    <name>Embedded Display_19</name>
     <macros>
       <AMC_NAME>Ctrl-AMC-110</AMC_NAME>
       <CONTROL_GROUP>PBI-BCM07</CONTROL_GROUP>
@@ -352,35 +378,9 @@
       <P>$(CONTROL_GROUP):</P>
       <R>$(AMC_NAME):</R>
       <SYSTEM1>A2T-090Drf:PBI-BCM-001:</SYSTEM1>
-      <SYSTEM10>$(CONTROL_GROUP):PBI-BCM-010:</SYSTEM10>
+      <SYSTEM10>$(P)$(R)AI10-</SYSTEM10>
       <SYSTEM2>A2T-130LWU:PBI-BCM-001:</SYSTEM2>
       <SYSTEM3>DmpL-040Drf:PBI-BCM-001:</SYSTEM3>
-      <SYSTEM4>$(CONTROL_GROUP):PBI-BCM-004:</SYSTEM4>
-      <SYSTEM5>$(CONTROL_GROUP):PBI-BCM-005:</SYSTEM5>
-      <SYSTEM6>$(CONTROL_GROUP):PBI-BCM-006:</SYSTEM6>
-      <SYSTEM7>$(CONTROL_GROUP):PBI-BCM-007:</SYSTEM7>
-      <SYSTEM8>$(CONTROL_GROUP):PBI-BCM-008:</SYSTEM8>
-      <SYSTEM9>$(CONTROL_GROUP):PBI-BCM-009:</SYSTEM9>
-    </macros>
-    <file>../../99-Shared/adsis8300bcm/bcm_inst.bob</file>
-    <x>830</x>
-    <y>60</y>
-    <width>410</width>
-    <height>170</height>
-  </widget>
-  <widget type="embedded" version="2.0.0">
-    <name>Embedded Display_12</name>
-    <macros>
-      <AMC_NAME>Ctrl-AMC-110</AMC_NAME>
-      <CONTROL_GROUP>PBI-BCMT1</CONTROL_GROUP>
-      <EVR_DEV>EVR-101</EVR_DEV>
-      <HV_EN>true</HV_EN>
-      <P>PBI-BCMT1:</P>
-      <R>Ctrl-AMC-110:</R>
-      <SYSTEM1>TS4-ISrc:PBI-BCM-001:</SYSTEM1>
-      <SYSTEM10>$(P)$(R)AI10-</SYSTEM10>
-      <SYSTEM2>TS4-LEBT:PBI-BCM-001:</SYSTEM2>
-      <SYSTEM3>$(P)$(R)AI3-</SYSTEM3>
       <SYSTEM4>$(P)$(R)AI4-</SYSTEM4>
       <SYSTEM5>$(P)$(R)AI5-</SYSTEM5>
       <SYSTEM6>$(P)$(R)AI6-</SYSTEM6>
@@ -390,7 +390,7 @@
     </macros>
     <file>../../99-Shared/adsis8300bcm/bcm_inst.bob</file>
     <x>830</x>
-    <y>230</y>
+    <y>60</y>
     <width>410</width>
     <height>170</height>
   </widget>