diff --git a/NON-APPROVED/TS2/ts2-010rfc-rflps/00_main_4klystrons.bob b/NON-APPROVED/TS2/ts2-010rfc-rflps/00_main_4klystrons.bob
index 09caece8978d5328d75f65ffb2439f4ef8bd0956..0e16aa581a3304d6466fad44e2a7e524613e882d 100644
--- a/NON-APPROVED/TS2/ts2-010rfc-rflps/00_main_4klystrons.bob
+++ b/NON-APPROVED/TS2/ts2-010rfc-rflps/00_main_4klystrons.bob
@@ -94,6 +94,11 @@
         <font name="Header 2" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
         </font>
       </font>
+      <background_color use_class="true">
+        <color name="Background" red="220" green="225" blue="221">
+        </color>
+      </background_color>
+      <transparent use_class="true">true</transparent>
       <horizontal_alignment>1</horizontal_alignment>
       <vertical_alignment>1</vertical_alignment>
     </widget>
@@ -139,10 +144,11 @@ Actual Machine State read-back</tooltip>
         <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
         </font>
       </font>
-      <foreground_color use_class="true">
-        <color name="Text" red="25" green="25" blue="25">
+      <background_color use_class="true">
+        <color name="Background" red="220" green="225" blue="221">
         </color>
-      </foreground_color>
+      </background_color>
+      <transparent use_class="true">true</transparent>
       <horizontal_alignment>1</horizontal_alignment>
       <vertical_alignment>1</vertical_alignment>
     </widget>
@@ -225,10 +231,11 @@ Actual Machine State read-back</tooltip>
         <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
         </font>
       </font>
-      <foreground_color use_class="true">
-        <color name="Text" red="25" green="25" blue="25">
+      <background_color use_class="true">
+        <color name="Background" red="220" green="225" blue="221">
         </color>
-      </foreground_color>
+      </background_color>
+      <transparent use_class="true">true</transparent>
       <horizontal_alignment>1</horizontal_alignment>
       <vertical_alignment>1</vertical_alignment>
     </widget>
@@ -270,7 +277,7 @@ Actual Machine State read-back</tooltip>
     </widget>
     <widget type="textupdate" version="2.0.0">
       <name>Text Update_193</name>
-      <pv_name>RFQ-010RFC:RFS01:CPU-ACTSTATE-RB</pv_name>
+      <pv_name>RFQ-010RFC:RFS-CPU-ACTSTATE-RB</pv_name>
       <x>130</x>
       <y>367</y>
       <width>80</width>
@@ -302,7 +309,7 @@ Actual Machine State read-back</tooltip>
     <widget type="label" version="2.0.0">
       <name>MGGrey03-title_12</name>
       <class>HEADER3</class>
-      <text>RFQ (lab)</text>
+      <text>RFQ</text>
       <x>20</x>
       <y>330</y>
       <width>220</width>
@@ -311,10 +318,11 @@ Actual Machine State read-back</tooltip>
         <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
         </font>
       </font>
-      <foreground_color use_class="true">
-        <color name="Text" red="25" green="25" blue="25">
+      <background_color use_class="true">
+        <color name="Background" red="220" green="225" blue="221">
         </color>
-      </foreground_color>
+      </background_color>
+      <transparent use_class="true">true</transparent>
       <horizontal_alignment>1</horizontal_alignment>
       <vertical_alignment>1</vertical_alignment>
     </widget>
@@ -324,7 +332,7 @@ Actual Machine State read-back</tooltip>
         <action type="open_display">
           <file>01_mainRFQ.bob</file>
           <macros>
-            <PREFIX>RFQ-010RFC:RFS01</PREFIX>
+            <PREFIX>RFQ-010RFC</PREFIX>
           </macros>
           <target>window</target>
           <description>Open Display</description>
@@ -375,6 +383,11 @@ Actual Machine State read-back</tooltip>
         <font name="Header 2" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
         </font>
       </font>
+      <background_color use_class="true">
+        <color name="Background" red="220" green="225" blue="221">
+        </color>
+      </background_color>
+      <transparent use_class="true">true</transparent>
       <horizontal_alignment>1</horizontal_alignment>
       <vertical_alignment>1</vertical_alignment>
     </widget>
@@ -417,6 +430,11 @@ Actual Machine State read-back</tooltip>
         <font name="Header 2" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
         </font>
       </font>
+      <background_color use_class="true">
+        <color name="Background" red="220" green="225" blue="221">
+        </color>
+      </background_color>
+      <transparent use_class="true">true</transparent>
       <horizontal_alignment>1</horizontal_alignment>
       <vertical_alignment>1</vertical_alignment>
     </widget>
@@ -459,6 +477,11 @@ Actual Machine State read-back</tooltip>
         <font name="Header 2" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
         </font>
       </font>
+      <background_color use_class="true">
+        <color name="Background" red="220" green="225" blue="221">
+        </color>
+      </background_color>
+      <transparent use_class="true">true</transparent>
       <horizontal_alignment>1</horizontal_alignment>
       <vertical_alignment>1</vertical_alignment>
     </widget>
@@ -482,7 +505,7 @@ Actual Machine State read-back</tooltip>
     </widget>
     <widget type="textupdate" version="2.0.0">
       <name>Text Update_194</name>
-      <pv_name>LAB-010RFC:RFS01:CPU-ACTSTATE-RB</pv_name>
+      <pv_name>LAB-010RFC:RFS-CPU-ACTSTATE-RB</pv_name>
       <x>590</x>
       <y>97</y>
       <width>80</width>
@@ -514,7 +537,7 @@ Actual Machine State read-back</tooltip>
     <widget type="label" version="2.0.0">
       <name>MGGrey03-title_14</name>
       <class>HEADER3</class>
-      <text>Lab</text>
+      <text>LAB-010</text>
       <x>480</x>
       <y>60</y>
       <width>220</width>
@@ -523,10 +546,11 @@ Actual Machine State read-back</tooltip>
         <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
         </font>
       </font>
-      <foreground_color use_class="true">
-        <color name="Text" red="25" green="25" blue="25">
+      <background_color use_class="true">
+        <color name="Background" red="220" green="225" blue="221">
         </color>
-      </foreground_color>
+      </background_color>
+      <transparent use_class="true">true</transparent>
       <horizontal_alignment>1</horizontal_alignment>
       <vertical_alignment>1</vertical_alignment>
     </widget>
@@ -534,11 +558,11 @@ Actual Machine State read-back</tooltip>
       <name>Action Button</name>
       <actions>
         <action type="open_display">
-          <file>01_mainLAB.bob</file>
+          <file>01_mainLAB10.bob</file>
           <macros>
-            <PREFIX>LAB-010RFC:RFS01</PREFIX>
+            <PREFIX>LAB-010RFC</PREFIX>
           </macros>
-          <target>replace</target>
+          <target>window</target>
           <description>Open Display</description>
         </action>
       </actions>
@@ -548,5 +572,92 @@ Actual Machine State read-back</tooltip>
       <width>160</width>
       <tooltip>$(actions)</tooltip>
     </widget>
+    <widget type="rectangle" version="2.0.0">
+      <name>RF_12</name>
+      <x>740</x>
+      <y>60</y>
+      <width>220</width>
+      <height>115</height>
+      <line_width>0</line_width>
+      <line_color>
+        <color name="GROUP-BORDER" red="150" green="155" blue="151">
+        </color>
+      </line_color>
+      <background_color>
+        <color name="Background" red="220" green="225" blue="221">
+        </color>
+      </background_color>
+      <corner_width>10</corner_width>
+      <corner_height>10</corner_height>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>Text Update_195</name>
+      <pv_name>LAB-011RFC:RFS-CPU-ACTSTATE-RB</pv_name>
+      <x>850</x>
+      <y>97</y>
+      <width>80</width>
+      <foreground_color>
+        <color red="0" green="0" blue="0">
+        </color>
+      </foreground_color>
+      <horizontal_alignment>1</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+      <wrap_words>false</wrap_words>
+      <actions>
+      </actions>
+      <tooltip>$(pv_name)
+$(pv_value)
+Actual Machine State read-back</tooltip>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_356</name>
+      <class>SECTION</class>
+      <text>Set State:</text>
+      <x>770</x>
+      <y>95</y>
+      <width>70</width>
+      <horizontal_alignment>2</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+      <actions>
+      </actions>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>MGGrey03-title_15</name>
+      <class>HEADER3</class>
+      <text>LAB-011</text>
+      <x>740</x>
+      <y>60</y>
+      <width>220</width>
+      <height>30</height>
+      <font use_class="true">
+        <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
+        </font>
+      </font>
+      <background_color use_class="true">
+        <color name="Background" red="220" green="225" blue="221">
+        </color>
+      </background_color>
+      <transparent use_class="true">true</transparent>
+      <horizontal_alignment>1</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+    </widget>
+    <widget type="action_button" version="3.0.0">
+      <name>Action Button_1</name>
+      <actions>
+        <action type="open_display">
+          <file>01_mainLAB11.bob</file>
+          <macros>
+            <PREFIX>LAB-011RFC</PREFIX>
+          </macros>
+          <target>window</target>
+          <description>Open Display</description>
+        </action>
+      </actions>
+      <text>Open UI</text>
+      <x>770</x>
+      <y>130</y>
+      <width>160</width>
+      <tooltip>$(actions)</tooltip>
+    </widget>
   </widget>
 </display>
diff --git a/NON-APPROVED/TS2/ts2-010rfc-rflps/01_mainLAB.bob b/NON-APPROVED/TS2/ts2-010rfc-rflps/01_mainLAB10.bob
similarity index 96%
rename from NON-APPROVED/TS2/ts2-010rfc-rflps/01_mainLAB.bob
rename to NON-APPROVED/TS2/ts2-010rfc-rflps/01_mainLAB10.bob
index 23ca2e6facb0b7a06fa259756a6f73d0d85e10aa..a70958064751d20ab82ef768f6f1eb438fa8ebd3 100644
--- a/NON-APPROVED/TS2/ts2-010rfc-rflps/01_mainLAB.bob
+++ b/NON-APPROVED/TS2/ts2-010rfc-rflps/01_mainLAB10.bob
@@ -2,7 +2,7 @@
 <display version="2.0.0">
   <name>01_main_LAB</name>
   <macros>
-    <DEVICE>FIM-110</DEVICE>
+    <DEVICE>RFS-FIM-110</DEVICE>
   </macros>
   <width>2300</width>
   <height>1270</height>
@@ -55,7 +55,7 @@
     <actions>
     </actions>
     <scripts>
-      <script file="scripts/fim_macros_lab_01.py" check_connections="false">
+      <script file="scripts/fim_macros_lab_10.py" check_connections="false">
       </script>
     </scripts>
   </widget>
diff --git a/NON-APPROVED/TS2/ts2-010rfc-rflps/01_mainLAB11.bob b/NON-APPROVED/TS2/ts2-010rfc-rflps/01_mainLAB11.bob
new file mode 100644
index 0000000000000000000000000000000000000000..99f78bbf9956a6a95e17a4ae7f6cfd4dacffbfc7
--- /dev/null
+++ b/NON-APPROVED/TS2/ts2-010rfc-rflps/01_mainLAB11.bob
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<display version="2.0.0">
+  <name>01_main_LAB</name>
+  <macros>
+    <DEVICE>RFS-FIM-110</DEVICE>
+  </macros>
+  <width>2300</width>
+  <height>1270</height>
+  <actions>
+  </actions>
+  <grid_visible>false</grid_visible>
+  <widget type="rectangle" version="2.0.0">
+    <name>Rectangle</name>
+    <class>TITLE-BAR</class>
+    <x use_class="true">0</x>
+    <y use_class="true">0</y>
+    <width>2300</width>
+    <height use_class="true">50</height>
+    <line_width use_class="true">0</line_width>
+    <background_color use_class="true">
+      <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
+      </color>
+    </background_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_94</name>
+    <class>TITLE</class>
+    <text>RF Local Protection System</text>
+    <x use_class="true">20</x>
+    <y use_class="true">0</y>
+    <width>1240</width>
+    <height use_class="true">50</height>
+    <font use_class="true">
+      <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
+      </font>
+    </font>
+    <foreground_color use_class="true">
+      <color name="HEADER-TEXT" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <transparent use_class="true">true</transparent>
+    <horizontal_alignment use_class="true">0</horizontal_alignment>
+    <vertical_alignment use_class="true">1</vertical_alignment>
+    <wrap_words use_class="true">false</wrap_words>
+    <actions>
+    </actions>
+  </widget>
+  <widget type="embedded" version="2.0.0">
+    <name>Linking Container</name>
+    <file>rflpsMainLAB.bob</file>
+    <x>20</x>
+    <y>70</y>
+    <width>2280</width>
+    <height>1200</height>
+    <actions>
+    </actions>
+    <scripts>
+      <script file="scripts/fim_macros_lab_11.py" check_connections="false">
+      </script>
+    </scripts>
+  </widget>
+  <widget type="embedded" version="2.0.0">
+    <name>rflpsAF2warnings_v03</name>
+    <file>support/01_main_warnings_v02.bob</file>
+    <x>1839</x>
+    <width>451</width>
+    <height>50</height>
+  </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>Action Button</name>
+    <actions>
+      <action type="open_display">
+        <file>00_main_4klystrons.bob</file>
+        <target>replace</target>
+        <description>Back to Main</description>
+      </action>
+    </actions>
+    <text>Back to main</text>
+    <x>1710</x>
+    <y>11</y>
+    <width>125</width>
+    <tooltip>$(actions)</tooltip>
+  </widget>
+</display>
diff --git a/NON-APPROVED/TS2/ts2-010rfc-rflps/01_mainRFQ.bob b/NON-APPROVED/TS2/ts2-010rfc-rflps/01_mainRFQ.bob
index 4ce31861a7ac10c7f0d253872794244a3b165df2..e5393e32a1533c9046305e1c1f4a9b4014096cf5 100644
--- a/NON-APPROVED/TS2/ts2-010rfc-rflps/01_mainRFQ.bob
+++ b/NON-APPROVED/TS2/ts2-010rfc-rflps/01_mainRFQ.bob
@@ -48,6 +48,9 @@
   <widget type="embedded" version="2.0.0">
     <name>Linking Container</name>
     <file>rflpsMainRFQ.bob</file>
+    <macros>
+      <SIMIOCSTAT>RFQ-SIM</SIMIOCSTAT>
+    </macros>
     <x>20</x>
     <y>70</y>
     <width>2280</width>
diff --git a/NON-APPROVED/TS2/ts2-010rfc-rflps/rflpsMainLAB.bob b/NON-APPROVED/TS2/ts2-010rfc-rflps/rflpsMainLAB.bob
index 03731fc0b914608f061f964cd1576154281b84a0..35724063635303eb7d6066936fcb04e1e6018d6b 100644
--- a/NON-APPROVED/TS2/ts2-010rfc-rflps/rflpsMainLAB.bob
+++ b/NON-APPROVED/TS2/ts2-010rfc-rflps/rflpsMainLAB.bob
@@ -2,7 +2,7 @@
 <display version="2.0.0">
   <name>rflpsMainLAB</name>
   <macros>
-    <DEVICE>FIM-110</DEVICE>
+    <DEVICE>RFS-FIM-110</DEVICE>
   </macros>
   <width>2280</width>
   <height>1200</height>
@@ -152,7 +152,7 @@
   </widget>
   <widget type="combo" version="2.0.0">
     <name>Device prefix combo_4</name>
-    <pv_name>$(PREFIX):CPU-OPMODE</pv_name>
+    <pv_name>$(PREFIX):RFS-CPU-OPMODE</pv_name>
     <x>1170</x>
     <y>15</y>
     <width>160</width>
@@ -164,7 +164,7 @@ Change the Operation mode of the Amplifier</tooltip>
   </widget>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_36</name>
-    <pv_name>$(PREFIX):CPU-OPMODE-RB</pv_name>
+    <pv_name>$(PREFIX):RFS-CPU-OPMODE-RB</pv_name>
     <x>1340</x>
     <y>15</y>
     <width>120</width>
@@ -227,7 +227,7 @@ Operation Mode read-back</tooltip>
   </widget>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_123</name>
-    <pv_name>$(PREFIX):CPU-ACTSTATE-RB</pv_name>
+    <pv_name>$(PREFIX):RFS-CPU-ACTSTATE-RB</pv_name>
     <x>1671</x>
     <y>15</y>
     <width>80</width>
@@ -276,7 +276,7 @@ Actual Machine State read-back</tooltip>
   </widget>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_128</name>
-    <pv_name>$(PREFIX):CPU-WRNACKREQ-RB</pv_name>
+    <pv_name>$(PREFIX):RFS-CPU-WRNACKREQ-RB</pv_name>
     <x>2054</x>
     <y>15</y>
     <width>90</width>
@@ -306,7 +306,7 @@ One or more signals are being interlocked or may require an acknowledge.</toolti
   </widget>
   <widget type="bool_button" version="2.0.0">
     <name>RESET_BUTTON_4</name>
-    <pv_name>$(PREFIX):CPU-RST</pv_name>
+    <pv_name>$(PREFIX):RFS-CPU-RST</pv_name>
     <x>2155</x>
     <y>15</y>
     <off_label>PLC Reset</off_label>
@@ -399,4 +399,26 @@ Reset all non-active interlocks</tooltip>
     <x>900</x>
     <y>15</y>
   </widget>
+  <widget type="label" version="2.0.0">
+    <name>Header</name>
+    <text>Lab Test</text>
+    <x>320</x>
+    <width>412</width>
+    <height>43</height>
+    <font>
+      <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="IO Label" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="Read_Background" red="230" green="235" blue="232">
+      </color>
+    </background_color>
+    <vertical_alignment>1</vertical_alignment>
+    <actions>
+    </actions>
+  </widget>
 </display>
diff --git a/NON-APPROVED/TS2/ts2-010rfc-rflps/rflpsMainRFQ.bob b/NON-APPROVED/TS2/ts2-010rfc-rflps/rflpsMainRFQ.bob
index d8b4c58121ad3592d06640155380a93c20d8c7e6..6e1a671cc4b2cd62e6d25ba6e6716887a71ad294 100644
--- a/NON-APPROVED/TS2/ts2-010rfc-rflps/rflpsMainRFQ.bob
+++ b/NON-APPROVED/TS2/ts2-010rfc-rflps/rflpsMainRFQ.bob
@@ -2,7 +2,7 @@
 <display version="2.0.0">
   <name>rflpsMainRFQ</name>
   <macros>
-    <DEVICE>FIM-110</DEVICE>
+    <DEVICE>RFS-FIM-110</DEVICE>
   </macros>
   <width>2280</width>
   <height>1200</height>
@@ -152,7 +152,7 @@
   </widget>
   <widget type="combo" version="2.0.0">
     <name>Device prefix combo_4</name>
-    <pv_name>$(PREFIX):CPU-OPMODE</pv_name>
+    <pv_name>$(PREFIX):RFS-CPU-OPMODE</pv_name>
     <x>1170</x>
     <y>15</y>
     <width>160</width>
@@ -164,7 +164,7 @@ Change the Operation mode of the Amplifier</tooltip>
   </widget>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_36</name>
-    <pv_name>$(PREFIX):CPU-OPMODE-RB</pv_name>
+    <pv_name>$(PREFIX):RFS-CPU-OPMODE-RB</pv_name>
     <x>1340</x>
     <y>15</y>
     <width>120</width>
@@ -227,7 +227,7 @@ Operation Mode read-back</tooltip>
   </widget>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_123</name>
-    <pv_name>$(PREFIX):CPU-ACTSTATE-RB</pv_name>
+    <pv_name>$(PREFIX):RFS-CPU-ACTSTATE-RB</pv_name>
     <x>1671</x>
     <y>15</y>
     <width>80</width>
@@ -276,7 +276,7 @@ Actual Machine State read-back</tooltip>
   </widget>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_128</name>
-    <pv_name>$(PREFIX):CPU-WRNACKREQ-RB</pv_name>
+    <pv_name>$(PREFIX):RFS-CPU-WRNACKREQ-RB</pv_name>
     <x>2054</x>
     <y>15</y>
     <width>90</width>
@@ -306,7 +306,7 @@ One or more signals are being interlocked or may require an acknowledge.</toolti
   </widget>
   <widget type="bool_button" version="2.0.0">
     <name>RESET_BUTTON_4</name>
-    <pv_name>$(PREFIX):CPU-RST</pv_name>
+    <pv_name>$(PREFIX):RFS-CPU-RST</pv_name>
     <x>2155</x>
     <y>15</y>
     <off_label>PLC Reset</off_label>
@@ -399,4 +399,15 @@ Reset all non-active interlocks</tooltip>
     <x>900</x>
     <y>15</y>
   </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label</name>
+    <text>RFQ</text>
+    <x>320</x>
+    <width>280</width>
+    <height>45</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
+      </font>
+    </font>
+  </widget>
 </display>
diff --git a/NON-APPROVED/TS2/ts2-010rfc-rflps/rflpsMainSystem01.bob b/NON-APPROVED/TS2/ts2-010rfc-rflps/rflpsMainSystem01.bob
index c971fdec36d83567a6b4288cda2b3bccc899e27d..e578ecb2d88bec11e3e3e31182a6c9f6f4def1cf 100644
--- a/NON-APPROVED/TS2/ts2-010rfc-rflps/rflpsMainSystem01.bob
+++ b/NON-APPROVED/TS2/ts2-010rfc-rflps/rflpsMainSystem01.bob
@@ -344,7 +344,7 @@ Reset all non-active interlocks</tooltip>
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>EmbeddedMachineControl</name>
-    <file>support/machineStateControl.bob</file>
+    <file>support/machineStateControlTS2.bob</file>
     <width>300</width>
     <height>1180</height>
   </widget>
@@ -395,4 +395,26 @@ Reset all non-active interlocks</tooltip>
     <x>1803</x>
     <y>15</y>
   </widget>
+  <widget type="label" version="2.0.0">
+    <name>Header_1</name>
+    <text>TS2 System 1</text>
+    <x>330</x>
+    <width>412</width>
+    <height>43</height>
+    <font>
+      <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="IO Label" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="Read_Background" red="230" green="235" blue="232">
+      </color>
+    </background_color>
+    <vertical_alignment>1</vertical_alignment>
+    <actions>
+    </actions>
+  </widget>
 </display>
diff --git a/NON-APPROVED/TS2/ts2-010rfc-rflps/rflpsMainSystem02.bob b/NON-APPROVED/TS2/ts2-010rfc-rflps/rflpsMainSystem02.bob
index e4863b849ff64c1c943a22f00141f142fb2cc598..64259835820ddda3c8f06a3c4f8f0f3c0c5069b4 100644
--- a/NON-APPROVED/TS2/ts2-010rfc-rflps/rflpsMainSystem02.bob
+++ b/NON-APPROVED/TS2/ts2-010rfc-rflps/rflpsMainSystem02.bob
@@ -340,7 +340,7 @@ Reset all non-active interlocks</tooltip>
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>EmbeddedMachineControl</name>
-    <file>support/machineStateControl.bob</file>
+    <file>support/machineStateControlTS2.bob</file>
     <width>300</width>
     <height>1180</height>
   </widget>
@@ -391,4 +391,26 @@ Reset all non-active interlocks</tooltip>
     <x>1803</x>
     <y>15</y>
   </widget>
+  <widget type="label" version="2.0.0">
+    <name>Header_1</name>
+    <text>TS2 System 2</text>
+    <x>330</x>
+    <width>412</width>
+    <height>43</height>
+    <font>
+      <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="IO Label" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="Read_Background" red="230" green="235" blue="232">
+      </color>
+    </background_color>
+    <vertical_alignment>1</vertical_alignment>
+    <actions>
+    </actions>
+  </widget>
 </display>
diff --git a/NON-APPROVED/TS2/ts2-010rfc-rflps/scripts/fim_macros_lab_01.py b/NON-APPROVED/TS2/ts2-010rfc-rflps/scripts/fim_macros_lab_10.py
similarity index 64%
rename from NON-APPROVED/TS2/ts2-010rfc-rflps/scripts/fim_macros_lab_01.py
rename to NON-APPROVED/TS2/ts2-010rfc-rflps/scripts/fim_macros_lab_10.py
index 218ec7fd89a8e3c8255ae456603e2b810e4e447d..219dc1366eaa7f17f264a8a8b9de2940a8020bd4 100755
--- a/NON-APPROVED/TS2/ts2-010rfc-rflps/scripts/fim_macros_lab_01.py
+++ b/NON-APPROVED/TS2/ts2-010rfc-rflps/scripts/fim_macros_lab_10.py
@@ -5,9 +5,9 @@ from org.csstudio.opibuilder.scriptUtil import PVUtil
 # The next step is to read the values from a file under version control;
 
 # Section and subsection are fixed per script 
-prefix_ = "LAB-010RFC:RFS01"
+prefix_ = "LAB-010RFC"
 sec_ = "LAB"
-subsec_ = "010RFC:RFS01"
+subsec_ = "010RFC"
 
 # Adding the macros on the widget that will consume this script
 widget.getPropertyValue("macros").add("PREFIX", prefix_)
@@ -15,54 +15,61 @@ widget.getPropertyValue("macros").add("SEC", sec_)
 widget.getPropertyValue("macros").add("SUB", subsec_)
 
 # This macro refers to the IOCStats Modules:
-iocstats_ = "RFLAB-01"
+iocstats_ = "LAB-010"
 
 ##################################################################################################
 #	Hardcoded macro data
 ##################################################################################################
 
 # This macro refers to the IOC main PVs:
-ioc_ = "FIM-110"
+ioc_ = "RFS-FIM-110"
 
 # Analog input macros
-ai00_ = "Mod-110:Cur"
-ai01_ = "Mod-110:Vol"
-ai02_ = "SolPS-110:Cur"
-ai03_ = "SolPS-120:Cur"
-ai04_ = "SolPS-130:Cur"
-ai05_ = "FIM-110:AI5"
-ai06_ = "FIM-110:AI6"
-ai07_ = "FIM-110:AI7"
-ai08_ = "FIM-110:AI8"
-ai09_ = "FIM-110:AI9"
+ai10_ = "RFS-Mod-110:Cur"
+ai11_ = "RFS-Mod-110:Vol"
+ai12_ = "RFS-SolPS-110:Cur"
+ai13_ = "RFS-SolPS-120:Cur"
+ai14_ = "RFS-SolPS-130:Cur"
+ai15_ = "RFS-FIM-110:AI5"
+ai16_ = "RFS-FIM-110:AI6"
+ai17_ = "RFS-FIM-110:AI7"
+ai18_ = "RFS-FIM-110:AI8"
+ai19_ = "RFS-FIM-110:AI9"
+ai00_ = "RFS-DirC-110:PwrFwdDA"
+ai01_ = "RFS-DirC-110:PwrFwdPA"
+ai02_ = "RFS-DirC-110:PwrFwdL2"
+ai03_ = "RFS-DirC-110:PwrRflctPA"
+ai04_ = "RFS-DirC-110:PwrFwdC1"
+ai05_ = "RFS-DirC-110:PwrFwdC2"
+ai06_ = "RFS-DirC-110:PwrFwdL1"
+ai07_ = "RFS-DirC-110:PwrRflctL2"
+ai08_ = "RFS-DirC-110:PwrRflctC1"
+ai09_ = "RFS-DirC-110:PwrRflctC2"
 
-ai10_ = "DirC-110:PwrFwdDA"
-ai11_ = "DirC-110:PwrFwdPA"
-ai12_ = "DirC-110:PwrFwdL2"
-ai13_ = "DirC-110:PwrRflctPA"
-ai14_ = "DirC-110:PwrFwdC1"
-ai15_ = "DirC-110:PwrFwdC2"
-ai16_ = "DirC-110:PwrFwdL1"
-ai17_ = "DirC-110:PwrRflctL2"
-ai18_ = "DirC-110:PwrRflctC1"
-ai19_ = "DirC-110:PwrRflctC2"
+di00_ = "RFS-SIM-110:HvEnaCmd"
+di01_ = "RFS-SIM-110:RfEnaCmd"
+di02_ = "RFS-SIM-110:PCconnect"
+di03_ = "RFS-Mod-110:Fault"
+di04_ = "RFS-VacPS-110:I-SP"
+di05_ = "RFS-VacPS-120:I-SP"
+di06_ = "RFS-ADR-110:ItlckStat"
+di07_ = "RFS-FIM-110:DI7"
+di08_ = "RFS-ADR-201001:ItckStat"
+di09_ = "RFS-ADR-201002:ItckStat"
+di10_ = "RFS-ADR-201003:ItckStat"
+di11_ = "RFS-ADR-201004:ItckStat"
+di12_ = "RFS-ADR-201005:ItckStat"
+di13_ = "RFS-FIM-110:DI13"
+di14_ = "RFS-FIM-110:DI14"
+di15_ = "RFS-FIM-110:DI15"
+di16_ = "RFS-FIM-110:DI16"
+di17_ = "RFS-FIM-110:DI17"
+di18_ = "RFS-FIM-110:DI18"
+di19_ = "RFS-FIM-110:DI19"
+di20_ = "RFS-FIM-110:DI20"
 
-di00_ = "SIM-110:HvEnaCmd"
-di01_ = "SIM-110:RfEnaCmd"
-di02_ = "SIM-110:PCconnect"
-di03_ = "Mod-110:Fault"
-di04_ = "VacPS-110:I-SP"
-di05_ = "VacPS-110:I-SP"
-di06_ = "VacPS-120:I-SP"
-di07_ = "FIM-110:DI7"
-di08_ = "ADR-201001:ItckStat"
-di09_ = "ADR-201002:ItckStat"
-di10_ = "ADR-201003:ItckStat"
-di11_ = "ADR-201004:ItckStat"
-di12_ = "ADR-201005:ItckStat"
-di13_ = "FIM-110:DI13"
-di14_ = "FIM-110:DI14"
-di15_ = "FIM-110:DI15"
+refpwr00_ = "RFS-FIM-110:REFPWR0"
+refpwr01_ = "RFS-FIM-110:REFPWR1"
 
 ########################################################################################################
 
@@ -70,7 +77,6 @@ di15_ = "FIM-110:DI15"
 widget.getPropertyValue("macros").add("IOC_", ioc_)
 widget.getPropertyValue("macros").add("IOCSTATS_", iocstats_)
 
-
 # Analog input macros
 widget.getPropertyValue("macros").add("AI00", ai00_)
 widget.getPropertyValue("macros").add("AI01", ai01_)
@@ -110,4 +116,13 @@ widget.getPropertyValue("macros").add("DI12", di12_)
 widget.getPropertyValue("macros").add("DI13", di13_)
 widget.getPropertyValue("macros").add("DI14", di14_)
 widget.getPropertyValue("macros").add("DI15", di15_)
+widget.getPropertyValue("macros").add("DI16", di16_)
+widget.getPropertyValue("macros").add("DI17", di17_)
+widget.getPropertyValue("macros").add("DI18", di18_)
+widget.getPropertyValue("macros").add("DI19", di19_)
+widget.getPropertyValue("macros").add("DI20", di20_)
+
+# Reflected Power macros
+widget.getPropertyValue("macros").add("REFPWR0", refpwr00_)
+widget.getPropertyValue("macros").add("REFPWR1", refpwr01_)
 
diff --git a/NON-APPROVED/TS2/ts2-010rfc-rflps/scripts/fim_macros_lab_11.py b/NON-APPROVED/TS2/ts2-010rfc-rflps/scripts/fim_macros_lab_11.py
new file mode 100644
index 0000000000000000000000000000000000000000..5150a6e85dd000b4627cba69261df79d3d471b1c
--- /dev/null
+++ b/NON-APPROVED/TS2/ts2-010rfc-rflps/scripts/fim_macros_lab_11.py
@@ -0,0 +1,129 @@
+from org.csstudio.opibuilder.scriptUtil import PVUtil
+
+# This script will populate several macros that will be used to mount the PV names inside the GUIs
+# In this first version, the content of the macros are hardcoded inside this script. 
+# The next step is to read the values from a file under version control;
+
+# Section and subsection are fixed per script 
+prefix_ = "LAB-011RFC"
+sec_ = "LAB"
+subsec_ = "011RFC"
+
+# Adding the macros on the widget that will consume this script
+widget.getPropertyValue("macros").add("PREFIX", prefix_)
+widget.getPropertyValue("macros").add("SEC", sec_)
+widget.getPropertyValue("macros").add("SUB", subsec_)
+
+# This macro refers to the IOCStats Modules:
+iocstats_ = "LAB-011"
+
+##################################################################################################
+#	Hardcoded macro data
+##################################################################################################
+
+# This macro refers to the IOC main PVs:
+ioc_ = "RFS-FIM-110"
+
+# Analog input macros
+ai10_ = "RFS-Mod-110:Cur"
+ai11_ = "RFS-Mod-110:Vol"
+ai12_ = "RFS-SolPS-110:Cur"
+ai13_ = "RFS-SolPS-120:Cur"
+ai14_ = "RFS-SolPS-130:Cur"
+ai15_ = "RFS-FIM-110:AI5"
+ai16_ = "RFS-FIM-110:AI6"
+ai17_ = "RFS-FIM-110:AI7"
+ai18_ = "RFS-FIM-110:AI8"
+ai19_ = "RFS-FIM-110:AI9"
+ai00_ = "RFS-DirC-110:PwrFwdDA"
+ai01_ = "RFS-DirC-110:PwrFwdPA"
+ai02_ = "RFS-DirC-110:PwrFwdL2"
+ai03_ = "RFS-DirC-110:PwrRflctPA"
+ai04_ = "RFS-DirC-110:PwrFwdC1"
+ai05_ = "RFS-DirC-110:PwrFwdC2"
+ai06_ = "RFS-DirC-110:PwrFwdL1"
+ai07_ = "RFS-DirC-110:PwrRflctL2"
+ai08_ = "RFS-DirC-110:PwrRflctC1"
+ai09_ = "RFS-DirC-110:PwrRflctC2"
+
+di00_ = "RFS-SIM-110:HvEnaCmd"
+di01_ = "RFS-SIM-110:RfEnaCmd"
+di02_ = "RFS-SIM-110:PCconnect"
+di03_ = "RFS-Mod-110:Fault"
+di04_ = "RFS-VacPS-110:I-SP"
+di05_ = "RFS-VacPS-120:I-SP"
+di06_ = "RFS-ADR-110:ItlckStat"
+di07_ = "RFS-FIM-110:DI7"
+di08_ = "RFS-ADR-201001:ItckStat"
+di09_ = "RFS-ADR-201002:ItckStat"
+di10_ = "RFS-ADR-201003:ItckStat"
+di11_ = "RFS-ADR-201004:ItckStat"
+di12_ = "RFS-ADR-201005:ItckStat"
+di13_ = "RFS-FIM-110:DI13"
+di14_ = "RFS-FIM-110:DI14"
+di15_ = "RFS-FIM-110:DI15"
+di16_ = "RFS-FIM-110:DI16"
+di17_ = "RFS-FIM-110:DI17"
+di18_ = "RFS-FIM-110:DI18"
+di19_ = "RFS-FIM-110:DI19"
+di20_ = "RFS-FIM-110:DI20"
+
+refpwr00_ = "RFS-FIM-110:REFPWR0"
+refpwr01_ = "RFS-FIM-110:REFPWR1"
+
+########################################################################################################
+
+# Adding the macros on the widget that will consume this script
+widget.getPropertyValue("macros").add("IOC_", ioc_)
+widget.getPropertyValue("macros").add("IOCSTATS_", iocstats_)
+
+
+# Analog input macros
+widget.getPropertyValue("macros").add("AI00", ai00_)
+widget.getPropertyValue("macros").add("AI01", ai01_)
+widget.getPropertyValue("macros").add("AI02", ai02_)
+widget.getPropertyValue("macros").add("AI03", ai03_)
+widget.getPropertyValue("macros").add("AI04", ai04_)
+widget.getPropertyValue("macros").add("AI05", ai05_)
+widget.getPropertyValue("macros").add("AI06", ai06_)
+widget.getPropertyValue("macros").add("AI07", ai07_)
+widget.getPropertyValue("macros").add("AI08", ai08_)
+widget.getPropertyValue("macros").add("AI09", ai09_)
+widget.getPropertyValue("macros").add("AI10", ai10_)
+widget.getPropertyValue("macros").add("AI11", ai11_)
+widget.getPropertyValue("macros").add("AI12", ai12_)
+widget.getPropertyValue("macros").add("AI13", ai13_)
+widget.getPropertyValue("macros").add("AI14", ai14_)
+widget.getPropertyValue("macros").add("AI15", ai15_)
+widget.getPropertyValue("macros").add("AI16", ai16_)
+widget.getPropertyValue("macros").add("AI17", ai17_)
+widget.getPropertyValue("macros").add("AI18", ai18_)
+widget.getPropertyValue("macros").add("AI19", ai19_)
+
+# Digital input macros
+widget.getPropertyValue("macros").add("DI00", di00_)
+widget.getPropertyValue("macros").add("DI01", di01_)
+widget.getPropertyValue("macros").add("DI02", di02_)
+widget.getPropertyValue("macros").add("DI03", di03_)
+widget.getPropertyValue("macros").add("DI04", di04_)
+widget.getPropertyValue("macros").add("DI05", di05_)
+widget.getPropertyValue("macros").add("DI06", di06_)
+widget.getPropertyValue("macros").add("DI07", di07_)
+widget.getPropertyValue("macros").add("DI08", di08_)
+widget.getPropertyValue("macros").add("DI09", di09_)
+widget.getPropertyValue("macros").add("DI10", di10_)
+widget.getPropertyValue("macros").add("DI11", di11_)
+widget.getPropertyValue("macros").add("DI12", di12_)
+widget.getPropertyValue("macros").add("DI13", di13_)
+widget.getPropertyValue("macros").add("DI14", di14_)
+widget.getPropertyValue("macros").add("DI15", di15_)
+widget.getPropertyValue("macros").add("DI16", di16_)
+widget.getPropertyValue("macros").add("DI17", di17_)
+widget.getPropertyValue("macros").add("DI18", di18_)
+widget.getPropertyValue("macros").add("DI19", di19_)
+widget.getPropertyValue("macros").add("DI20", di20_)
+
+# Reflected Power macros
+widget.getPropertyValue("macros").add("REFPWR0", refpwr00_)
+widget.getPropertyValue("macros").add("REFPWR1", refpwr01_)
+
diff --git a/NON-APPROVED/TS2/ts2-010rfc-rflps/scripts/fim_macros_rfq_01.py b/NON-APPROVED/TS2/ts2-010rfc-rflps/scripts/fim_macros_rfq_01.py
index 0a6e93adc18988ecf46ab43b10ac5ec747be8833..0233424f120b800f87e3600f7979e92a3d7177ca 100755
--- a/NON-APPROVED/TS2/ts2-010rfc-rflps/scripts/fim_macros_rfq_01.py
+++ b/NON-APPROVED/TS2/ts2-010rfc-rflps/scripts/fim_macros_rfq_01.py
@@ -5,9 +5,9 @@ from org.csstudio.opibuilder.scriptUtil import PVUtil
 # The next step is to read the values from a file under version control;
 
 # Section and subsection are fixed per script 
-prefix_ = "RFQ-010RFC:RFS01"
+prefix_ = "RFQ-010RFC"
 sec_ = "RFQ"
-subsec_ = "010RFC:RFS01"
+subsec_ = "010RFC"
 
 # Adding the macros on the widget that will consume this script
 widget.getPropertyValue("macros").add("PREFIX", prefix_)
@@ -15,54 +15,61 @@ widget.getPropertyValue("macros").add("SEC", sec_)
 widget.getPropertyValue("macros").add("SUB", subsec_)
 
 # This macro refers to the IOCStats Modules:
-iocstats_ = "RFQ-01"
+iocstats_ = "RFQ-010"
 
 ##################################################################################################
 #	Hardcoded macro data
 ##################################################################################################
 
 # This macro refers to the IOC main PVs:
-ioc_ = "FIM-110"
+ioc_ = "RFS-FIM-110"
 
 # Analog input macros
-ai00_ = "Mod-110:Cur"
-ai01_ = "Mod-110:Vol"
-ai02_ = "SolPS-110:Cur"
-ai03_ = "SolPS-120:Cur"
-ai04_ = "SolPS-130:Cur"
-ai05_ = "FIM-110:AI5"
-ai06_ = "FIM-110:AI6"
-ai07_ = "FIM-110:AI7"
-ai08_ = "FIM-110:AI8"
-ai09_ = "FIM-110:AI9"
-
-ai10_ = "DirC-110:PwrFwdDA"
-ai11_ = "DirC-110:PwrFwdPA"
-ai12_ = "DirC-110:PwrFwdL2"
-ai13_ = "DirC-110:PwrRflctPA"
-ai14_ = "DirC-110:PwrFwdC1"
-ai15_ = "DirC-110:PwrFwdC2"
-ai16_ = "DirC-110:PwrFwdL1"
-ai17_ = "DirC-110:PwrRflctL2"
-ai18_ = "DirC-110:PwrRflctC1"
-ai19_ = "DirC-110:PwrRflctC2"
-
-di00_ = "SIM-110:HvEnaCmd"
-di01_ = "SIM-110:RfEnaCmd"
-di02_ = "SIM-110:PCconnect"
-di03_ = "Mod-110:Fault"
-di04_ = "VacPS-110:I-SP"
-di05_ = "VacPS-110:I-SP"
-di06_ = "VacPS-120:I-SP"
-di07_ = "FIM-110:DI7"
-di08_ = "ADR-201001:ItckStat"
-di09_ = "ADR-201002:ItckStat"
-di10_ = "ADR-201003:ItckStat"
-di11_ = "ADR-201004:ItckStat"
-di12_ = "ADR-201005:ItckStat"
-di13_ = "FIM-110:DI13"
-di14_ = "FIM-110:DI14"
-di15_ = "FIM-110:DI15"
+ai10_ = "RFS-Mod-110:Cur"
+ai11_ = "RFS-Mod-110:Vol"
+ai12_ = "RFS-SolPS-110:Cur"
+ai13_ = "RFS-SolPS-120:Cur"
+ai14_ = "RFS-SolPS-130:Cur"
+ai15_ = "RFS-FIM-110:AI5"
+ai16_ = "RFS-FIM-110:AI6"
+ai17_ = "RFS-FIM-110:AI7"
+ai18_ = "RFS-FIM-110:AI8"
+ai19_ = "RFS-FIM-110:AI9"
+ai00_ = "RFS-DirC-110:PwrFwdDA"
+ai01_ = "RFS-DirC-110:PwrFwdPA"
+ai02_ = "RFS-DirC-110:PwrFwdL2"
+ai03_ = "RFS-DirC-110:PwrRflctPA"
+ai04_ = "RFS-DirC-110:PwrFwdC1"
+ai05_ = "RFS-DirC-110:PwrFwdC2"
+ai06_ = "RFS-DirC-110:PwrFwdL1"
+ai07_ = "RFS-DirC-110:PwrRflctL2"
+ai08_ = "RFS-DirC-110:PwrRflctC1"
+ai09_ = "RFS-DirC-110:PwrRflctC2"
+
+di00_ = "RFS-SIM-110:HvEnaCmd"
+di01_ = "RFS-SIM-110:RfEnaCmd"
+di02_ = "RFS-SIM-110:PCconnect"
+di03_ = "RFS-Mod-110:Fault"
+di04_ = "RFS-VacPS-110:I-SP"
+di05_ = "RFS-VacPS-120:I-SP"
+di06_ = "RFS-ADR-110:ItlckStat"
+di07_ = "RFS-FIM-110:DI7"
+di08_ = "RFS-ADR-201001:ItckStat"
+di09_ = "RFS-ADR-201002:ItckStat"
+di10_ = "RFS-ADR-201003:ItckStat"
+di11_ = "RFS-ADR-201004:ItckStat"
+di12_ = "RFS-ADR-201005:ItckStat"
+di13_ = "RFS-FIM-110:DI13"
+di14_ = "RFS-FIM-110:DI14"
+di15_ = "RFS-FIM-110:DI15"
+di16_ = "RFS-FIM-110:DI16"
+di17_ = "RFS-FIM-110:DI17"
+di18_ = "RFS-FIM-110:DI18"
+di19_ = "RFS-FIM-110:DI19"
+di20_ = "RFS-FIM-110:DI20"
+
+refpwr00_ = "RFS-FIM-110:REFPWR0"
+refpwr01_ = "RFS-FIM-110:REFPWR1"
 
 ########################################################################################################
 
@@ -110,4 +117,13 @@ widget.getPropertyValue("macros").add("DI12", di12_)
 widget.getPropertyValue("macros").add("DI13", di13_)
 widget.getPropertyValue("macros").add("DI14", di14_)
 widget.getPropertyValue("macros").add("DI15", di15_)
+widget.getPropertyValue("macros").add("DI16", di16_)
+widget.getPropertyValue("macros").add("DI17", di17_)
+widget.getPropertyValue("macros").add("DI18", di18_)
+widget.getPropertyValue("macros").add("DI19", di19_)
+widget.getPropertyValue("macros").add("DI20", di20_)
+
+# Reflected Power macros
+widget.getPropertyValue("macros").add("REFPWR0", refpwr00_)
+widget.getPropertyValue("macros").add("REFPWR1", refpwr01_)
 
diff --git a/NON-APPROVED/TS2/ts2-010rfc-rflps/scripts/fim_macros_ts2_01.py b/NON-APPROVED/TS2/ts2-010rfc-rflps/scripts/fim_macros_ts2_01.py
index 5e4957a05c6b1262e61df20619f75d0b8f61ef5f..1ede96ad993af0541df41db729e6c4b8f428a838 100755
--- a/NON-APPROVED/TS2/ts2-010rfc-rflps/scripts/fim_macros_ts2_01.py
+++ b/NON-APPROVED/TS2/ts2-010rfc-rflps/scripts/fim_macros_ts2_01.py
@@ -62,6 +62,14 @@ di12_ = "ADR-201005:ItckStat"
 di13_ = "FIM-110:DI13"
 di14_ = "FIM-110:DI14"
 di15_ = "FIM-110:DI15"
+di16_ = "FIM-110:DI16"
+di17_ = "FIM-110:DI17"
+di18_ = "FIM-110:DI18"
+di19_ = "FIM-110:DI19"
+di20_ = "FIM-110:DI20"
+
+refpwr00_ = "FIM-110:REFPWR0"
+refpwr01_ = "FIM-110:REFPWR1"
 
 ########################################################################################################
 
@@ -109,4 +117,12 @@ widget.getPropertyValue("macros").add("DI12", di12_)
 widget.getPropertyValue("macros").add("DI13", di13_)
 widget.getPropertyValue("macros").add("DI14", di14_)
 widget.getPropertyValue("macros").add("DI15", di15_)
+widget.getPropertyValue("macros").add("DI16", di16_)
+widget.getPropertyValue("macros").add("DI17", di17_)
+widget.getPropertyValue("macros").add("DI18", di18_)
+widget.getPropertyValue("macros").add("DI19", di19_)
+widget.getPropertyValue("macros").add("DI20", di20_)
 
+# Reflected Power macros
+widget.getPropertyValue("macros").add("REFPWR0", refpwr00_)
+widget.getPropertyValue("macros").add("REFPWR1", refpwr01_)
diff --git a/NON-APPROVED/TS2/ts2-010rfc-rflps/scripts/fim_macros_ts2_02.py b/NON-APPROVED/TS2/ts2-010rfc-rflps/scripts/fim_macros_ts2_02.py
index a864ee606621c8ef824d42b5ff7331537b53758a..254f55f6ffbb56e906e030cbe8033ae4794c162b 100755
--- a/NON-APPROVED/TS2/ts2-010rfc-rflps/scripts/fim_macros_ts2_02.py
+++ b/NON-APPROVED/TS2/ts2-010rfc-rflps/scripts/fim_macros_ts2_02.py
@@ -62,6 +62,14 @@ di12_ = "ADR-201005:ItckStat"
 di13_ = "FIM-110:DI13"
 di14_ = "FIM-110:DI14"
 di15_ = "FIM-110:DI15"
+di16_ = "FIM-110:DI16"
+di17_ = "FIM-110:DI17"
+di18_ = "FIM-110:DI18"
+di19_ = "FIM-110:DI19"
+di20_ = "FIM-110:DI20"
+
+refpwr00_ = "FIM-110:REFPWR0"
+refpwr01_ = "FIM-110:REFPWR1"
 
 ########################################################################################################
 
@@ -109,4 +117,13 @@ widget.getPropertyValue("macros").add("DI12", di12_)
 widget.getPropertyValue("macros").add("DI13", di13_)
 widget.getPropertyValue("macros").add("DI14", di14_)
 widget.getPropertyValue("macros").add("DI15", di15_)
+widget.getPropertyValue("macros").add("DI16", di16_)
+widget.getPropertyValue("macros").add("DI17", di17_)
+widget.getPropertyValue("macros").add("DI18", di18_)
+widget.getPropertyValue("macros").add("DI19", di19_)
+widget.getPropertyValue("macros").add("DI20", di20_)
+
+# Reflected Power macros
+widget.getPropertyValue("macros").add("REFPWR0", refpwr00_)
+widget.getPropertyValue("macros").add("REFPWR1", refpwr01_)
 
diff --git a/NON-APPROVED/TS2/ts2-010rfc-rflps/support/01_main_warnings_v02.bob b/NON-APPROVED/TS2/ts2-010rfc-rflps/support/01_main_warnings_v02.bob
index 18872c74a8725a7e7f398d277607052439792348..13858202467178a2d88a5bfcbb6a24d15eaff1f0 100644
--- a/NON-APPROVED/TS2/ts2-010rfc-rflps/support/01_main_warnings_v02.bob
+++ b/NON-APPROVED/TS2/ts2-010rfc-rflps/support/01_main_warnings_v02.bob
@@ -110,7 +110,7 @@
   </widget>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_60</name>
-    <pv_name>$(PREFIX):FIM-110:STAT-RB</pv_name>
+    <pv_name>$(PREFIX):RFS-FIM-110:STAT-RB</pv_name>
     <x>10</x>
     <y>12</y>
     <width>90</width>
diff --git a/NON-APPROVED/TS2/ts2-010rfc-rflps/support/ChOverview_v02.bob b/NON-APPROVED/TS2/ts2-010rfc-rflps/support/ChOverview_v02.bob
index 916c16877accccd49af25072c4932a24170b2b27..b5f82b3b88847b5cc4bc60209e4f296005859bec 100644
--- a/NON-APPROVED/TS2/ts2-010rfc-rflps/support/ChOverview_v02.bob
+++ b/NON-APPROVED/TS2/ts2-010rfc-rflps/support/ChOverview_v02.bob
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <display version="2.0.0">
   <name>FIM Channel Overview v02</name>
+  <width>910</width>
   <height>34</height>
   <widget type="textupdate" version="2.0.0">
     <name>LED_8</name>
     <pv_name>$(PREFIX):$(DEVICE):HVToRF-RB</pv_name>
-    <x>580</x>
+    <x>685</x>
     <y>7</y>
     <width>70</width>
     <height>21</height>
@@ -58,7 +59,7 @@
   <widget type="label" version="2.0.0">
     <name>LED_5</name>
     <text>NOK</text>
-    <x>560</x>
+    <x>665</x>
     <y>7</y>
     <width>20</width>
     <height>21</height>
@@ -107,7 +108,7 @@
       </action>
     </actions>
     <text>...</text>
-    <x>670</x>
+    <x>775</x>
     <y>5</y>
     <width>30</width>
     <height>24</height>
@@ -120,7 +121,7 @@
   <widget type="textupdate" version="2.0.0">
     <name>LED_6</name>
     <pv_name>$(PREFIX):$(DEVICE):IdleToHV-RB</pv_name>
-    <x>470</x>
+    <x>575</x>
     <y>7</y>
     <width>70</width>
     <height>21</height>
@@ -173,7 +174,7 @@
   <widget type="label" version="2.0.0">
     <name>LED_7</name>
     <text>NOK</text>
-    <x>450</x>
+    <x>555</x>
     <y>7</y>
     <width>20</width>
     <height>21</height>
@@ -215,7 +216,7 @@
   <widget type="picture" version="2.0.0">
     <name>Picture_4</name>
     <file>symbols/interlock_healthy_cms@32.png</file>
-    <x>770</x>
+    <x>875</x>
     <y>5</y>
     <width>24</width>
     <height>24</height>
@@ -231,9 +232,9 @@
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_6</name>
     <pv_name>$(PREFIX):$(DEVICE).DESC</pv_name>
-    <x>237</x>
+    <x>290</x>
     <y>7</y>
-    <width>200</width>
+    <width>250</width>
     <transparent>true</transparent>
     <vertical_alignment>1</vertical_alignment>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -243,7 +244,7 @@
     <text>$(PREFIX):$(DEVICE)</text>
     <x>40</x>
     <y>7</y>
-    <width>180</width>
+    <width>240</width>
     <vertical_alignment>1</vertical_alignment>
   </widget>
   <widget type="label" version="2.0.0">
@@ -268,7 +269,7 @@
     </actions>
     <pv_name>$(PREFIX):$(DEVICE):resetIlck</pv_name>
     <text></text>
-    <x>770</x>
+    <x>875</x>
     <y>5</y>
     <width>22</width>
     <height>22</height>
@@ -281,7 +282,7 @@
   <widget type="led" version="2.0.0">
     <name>LED</name>
     <pv_name>$(PREFIX):$(DEVICE):FastIntStat</pv_name>
-    <x>730</x>
+    <x>835</x>
     <y>5</y>
     <width>25</width>
     <height>25</height>
diff --git a/NON-APPROVED/TS2/ts2-010rfc-rflps/support/IOCmanage.bob b/NON-APPROVED/TS2/ts2-010rfc-rflps/support/FIMIOC_manage_v01.bob
similarity index 100%
rename from NON-APPROVED/TS2/ts2-010rfc-rflps/support/IOCmanage.bob
rename to NON-APPROVED/TS2/ts2-010rfc-rflps/support/FIMIOC_manage_v01.bob
diff --git a/NON-APPROVED/TS2/ts2-010rfc-rflps/support/FIMIOC_manage_v02.bob b/NON-APPROVED/TS2/ts2-010rfc-rflps/support/FIMIOC_manage_v02.bob
new file mode 100755
index 0000000000000000000000000000000000000000..32c3a88046b245f5e4deb87eca6fb8a1aa4aacc3
--- /dev/null
+++ b/NON-APPROVED/TS2/ts2-010rfc-rflps/support/FIMIOC_manage_v02.bob
@@ -0,0 +1,1395 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<display version="2.0.0">
+  <name>IOC Configurations</name>
+  <width>1200</width>
+  <height>1200</height>
+  <scripts>
+    <script file="EmbeddedPy">
+      <text><![CDATA[# Embedded python script
+from org.csstudio.display.builder.runtime.script import PVUtil, ScriptUtil
+
+result_ = (PVUtil.getInt(pvs[0]) - PVUtil.getInt(pvs[1]))
+#PVUtil.writePV(pvs[2], result_, 100)
+if (result_ > 0):
+	pvs[2].write(result_)
+else:
+	pvs[2].write(0)
+]]></text>
+      <pv_name>$(PREFIX):$(IOC_):ProcPeriod-RB</pv_name>
+      <pv_name trigger="false">$(PREFIX):$(IOC_):LoopPeriod-RB</pv_name>
+      <pv_name trigger="false">loc://netPeriod</pv_name>
+    </script>
+  </scripts>
+  <widget type="rectangle" version="2.0.0">
+    <name>Rectangle</name>
+    <x>20</x>
+    <y>90</y>
+    <width>591</width>
+    <height>30</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
+      </color>
+    </background_color>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>Rectangle_2</name>
+    <class>TITLE-BAR</class>
+    <x use_class="true">0</x>
+    <y use_class="true">0</y>
+    <width>1200</width>
+    <height use_class="true">50</height>
+    <line_width use_class="true">0</line_width>
+    <background_color use_class="true">
+      <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
+      </color>
+    </background_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label</name>
+    <class>TITLE</class>
+    <text>RFLPS FIM - IOC Configurations</text>
+    <x use_class="true">20</x>
+    <y use_class="true">0</y>
+    <width>650</width>
+    <height use_class="true">50</height>
+    <font use_class="true">
+      <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
+      </font>
+    </font>
+    <foreground_color use_class="true">
+      <color name="HEADER-TEXT" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <transparent use_class="true">true</transparent>
+    <horizontal_alignment use_class="true">0</horizontal_alignment>
+    <vertical_alignment use_class="true">1</vertical_alignment>
+    <wrap_words use_class="true">false</wrap_words>
+  </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>Action Button</name>
+    <actions>
+      <action type="write_pv">
+        <pv_name>$(PREFIX):EnableAll</pv_name>
+        <value>0</value>
+        <description>Write PV</description>
+      </action>
+    </actions>
+    <text>Clear all</text>
+    <x>460</x>
+    <y>95</y>
+    <width>60</width>
+    <height>20</height>
+    <font>
+      <font family="Source Sans Pro" style="REGULAR" size="14.0">
+      </font>
+    </font>
+    <tooltip>$(actions)</tooltip>
+  </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>Action Button_1</name>
+    <actions>
+      <action type="write_pv">
+        <pv_name>$(PREFIX):EnableAll</pv_name>
+        <value>1</value>
+        <description>Write PV</description>
+      </action>
+    </actions>
+    <text>Set all</text>
+    <x>520</x>
+    <y>95</y>
+    <width>60</width>
+    <height>20</height>
+    <font>
+      <font family="Source Sans Pro" style="REGULAR" size="14.0">
+      </font>
+    </font>
+    <tooltip>$(actions)</tooltip>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_1</name>
+    <class>GROUP-TITLE</class>
+    <text>Enable/Disable Waveform PV updates</text>
+    <x>30</x>
+    <y>90</y>
+    <width>400</width>
+    <height use_class="true">30</height>
+    <font use_class="true">
+      <font name="Header 2" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
+      </font>
+    </font>
+    <foreground_color use_class="true">
+      <color name="GROUP-TEXT" red="25" green="25" blue="25">
+      </color>
+    </foreground_color>
+    <horizontal_alignment use_class="true">1</horizontal_alignment>
+    <vertical_alignment use_class="true">1</vertical_alignment>
+    <wrap_words use_class="true">false</wrap_words>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_70</name>
+    <text>Current FIM State</text>
+    <x>870</x>
+    <y>10</y>
+    <width>140</width>
+    <height>30</height>
+    <font>
+      <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
+      </font>
+    </font>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_43</name>
+    <pv_name>$(PREFIX):$(IOC_):INTS-RB</pv_name>
+    <x>1010</x>
+    <y>10</y>
+    <width>170</width>
+    <height>30</height>
+    <font>
+      <font family="Liberation Sans" style="BOLD" size="16.0">
+      </font>
+    </font>
+    <precision>0</precision>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <border_width>1</border_width>
+    <border_color>
+      <color name="GRAY-BORDER" red="121" green="121" blue="121">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="group" version="2.0.0">
+    <name>Analog Channels</name>
+    <x>20</x>
+    <y>130</y>
+    <width>591</width>
+    <height>463</height>
+    <style>1</style>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="16.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="Button_Background" red="236" green="236" blue="236">
+      </color>
+    </background_color>
+    <transparent>true</transparent>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display</name>
+      <macros>
+        <DEVICE>$(AI00)</DEVICE>
+        <chdesc>$(PREFIX):$(DEVICE)</chdesc>
+        <chnum>CH0</chnum>
+        <chtype>AI</chtype>
+      </macros>
+      <file>ChannelCtrl-generic.bob</file>
+      <width>580</width>
+      <height>20</height>
+      <resize>2</resize>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display_1</name>
+      <macros>
+        <DEVICE>$(AI01)</DEVICE>
+        <chdesc>$(PREFIX):$(DEVICE)</chdesc>
+        <chnum>CH1</chnum>
+        <chtype>AI</chtype>
+      </macros>
+      <file>ChannelCtrl-generic.bob</file>
+      <y>22</y>
+      <width>580</width>
+      <height>20</height>
+      <resize>2</resize>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display_2</name>
+      <macros>
+        <DEVICE>$(AI02)</DEVICE>
+        <chdesc>$(PREFIX):$(DEVICE)</chdesc>
+        <chnum>CH2</chnum>
+        <chtype>AI</chtype>
+      </macros>
+      <file>ChannelCtrl-generic.bob</file>
+      <y>44</y>
+      <width>580</width>
+      <height>20</height>
+      <resize>2</resize>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display_3</name>
+      <macros>
+        <DEVICE>$(AI03)</DEVICE>
+        <chdesc>$(PREFIX):$(DEVICE)</chdesc>
+        <chnum>CH3</chnum>
+        <chtype>AI</chtype>
+      </macros>
+      <file>ChannelCtrl-generic.bob</file>
+      <y>66</y>
+      <width>580</width>
+      <height>20</height>
+      <resize>2</resize>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display_4</name>
+      <macros>
+        <DEVICE>$(AI04)</DEVICE>
+        <chdesc>$(PREFIX):$(DEVICE)</chdesc>
+        <chnum>CH4</chnum>
+        <chtype>AI</chtype>
+      </macros>
+      <file>ChannelCtrl-generic.bob</file>
+      <y>88</y>
+      <width>580</width>
+      <height>20</height>
+      <resize>2</resize>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display_5</name>
+      <macros>
+        <DEVICE>$(AI05)</DEVICE>
+        <chdesc>$(PREFIX):$(DEVICE)</chdesc>
+        <chnum>CH5</chnum>
+        <chtype>AI</chtype>
+      </macros>
+      <file>ChannelCtrl-generic.bob</file>
+      <y>110</y>
+      <width>580</width>
+      <height>20</height>
+      <resize>2</resize>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display_6</name>
+      <macros>
+        <DEVICE>$(AI06)</DEVICE>
+        <chdesc>$(PREFIX):$(DEVICE)</chdesc>
+        <chnum>CH6</chnum>
+        <chtype>AI</chtype>
+      </macros>
+      <file>ChannelCtrl-generic.bob</file>
+      <y>132</y>
+      <width>580</width>
+      <height>20</height>
+      <resize>2</resize>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display_7</name>
+      <macros>
+        <DEVICE>$(AI07)</DEVICE>
+        <chdesc>$(PREFIX):$(DEVICE)</chdesc>
+        <chnum>CH7</chnum>
+        <chtype>AI</chtype>
+      </macros>
+      <file>ChannelCtrl-generic.bob</file>
+      <y>154</y>
+      <width>580</width>
+      <height>20</height>
+      <resize>2</resize>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display_8</name>
+      <macros>
+        <DEVICE>$(AI08)</DEVICE>
+        <chdesc>$(PREFIX):$(DEVICE)</chdesc>
+        <chnum>CH8</chnum>
+        <chtype>AI</chtype>
+      </macros>
+      <file>ChannelCtrl-generic.bob</file>
+      <y>176</y>
+      <width>580</width>
+      <height>20</height>
+      <resize>2</resize>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display_9</name>
+      <macros>
+        <DEVICE>$(AI09)</DEVICE>
+        <chdesc>$(PREFIX):$(DEVICE)</chdesc>
+        <chnum>CH9</chnum>
+        <chtype>AI</chtype>
+      </macros>
+      <file>ChannelCtrl-generic.bob</file>
+      <y>198</y>
+      <width>580</width>
+      <height>20</height>
+      <resize>2</resize>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display_10</name>
+      <macros>
+        <DEVICE>$(AI10)</DEVICE>
+        <chdesc>$(PREFIX):$(DEVICE)</chdesc>
+        <chnum>CH10</chnum>
+        <chtype>AI</chtype>
+      </macros>
+      <file>ChannelCtrl-generic.bob</file>
+      <y>220</y>
+      <width>580</width>
+      <height>20</height>
+      <resize>2</resize>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display_11</name>
+      <macros>
+        <DEVICE>$(AI11)</DEVICE>
+        <chdesc>$(PREFIX):$(DEVICE)</chdesc>
+        <chnum>CH11</chnum>
+        <chtype>AI</chtype>
+      </macros>
+      <file>ChannelCtrl-generic.bob</file>
+      <y>242</y>
+      <width>580</width>
+      <height>20</height>
+      <resize>2</resize>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display_12</name>
+      <macros>
+        <DEVICE>$(AI12)</DEVICE>
+        <chdesc>$(PREFIX):$(DEVICE)</chdesc>
+        <chnum>CH12</chnum>
+        <chtype>AI</chtype>
+      </macros>
+      <file>ChannelCtrl-generic.bob</file>
+      <y>264</y>
+      <width>580</width>
+      <height>20</height>
+      <resize>2</resize>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display_13</name>
+      <macros>
+        <DEVICE>$(AI13)</DEVICE>
+        <chdesc>$(PREFIX):$(DEVICE)</chdesc>
+        <chnum>CH13</chnum>
+        <chtype>AI</chtype>
+      </macros>
+      <file>ChannelCtrl-generic.bob</file>
+      <y>286</y>
+      <width>580</width>
+      <height>20</height>
+      <resize>2</resize>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display_14</name>
+      <macros>
+        <DEVICE>$(AI14)</DEVICE>
+        <chdesc>$(PREFIX):$(DEVICE)</chdesc>
+        <chnum>CH14</chnum>
+        <chtype>AI</chtype>
+      </macros>
+      <file>ChannelCtrl-generic.bob</file>
+      <y>308</y>
+      <width>580</width>
+      <height>20</height>
+      <resize>2</resize>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display_15</name>
+      <macros>
+        <DEVICE>$(AI15)</DEVICE>
+        <chdesc>$(PREFIX):$(DEVICE)</chdesc>
+        <chnum>CH15</chnum>
+        <chtype>AI</chtype>
+      </macros>
+      <file>ChannelCtrl-generic.bob</file>
+      <y>330</y>
+      <width>580</width>
+      <height>20</height>
+      <resize>2</resize>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display_16</name>
+      <macros>
+        <DEVICE>$(AI16)</DEVICE>
+        <chdesc>$(PREFIX):$(DEVICE)</chdesc>
+        <chnum>CH16</chnum>
+        <chtype>AI</chtype>
+      </macros>
+      <file>ChannelCtrl-generic.bob</file>
+      <y>352</y>
+      <width>580</width>
+      <height>20</height>
+      <resize>2</resize>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display_17</name>
+      <macros>
+        <DEVICE>$(AI17)</DEVICE>
+        <chdesc>$(PREFIX):$(DEVICE)</chdesc>
+        <chnum>CH17</chnum>
+        <chtype>AI</chtype>
+      </macros>
+      <file>ChannelCtrl-generic.bob</file>
+      <y>374</y>
+      <width>580</width>
+      <height>20</height>
+      <resize>2</resize>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display_18</name>
+      <macros>
+        <DEVICE>$(AI18)</DEVICE>
+        <chdesc>$(PREFIX):$(DEVICE)</chdesc>
+        <chnum>CH18</chnum>
+        <chtype>AI</chtype>
+      </macros>
+      <file>ChannelCtrl-generic.bob</file>
+      <y>396</y>
+      <width>580</width>
+      <height>20</height>
+      <resize>2</resize>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display_19</name>
+      <macros>
+        <DEVICE>$(AI19)</DEVICE>
+        <chdesc>$(PREFIX):$(DEVICE)</chdesc>
+        <chnum>CH19</chnum>
+        <chtype>AI</chtype>
+      </macros>
+      <file>ChannelCtrl-generic.bob</file>
+      <y>418</y>
+      <width>580</width>
+      <height>20</height>
+      <resize>2</resize>
+    </widget>
+  </widget>
+  <widget type="group" version="2.0.0">
+    <name>Digital Channels</name>
+    <x>19</x>
+    <y>600</y>
+    <width>591</width>
+    <height>520</height>
+    <style>1</style>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="16.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="Button_Background" red="236" green="236" blue="236">
+      </color>
+    </background_color>
+    <transparent>true</transparent>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display_20</name>
+      <macros>
+        <DEVICE>$(DI00)</DEVICE>
+        <chdesc>$(PREFIX):$(DEVICE)</chdesc>
+        <chnum>CH0</chnum>
+        <chtype>DI</chtype>
+      </macros>
+      <file>ChannelCtrl-generic.bob</file>
+      <y>18</y>
+      <width>580</width>
+      <height>20</height>
+      <resize>2</resize>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display_21</name>
+      <macros>
+        <DEVICE>$(DI01)</DEVICE>
+        <chdesc>$(PREFIX):$(DEVICE)</chdesc>
+        <chnum>CH1</chnum>
+        <chtype>DI</chtype>
+      </macros>
+      <file>ChannelCtrl-generic.bob</file>
+      <y>40</y>
+      <width>580</width>
+      <height>20</height>
+      <resize>2</resize>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display_22</name>
+      <macros>
+        <DEVICE>$(DI02)</DEVICE>
+        <chdesc>$(PREFIX):$(DEVICE)</chdesc>
+        <chnum>CH2</chnum>
+        <chtype>DI</chtype>
+      </macros>
+      <file>ChannelCtrl-generic.bob</file>
+      <y>62</y>
+      <width>580</width>
+      <height>20</height>
+      <resize>2</resize>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display_23</name>
+      <macros>
+        <DEVICE>$(DI03)</DEVICE>
+        <chdesc>$(PREFIX):$(DEVICE)</chdesc>
+        <chnum>CH3</chnum>
+        <chtype>DI</chtype>
+      </macros>
+      <file>ChannelCtrl-generic.bob</file>
+      <y>84</y>
+      <width>580</width>
+      <height>20</height>
+      <resize>2</resize>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display_24</name>
+      <macros>
+        <DEVICE>$(DI04)</DEVICE>
+        <chdesc>$(PREFIX):$(DEVICE)</chdesc>
+        <chnum>CH4</chnum>
+        <chtype>DI</chtype>
+      </macros>
+      <file>ChannelCtrl-generic.bob</file>
+      <y>106</y>
+      <width>580</width>
+      <height>20</height>
+      <resize>2</resize>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display_25</name>
+      <macros>
+        <DEVICE>$(DI05)</DEVICE>
+        <chdesc>$(PREFIX):$(DEVICE)</chdesc>
+        <chnum>CH5</chnum>
+        <chtype>DI</chtype>
+      </macros>
+      <file>ChannelCtrl-generic.bob</file>
+      <y>128</y>
+      <width>580</width>
+      <height>20</height>
+      <resize>2</resize>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display_26</name>
+      <macros>
+        <DEVICE>$(DI06)</DEVICE>
+        <chdesc>$(PREFIX):$(DEVICE)</chdesc>
+        <chnum>CH6</chnum>
+        <chtype>DI</chtype>
+      </macros>
+      <file>ChannelCtrl-generic.bob</file>
+      <y>150</y>
+      <width>580</width>
+      <height>20</height>
+      <resize>2</resize>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display_27</name>
+      <macros>
+        <DEVICE>$(DI07)</DEVICE>
+        <chdesc>$(PREFIX):$(DEVICE)</chdesc>
+        <chnum>CH7</chnum>
+        <chtype>DI</chtype>
+      </macros>
+      <file>ChannelCtrl-generic.bob</file>
+      <y>172</y>
+      <width>580</width>
+      <height>20</height>
+      <resize>2</resize>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display_28</name>
+      <macros>
+        <DEVICE>$(DI08)</DEVICE>
+        <chdesc>$(PREFIX):$(DEVICE)</chdesc>
+        <chnum>CH8</chnum>
+        <chtype>DI</chtype>
+      </macros>
+      <file>ChannelCtrl-generic.bob</file>
+      <y>194</y>
+      <width>580</width>
+      <height>20</height>
+      <resize>2</resize>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display_29</name>
+      <macros>
+        <DEVICE>$(DI09)</DEVICE>
+        <chdesc>$(PREFIX):$(DEVICE)</chdesc>
+        <chnum>CH9</chnum>
+        <chtype>DI</chtype>
+      </macros>
+      <file>ChannelCtrl-generic.bob</file>
+      <y>216</y>
+      <width>580</width>
+      <height>20</height>
+      <resize>2</resize>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display_30</name>
+      <macros>
+        <DEVICE>$(DI10)</DEVICE>
+        <chdesc>$(PREFIX):$(DEVICE)</chdesc>
+        <chnum>CH10</chnum>
+        <chtype>DI</chtype>
+      </macros>
+      <file>ChannelCtrl-generic.bob</file>
+      <y>238</y>
+      <width>580</width>
+      <height>20</height>
+      <resize>2</resize>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display_31</name>
+      <macros>
+        <DEVICE>$(DI11)</DEVICE>
+        <chdesc>$(PREFIX):$(DEVICE)</chdesc>
+        <chnum>CH11</chnum>
+        <chtype>DI</chtype>
+      </macros>
+      <file>ChannelCtrl-generic.bob</file>
+      <y>260</y>
+      <width>580</width>
+      <height>20</height>
+      <resize>2</resize>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display_32</name>
+      <macros>
+        <DEVICE>$(DI12)</DEVICE>
+        <chdesc>$(PREFIX):$(DEVICE)</chdesc>
+        <chnum>CH12</chnum>
+        <chtype>DI</chtype>
+      </macros>
+      <file>ChannelCtrl-generic.bob</file>
+      <y>282</y>
+      <width>580</width>
+      <height>20</height>
+      <resize>2</resize>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display_33</name>
+      <macros>
+        <DEVICE>$(DI13)</DEVICE>
+        <chdesc>$(PREFIX):$(DEVICE)</chdesc>
+        <chnum>CH13</chnum>
+        <chtype>DI</chtype>
+      </macros>
+      <file>ChannelCtrl-generic.bob</file>
+      <y>304</y>
+      <width>580</width>
+      <height>20</height>
+      <resize>2</resize>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display_34</name>
+      <macros>
+        <DEVICE>$(DI14)</DEVICE>
+        <chdesc>$(PREFIX):$(DEVICE)</chdesc>
+        <chnum>CH14</chnum>
+        <chtype>DI</chtype>
+      </macros>
+      <file>ChannelCtrl-generic.bob</file>
+      <y>326</y>
+      <width>580</width>
+      <height>20</height>
+      <resize>2</resize>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display_35</name>
+      <macros>
+        <DEVICE>$(DI15)</DEVICE>
+        <chdesc>$(PREFIX):$(DEVICE)</chdesc>
+        <chnum>CH15</chnum>
+        <chtype>DI</chtype>
+      </macros>
+      <file>ChannelCtrl-generic.bob</file>
+      <y>348</y>
+      <width>580</width>
+      <height>20</height>
+      <resize>2</resize>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display_36</name>
+      <macros>
+        <DEVICE>$(DI16)</DEVICE>
+        <chdesc>$(PREFIX):$(DEVICE)</chdesc>
+        <chnum>CH16</chnum>
+        <chtype>DI</chtype>
+      </macros>
+      <file>ChannelCtrl-generic.bob</file>
+      <x>1</x>
+      <y>370</y>
+      <width>580</width>
+      <height>20</height>
+      <resize>2</resize>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display_37</name>
+      <macros>
+        <DEVICE>$(DI17)</DEVICE>
+        <chdesc>$(PREFIX):$(DEVICE)</chdesc>
+        <chnum>CH17</chnum>
+        <chtype>DI</chtype>
+      </macros>
+      <file>ChannelCtrl-generic.bob</file>
+      <x>1</x>
+      <y>392</y>
+      <width>580</width>
+      <height>20</height>
+      <resize>2</resize>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display_38</name>
+      <macros>
+        <DEVICE>$(DI18)</DEVICE>
+        <chdesc>$(PREFIX):$(DEVICE)</chdesc>
+        <chnum>CH18</chnum>
+        <chtype>DI</chtype>
+      </macros>
+      <file>ChannelCtrl-generic.bob</file>
+      <x>1</x>
+      <y>414</y>
+      <width>580</width>
+      <height>20</height>
+      <resize>2</resize>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display_39</name>
+      <macros>
+        <DEVICE>$(DI19)</DEVICE>
+        <chdesc>$(PREFIX):$(DEVICE)</chdesc>
+        <chnum>CH19</chnum>
+        <chtype>DI</chtype>
+      </macros>
+      <file>ChannelCtrl-generic.bob</file>
+      <x>1</x>
+      <y>436</y>
+      <width>580</width>
+      <height>20</height>
+      <resize>2</resize>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display_40</name>
+      <macros>
+        <DEVICE>$(DI20)</DEVICE>
+        <chdesc>$(PREFIX):$(DEVICE)</chdesc>
+        <chnum>CH20</chnum>
+        <chtype>DI</chtype>
+      </macros>
+      <file>ChannelCtrl-generic.bob</file>
+      <x>1</x>
+      <y>458</y>
+      <width>580</width>
+      <height>20</height>
+      <resize>2</resize>
+    </widget>
+  </widget>
+  <widget type="group" version="2.0.0">
+    <name>Runtime configurations</name>
+    <x>690</x>
+    <y>90</y>
+    <width>460</width>
+    <height>104</height>
+    <style>1</style>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="Read_Background" red="230" green="235" blue="232">
+      </color>
+    </background_color>
+    <transparent>true</transparent>
+    <widget type="textentry" version="3.0.0">
+      <name>Text Entry</name>
+      <pv_name>$(PREFIX):$(IOC_):LoopPeriod</pv_name>
+      <x>189</x>
+      <y>20</y>
+      <width>120</width>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>Text Entry_1</name>
+      <pv_name>$(PREFIX):$(IOC_):LoopPeriod-RB</pv_name>
+      <x>319</x>
+      <y>20</y>
+      <width>120</width>
+      <background_color>
+        <color name="Write_Background" red="224" green="217" blue="202">
+        </color>
+      </background_color>
+      <wrap_words>false</wrap_words>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_2</name>
+      <class>CAPTION</class>
+      <text>Acquisition thread rate</text>
+      <x>19</x>
+      <y>20</y>
+      <width>160</width>
+      <foreground_color use_class="true">
+        <color name="Text" red="25" green="25" blue="25">
+        </color>
+      </foreground_color>
+      <horizontal_alignment use_class="true">2</horizontal_alignment>
+      <vertical_alignment use_class="true">1</vertical_alignment>
+    </widget>
+  </widget>
+  <widget type="group" version="2.0.0">
+    <name>EPICS IOC Runtime Control</name>
+    <x>690</x>
+    <y>548</y>
+    <width>460</width>
+    <height>160</height>
+    <style>1</style>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="Read_Background" red="230" green="235" blue="232">
+      </color>
+    </background_color>
+    <transparent>true</transparent>
+    <widget type="action_button" version="3.0.0">
+      <name>Action Button_6</name>
+      <actions>
+        <action type="write_pv">
+          <pv_name>$(pv_name)</pv_name>
+          <value>OFF</value>
+          <description>Write PV</description>
+        </action>
+      </actions>
+      <pv_name>$(PREFIX):$(DEVICE):STAT</pv_name>
+      <text>OFF</text>
+      <x>19</x>
+      <y>20</y>
+      <width>80</width>
+      <height>40</height>
+      <font>
+        <font family="Source Sans Pro" style="REGULAR" size="14.0">
+        </font>
+      </font>
+    </widget>
+    <widget type="action_button" version="3.0.0">
+      <name>Action Button_7</name>
+      <actions>
+        <action type="write_pv">
+          <pv_name>$(pv_name)</pv_name>
+          <value>ON</value>
+          <description>Write PV</description>
+        </action>
+      </actions>
+      <pv_name>$(PREFIX):$(DEVICE):STAT</pv_name>
+      <text>ON</text>
+      <x>109</x>
+      <y>20</y>
+      <width>80</width>
+      <height>40</height>
+      <font>
+        <font family="Source Sans Pro" style="REGULAR" size="14.0">
+        </font>
+      </font>
+      <tooltip>$(actions)</tooltip>
+    </widget>
+    <widget type="action_button" version="3.0.0">
+      <name>Action Button_8</name>
+      <actions>
+        <action type="write_pv">
+          <pv_name>$(pv_name)</pv_name>
+          <value>RUNNING</value>
+          <description>Write PV</description>
+        </action>
+      </actions>
+      <pv_name>$(PREFIX):$(DEVICE):STAT</pv_name>
+      <text>RUNNING</text>
+      <x>199</x>
+      <y>20</y>
+      <width>80</width>
+      <height>40</height>
+      <font>
+        <font family="Source Sans Pro" style="REGULAR" size="14.0">
+        </font>
+      </font>
+      <tooltip>$(actions)</tooltip>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>Text Update_2</name>
+      <pv_name>$(PREFIX):$(DEVICE):STAT-RB</pv_name>
+      <x>289</x>
+      <y>30</y>
+      <width>150</width>
+      <precision>0</precision>
+      <horizontal_alignment>1</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+      <rules>
+        <rule name="Change background" prop_id="background_color" out_exp="false">
+          <exp bool_exp="pv0==4">
+            <value>
+              <color red="255" green="255" blue="153">
+              </color>
+            </value>
+          </exp>
+          <exp bool_exp="pv0==7">
+            <value>
+              <color red="179" green="230" blue="179">
+              </color>
+            </value>
+          </exp>
+          <pv_name>$(pv_name)</pv_name>
+        </rule>
+        <rule name="Change border" prop_id="border_color" out_exp="false">
+          <exp bool_exp="pv0==4">
+            <value>
+              <color name="YELLOW-BORDER" red="150" green="144" blue="10">
+              </color>
+            </value>
+          </exp>
+          <exp bool_exp="pv0==7">
+            <value>
+              <color name="GREEN-BORDER" red="40" green="140" blue="40">
+              </color>
+            </value>
+          </exp>
+          <pv_name>$(pv_name)</pv_name>
+        </rule>
+      </rules>
+      <border_width>1</border_width>
+      <border_color>
+        <color name="Grid" red="169" green="169" blue="169">
+        </color>
+      </border_color>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>Text Update_29</name>
+      <pv_name>$(PREFIX):$(DEVICE):stateS</pv_name>
+      <x>289</x>
+      <y>84</y>
+      <width>150</width>
+      <height>30</height>
+      <font>
+        <font family="Source Sans Pro" style="BOLD" size="16.0">
+        </font>
+      </font>
+      <precision>0</precision>
+      <horizontal_alignment>1</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+      <border_width>1</border_width>
+      <border_color>
+        <color name="BLUE-GROUP-BORDER" red="138" green="167" blue="167">
+        </color>
+      </border_color>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_4</name>
+      <class>CAPTION</class>
+      <text>Sequencer State Machine</text>
+      <x>49</x>
+      <y>90</y>
+      <width>210</width>
+      <foreground_color use_class="true">
+        <color name="Text" red="25" green="25" blue="25">
+        </color>
+      </foreground_color>
+      <horizontal_alignment use_class="true">2</horizontal_alignment>
+      <vertical_alignment use_class="true">1</vertical_alignment>
+    </widget>
+  </widget>
+  <widget type="group" version="2.0.0">
+    <name>Enable Triggers from MTCA Backplane</name>
+    <x>690</x>
+    <y>721</y>
+    <width>460</width>
+    <height>106</height>
+    <style>1</style>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="Read_Background" red="230" green="235" blue="232">
+      </color>
+    </background_color>
+    <transparent>true</transparent>
+    <widget type="combo" version="2.0.0">
+      <name>Boolean Button</name>
+      <pv_name>$(PREFIX):$(IOC_):TriggerLine</pv_name>
+      <x>32</x>
+      <y>34</y>
+      <width>150</width>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>LED</name>
+      <pv_name>$(PREFIX):$(IOC_):TriggerLine-RB</pv_name>
+      <x>242</x>
+      <y>34</y>
+      <width>170</width>
+      <height>30</height>
+      <font>
+        <font family="Source Sans Pro" style="BOLD" size="16.0">
+        </font>
+      </font>
+      <horizontal_alignment>1</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_6</name>
+      <text>Trigger Line Selection</text>
+      <x>32</x>
+      <y>11</y>
+      <width>150</width>
+      <horizontal_alignment>1</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_7</name>
+      <text>Readback Value</text>
+      <x>242</x>
+      <y>11</y>
+      <width>170</width>
+      <horizontal_alignment>1</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+    </widget>
+  </widget>
+  <widget type="group" version="2.0.0">
+    <name>iocStats Module - Expert Screen</name>
+    <x>690</x>
+    <y>848</y>
+    <width>460</width>
+    <height>106</height>
+    <style>1</style>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="Read_Background" red="230" green="235" blue="232">
+      </color>
+    </background_color>
+    <transparent>true</transparent>
+    <widget type="action_button" version="3.0.0">
+      <name>Action Button_2</name>
+      <actions>
+        <action type="open_display">
+          <file>iocStats/iocStats.bob</file>
+          <macros>
+            <IOCNAME>$(IOCSTATS_)-IocStats</IOCNAME>
+          </macros>
+          <target>window</target>
+          <description>Open iocStats</description>
+        </action>
+      </actions>
+      <text>Open iocStats</text>
+      <x>32</x>
+      <y>18</y>
+      <width>250</width>
+      <height>46</height>
+      <tooltip>$(actions)</tooltip>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_5</name>
+      <class>CAPTION</class>
+      <text>IOC Heartbeat</text>
+      <x>319</x>
+      <y>18</y>
+      <foreground_color use_class="true">
+        <color name="Text" red="25" green="25" blue="25">
+        </color>
+      </foreground_color>
+      <horizontal_alignment use_class="true">2</horizontal_alignment>
+      <vertical_alignment use_class="true">1</vertical_alignment>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>Text Update_64</name>
+      <pv_name>$(IOCSTATS_)-IocStats:HEARTBEAT</pv_name>
+      <x>309</x>
+      <y>38</y>
+      <width>130</width>
+      <format>1</format>
+      <show_units>false</show_units>
+      <horizontal_alignment>1</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+      <wrap_words>false</wrap_words>
+      <actions>
+      </actions>
+      <border_color>
+        <color red="0" green="128" blue="255">
+        </color>
+      </border_color>
+    </widget>
+  </widget>
+  <widget type="group" version="2.0.0">
+    <name>Interrupt Frequency Measurement</name>
+    <x>690</x>
+    <y>216</y>
+    <width>460</width>
+    <height>112</height>
+    <style>1</style>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="Read_Background" red="230" green="235" blue="232">
+      </color>
+    </background_color>
+    <transparent>true</transparent>
+    <widget type="textupdate" version="2.0.0">
+      <name>Text Entry_3</name>
+      <pv_name>$(PREFIX):$(IOC_):IntrFreq-RB</pv_name>
+      <x>189</x>
+      <y>38</y>
+      <width>120</width>
+      <background_color>
+        <color name="Write_Background" red="224" green="217" blue="202">
+        </color>
+      </background_color>
+      <wrap_words>false</wrap_words>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_3</name>
+      <class>CAPTION</class>
+      <text>Frequency:</text>
+      <x>19</x>
+      <y>38</y>
+      <width>160</width>
+      <foreground_color use_class="true">
+        <color name="Text" red="25" green="25" blue="25">
+        </color>
+      </foreground_color>
+      <horizontal_alignment use_class="true">2</horizontal_alignment>
+      <vertical_alignment use_class="true">1</vertical_alignment>
+    </widget>
+  </widget>
+  <widget type="group" version="2.0.0">
+    <name>General Diagnostics</name>
+    <x>690</x>
+    <y>350</y>
+    <width>460</width>
+    <height>176</height>
+    <style>1</style>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="Read_Background" red="230" green="235" blue="232">
+      </color>
+    </background_color>
+    <transparent>true</transparent>
+    <widget type="label" version="2.0.0">
+      <name>Label_8</name>
+      <class>CAPTION</class>
+      <text>Raw AI0</text>
+      <x>19</x>
+      <y>23</y>
+      <width>70</width>
+      <foreground_color use_class="true">
+        <color name="Text" red="25" green="25" blue="25">
+        </color>
+      </foreground_color>
+      <horizontal_alignment use_class="true">2</horizontal_alignment>
+      <vertical_alignment use_class="true">1</vertical_alignment>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>Text Entry_4</name>
+      <pv_name>$(PREFIX):$(IOC_):RawAI0-RB</pv_name>
+      <x>99</x>
+      <y>23</y>
+      <width>120</width>
+      <background_color>
+        <color name="Write_Background" red="224" green="217" blue="202">
+        </color>
+      </background_color>
+      <wrap_words>false</wrap_words>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_9</name>
+      <class>CAPTION</class>
+      <text>Raw AI19</text>
+      <x>229</x>
+      <y>23</y>
+      <width>70</width>
+      <foreground_color use_class="true">
+        <color name="Text" red="25" green="25" blue="25">
+        </color>
+      </foreground_color>
+      <horizontal_alignment use_class="true">2</horizontal_alignment>
+      <vertical_alignment use_class="true">1</vertical_alignment>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>Text Entry_5</name>
+      <pv_name>$(PREFIX):$(IOC_):RawAI19-RB</pv_name>
+      <x>309</x>
+      <y>23</y>
+      <width>120</width>
+      <background_color>
+        <color name="Write_Background" red="224" green="217" blue="202">
+        </color>
+      </background_color>
+      <wrap_words>false</wrap_words>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
+    </widget>
+    <widget type="byte_monitor" version="2.0.0">
+      <name>Byte Monitor_3</name>
+      <pv_name>$(PREFIX):$(IOC_):OUTSMLB-RB</pv_name>
+      <x>32</x>
+      <y>117</y>
+      <width>100</width>
+      <numBits>5</numBits>
+    </widget>
+    <widget type="byte_monitor" version="2.0.0">
+      <name>Byte Monitor_4</name>
+      <pv_name>$(PREFIX):$(IOC_):OUTSLSB-RB</pv_name>
+      <x>132</x>
+      <y>117</y>
+      <width>307</width>
+      <numBits>16</numBits>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_10</name>
+      <text>20</text>
+      <x>34</x>
+      <y>98</y>
+      <width>15</width>
+      <height>15</height>
+      <font>
+        <font family="Source Sans Pro" style="BOLD" size="12.0">
+        </font>
+      </font>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_11</name>
+      <text>0</text>
+      <x>423</x>
+      <y>98</y>
+      <width>15</width>
+      <height>15</height>
+      <font>
+        <font family="Source Sans Pro" style="BOLD" size="12.0">
+        </font>
+      </font>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_12</name>
+      <text>1</text>
+      <x>403</x>
+      <y>98</y>
+      <width>15</width>
+      <height>15</height>
+      <font>
+        <font family="Source Sans Pro" style="BOLD" size="12.0">
+        </font>
+      </font>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_13</name>
+      <text>2</text>
+      <x>383</x>
+      <y>98</y>
+      <width>15</width>
+      <height>15</height>
+      <font>
+        <font family="Source Sans Pro" style="BOLD" size="12.0">
+        </font>
+      </font>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_14</name>
+      <text>3</text>
+      <x>364</x>
+      <y>98</y>
+      <width>15</width>
+      <height>15</height>
+      <font>
+        <font family="Source Sans Pro" style="BOLD" size="12.0">
+        </font>
+      </font>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_15</name>
+      <text>4</text>
+      <x>348</x>
+      <y>98</y>
+      <width>15</width>
+      <height>15</height>
+      <font>
+        <font family="Source Sans Pro" style="BOLD" size="12.0">
+        </font>
+      </font>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_16</name>
+      <text>5</text>
+      <x>330</x>
+      <y>98</y>
+      <width>15</width>
+      <height>15</height>
+      <font>
+        <font family="Source Sans Pro" style="BOLD" size="12.0">
+        </font>
+      </font>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_17</name>
+      <text>6</text>
+      <x>311</x>
+      <y>98</y>
+      <width>15</width>
+      <height>15</height>
+      <font>
+        <font family="Source Sans Pro" style="BOLD" size="12.0">
+        </font>
+      </font>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_18</name>
+      <text>7</text>
+      <x>292</x>
+      <y>98</y>
+      <width>15</width>
+      <height>15</height>
+      <font>
+        <font family="Source Sans Pro" style="BOLD" size="12.0">
+        </font>
+      </font>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_20</name>
+      <class>CAPTION</class>
+      <text>Digital Outputs Status</text>
+      <x>19</x>
+      <y>73</y>
+      <width>155</width>
+      <foreground_color use_class="true">
+        <color name="Text" red="25" green="25" blue="25">
+        </color>
+      </foreground_color>
+      <horizontal_alignment use_class="true">2</horizontal_alignment>
+      <vertical_alignment use_class="true">1</vertical_alignment>
+    </widget>
+  </widget>
+</display>
diff --git a/NON-APPROVED/TS2/ts2-010rfc-rflps/support/AllDigitalInputs.bob b/NON-APPROVED/TS2/ts2-010rfc-rflps/support/FIM_AllDigitalInputs_v01.bob
similarity index 100%
rename from NON-APPROVED/TS2/ts2-010rfc-rflps/support/AllDigitalInputs.bob
rename to NON-APPROVED/TS2/ts2-010rfc-rflps/support/FIM_AllDigitalInputs_v01.bob
diff --git a/NON-APPROVED/TS2/ts2-010rfc-rflps/support/FIM_AllDigitalInputs_v02.bob b/NON-APPROVED/TS2/ts2-010rfc-rflps/support/FIM_AllDigitalInputs_v02.bob
new file mode 100755
index 0000000000000000000000000000000000000000..58a2a0580f5e6af18826c6a95ca4e7e735f28858
--- /dev/null
+++ b/NON-APPROVED/TS2/ts2-010rfc-rflps/support/FIM_AllDigitalInputs_v02.bob
@@ -0,0 +1,2684 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<display version="2.0.0">
+  <name>Digital Channels Monitor</name>
+  <width>1700</width>
+  <height>1100</height>
+  <widget type="rectangle" version="2.0.0">
+    <name>Rectangle</name>
+    <class>TITLE-BAR</class>
+    <x use_class="true">0</x>
+    <y use_class="true">0</y>
+    <width>1341</width>
+    <height use_class="true">50</height>
+    <line_width use_class="true">0</line_width>
+    <line_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
+      </color>
+    </line_color>
+    <background_color use_class="true">
+      <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
+      </color>
+    </background_color>
+    <corner_width>4</corner_width>
+    <corner_height>4</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label</name>
+    <class>TITLE</class>
+    <text>Digital Channels Monitor</text>
+    <x use_class="true">20</x>
+    <y use_class="true">0</y>
+    <width>550</width>
+    <height use_class="true">50</height>
+    <font use_class="true">
+      <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
+      </font>
+    </font>
+    <foreground_color use_class="true">
+      <color name="HEADER-TEXT" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <transparent use_class="true">true</transparent>
+    <horizontal_alignment use_class="true">0</horizontal_alignment>
+    <vertical_alignment use_class="true">1</vertical_alignment>
+    <wrap_words use_class="true">false</wrap_words>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_70</name>
+    <text>Current FIM State</text>
+    <x>1001</x>
+    <y>10</y>
+    <width>140</width>
+    <height>30</height>
+    <font>
+      <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
+      </font>
+    </font>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_43</name>
+    <pv_name>$(PREFIX):$(IOC_):INTS-RB</pv_name>
+    <x>1141</x>
+    <y>10</y>
+    <width>170</width>
+    <height>30</height>
+    <font>
+      <font family="Liberation Sans" style="BOLD" size="16.0">
+      </font>
+    </font>
+    <precision>0</precision>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <border_width>1</border_width>
+    <border_color>
+      <color name="GRAY-BORDER" red="121" green="121" blue="121">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED_1</name>
+    <pv_name>$(PREFIX):$(DI01):InputVal</pv_name>
+    <x>1560</x>
+    <y>200</y>
+    <square>true</square>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_45</name>
+    <pv_name>$(PREFIX):$(DI01).DESC</pv_name>
+    <x>1380</x>
+    <y>200</y>
+    <width>170</width>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED_2</name>
+    <pv_name>$(PREFIX):$(DI02):InputVal</pv_name>
+    <x>1560</x>
+    <y>227</y>
+    <square>true</square>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_46</name>
+    <pv_name>$(PREFIX):$(DI02).DESC</pv_name>
+    <x>1380</x>
+    <y>227</y>
+    <width>170</width>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED_3</name>
+    <pv_name>$(PREFIX):$(DI03):InputVal</pv_name>
+    <x>1560</x>
+    <y>255</y>
+    <square>true</square>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_47</name>
+    <pv_name>$(PREFIX):$(DI03).DESC</pv_name>
+    <x>1380</x>
+    <y>255</y>
+    <width>170</width>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED_4</name>
+    <pv_name>$(PREFIX):$(DI04):InputVal</pv_name>
+    <x>1560</x>
+    <y>282</y>
+    <square>true</square>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_48</name>
+    <pv_name>$(PREFIX):$(DI04).DESC</pv_name>
+    <x>1380</x>
+    <y>282</y>
+    <width>170</width>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED_5</name>
+    <pv_name>$(PREFIX):$(DI05):InputVal</pv_name>
+    <x>1560</x>
+    <y>310</y>
+    <square>true</square>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_49</name>
+    <pv_name>$(PREFIX):$(DI05).DESC</pv_name>
+    <x>1380</x>
+    <y>310</y>
+    <width>170</width>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED_6</name>
+    <pv_name>$(PREFIX):$(DI06):InputVal</pv_name>
+    <x>1560</x>
+    <y>337</y>
+    <square>true</square>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_50</name>
+    <pv_name>$(PREFIX):$(DI06).DESC</pv_name>
+    <x>1380</x>
+    <y>337</y>
+    <width>170</width>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED_7</name>
+    <pv_name>$(PREFIX):$(DI07):InputVal</pv_name>
+    <x>1560</x>
+    <y>365</y>
+    <square>true</square>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_51</name>
+    <pv_name>$(PREFIX):$(DI07).DESC</pv_name>
+    <x>1380</x>
+    <y>365</y>
+    <width>170</width>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED_8</name>
+    <pv_name>$(PREFIX):$(DI08):InputVal</pv_name>
+    <x>1560</x>
+    <y>392</y>
+    <square>true</square>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_52</name>
+    <pv_name>$(PREFIX):$(DI08).DESC</pv_name>
+    <x>1380</x>
+    <y>392</y>
+    <width>170</width>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED_9</name>
+    <pv_name>$(PREFIX):$(DI09):InputVal</pv_name>
+    <x>1560</x>
+    <y>420</y>
+    <square>true</square>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_53</name>
+    <pv_name>$(PREFIX):$(DI09).DESC</pv_name>
+    <x>1380</x>
+    <y>420</y>
+    <width>170</width>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED_10</name>
+    <pv_name>$(PREFIX):$(DI10):InputVal</pv_name>
+    <x>1560</x>
+    <y>447</y>
+    <square>true</square>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_54</name>
+    <pv_name>$(PREFIX):$(DI10).DESC</pv_name>
+    <x>1380</x>
+    <y>447</y>
+    <width>170</width>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED_11</name>
+    <pv_name>$(PREFIX):$(DI11):InputVal</pv_name>
+    <x>1560</x>
+    <y>475</y>
+    <square>true</square>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_55</name>
+    <pv_name>$(PREFIX):$(DI11).DESC</pv_name>
+    <x>1380</x>
+    <y>475</y>
+    <width>170</width>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED_12</name>
+    <pv_name>$(PREFIX):$(DI12):InputVal</pv_name>
+    <x>1560</x>
+    <y>502</y>
+    <square>true</square>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_56</name>
+    <pv_name>$(PREFIX):$(DI12).DESC</pv_name>
+    <x>1380</x>
+    <y>502</y>
+    <width>170</width>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED_13</name>
+    <pv_name>$(PREFIX):$(DI13):InputVal</pv_name>
+    <x>1560</x>
+    <y>530</y>
+    <square>true</square>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_57</name>
+    <pv_name>$(PREFIX):$(DI13).DESC</pv_name>
+    <x>1380</x>
+    <y>530</y>
+    <width>170</width>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED_14</name>
+    <pv_name>$(PREFIX):$(DI14):InputVal</pv_name>
+    <x>1560</x>
+    <y>557</y>
+    <square>true</square>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_58</name>
+    <pv_name>$(PREFIX):$(DI14).DESC</pv_name>
+    <x>1380</x>
+    <y>557</y>
+    <width>170</width>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED_15</name>
+    <pv_name>$(PREFIX):$(DI15):InputVal</pv_name>
+    <x>1560</x>
+    <y>585</y>
+    <square>true</square>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_59</name>
+    <pv_name>$(PREFIX):$(DI15).DESC</pv_name>
+    <x>1380</x>
+    <y>585</y>
+    <width>170</width>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+  </widget>
+  <widget type="group" version="2.0.0">
+    <name>DIGITAL INPUT 0</name>
+    <x>10</x>
+    <y>70</y>
+    <width>311</width>
+    <height>188</height>
+    <style>1</style>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="16.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
+      </color>
+    </foreground_color>
+    <transparent>true</transparent>
+    <widget type="led" version="2.0.0">
+      <name>LED</name>
+      <pv_name>$(PREFIX):$(DI00):InputVal</pv_name>
+      <x>259</x>
+      <y>10</y>
+      <width>49</width>
+      <square>true</square>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>Text Update_44</name>
+      <pv_name>$(PREFIX):$(DI00).DESC</pv_name>
+      <y>10</y>
+      <width>259</width>
+      <horizontal_alignment>2</horizontal_alignment>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
+    </widget>
+    <widget type="xyplot" version="2.0.0">
+      <name>X/Y Plot</name>
+      <y>35</y>
+      <width>309</width>
+      <height>130</height>
+      <foreground_color>
+        <color name="Read_Background" red="230" green="235" blue="232">
+        </color>
+      </foreground_color>
+      <background_color>
+        <color name="BLACK" red="0" green="0" blue="0">
+        </color>
+      </background_color>
+      <grid_color>
+        <color red="77" green="77" blue="77">
+        </color>
+      </grid_color>
+      <show_legend>false</show_legend>
+      <x_axis>
+        <title></title>
+        <autoscale>false</autoscale>
+        <log_scale>false</log_scale>
+        <minimum>0.0</minimum>
+        <maximum>8000.0</maximum>
+        <show_grid>true</show_grid>
+        <title_font>
+          <font family="Source Sans Pro" style="BOLD" size="8.0">
+          </font>
+        </title_font>
+        <scale_font>
+          <font family="Source Sans Pro" style="REGULAR" size="8.0">
+          </font>
+        </scale_font>
+        <visible>true</visible>
+      </x_axis>
+      <y_axes>
+        <y_axis>
+          <title></title>
+          <autoscale>false</autoscale>
+          <log_scale>false</log_scale>
+          <minimum>-0.5</minimum>
+          <maximum>1.5</maximum>
+          <show_grid>true</show_grid>
+          <title_font>
+            <font family="Source Sans Pro" style="BOLD" size="8.0">
+            </font>
+          </title_font>
+          <scale_font>
+            <font family="Source Sans Pro" style="REGULAR" size="8.0">
+            </font>
+          </scale_font>
+          <visible>true</visible>
+        </y_axis>
+      </y_axes>
+      <traces>
+        <trace>
+          <name>$(traces[0].y_pv)</name>
+          <x_pv></x_pv>
+          <y_pv>$(PREFIX):$(DI00):Wave</y_pv>
+          <err_pv></err_pv>
+          <axis>0</axis>
+          <trace_type>1</trace_type>
+          <color>
+            <color red="60" green="255" blue="60">
+            </color>
+          </color>
+          <line_width>1</line_width>
+          <line_style>0</line_style>
+          <point_type>0</point_type>
+          <point_size>10</point_size>
+          <visible>true</visible>
+        </trace>
+      </traces>
+    </widget>
+  </widget>
+  <widget type="group" version="2.0.0">
+    <name>DIGITAL INPUT 1</name>
+    <x>11</x>
+    <y>269</y>
+    <width>311</width>
+    <height>188</height>
+    <style>1</style>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="16.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
+      </color>
+    </foreground_color>
+    <transparent>true</transparent>
+    <widget type="led" version="2.0.0">
+      <name>LED_16</name>
+      <pv_name>$(PREFIX):$(DI01):InputVal</pv_name>
+      <x>259</x>
+      <y>10</y>
+      <width>49</width>
+      <square>true</square>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>Text Update_60</name>
+      <pv_name>$(PREFIX):$(DI01).DESC</pv_name>
+      <y>10</y>
+      <width>259</width>
+      <horizontal_alignment>2</horizontal_alignment>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
+    </widget>
+    <widget type="xyplot" version="2.0.0">
+      <name>X/Y Plot_1</name>
+      <y>35</y>
+      <width>309</width>
+      <height>130</height>
+      <foreground_color>
+        <color name="Read_Background" red="230" green="235" blue="232">
+        </color>
+      </foreground_color>
+      <background_color>
+        <color name="BLACK" red="0" green="0" blue="0">
+        </color>
+      </background_color>
+      <grid_color>
+        <color red="77" green="77" blue="77">
+        </color>
+      </grid_color>
+      <show_legend>false</show_legend>
+      <x_axis>
+        <title></title>
+        <autoscale>false</autoscale>
+        <log_scale>false</log_scale>
+        <minimum>0.0</minimum>
+        <maximum>8000.0</maximum>
+        <show_grid>true</show_grid>
+        <title_font>
+          <font family="Source Sans Pro" style="BOLD" size="8.0">
+          </font>
+        </title_font>
+        <scale_font>
+          <font family="Source Sans Pro" style="REGULAR" size="8.0">
+          </font>
+        </scale_font>
+        <visible>true</visible>
+      </x_axis>
+      <y_axes>
+        <y_axis>
+          <title></title>
+          <autoscale>false</autoscale>
+          <log_scale>false</log_scale>
+          <minimum>-0.5</minimum>
+          <maximum>1.5</maximum>
+          <show_grid>true</show_grid>
+          <title_font>
+            <font family="Source Sans Pro" style="BOLD" size="8.0">
+            </font>
+          </title_font>
+          <scale_font>
+            <font family="Source Sans Pro" style="REGULAR" size="8.0">
+            </font>
+          </scale_font>
+          <visible>true</visible>
+        </y_axis>
+      </y_axes>
+      <traces>
+        <trace>
+          <name>$(traces[0].y_pv)</name>
+          <x_pv></x_pv>
+          <y_pv>$(PREFIX):$(DI01):Wave</y_pv>
+          <err_pv></err_pv>
+          <axis>0</axis>
+          <trace_type>1</trace_type>
+          <color>
+            <color red="60" green="255" blue="60">
+            </color>
+          </color>
+          <line_width>1</line_width>
+          <line_style>0</line_style>
+          <point_type>0</point_type>
+          <point_size>10</point_size>
+          <visible>true</visible>
+        </trace>
+      </traces>
+    </widget>
+  </widget>
+  <widget type="group" version="2.0.0">
+    <name>DIGITAL INPUT 2</name>
+    <x>11</x>
+    <y>469</y>
+    <width>311</width>
+    <height>188</height>
+    <style>1</style>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="16.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
+      </color>
+    </foreground_color>
+    <transparent>true</transparent>
+    <widget type="led" version="2.0.0">
+      <name>LED_17</name>
+      <pv_name>$(PREFIX):$(DI02):InputVal</pv_name>
+      <x>259</x>
+      <y>10</y>
+      <width>49</width>
+      <square>true</square>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>Text Update_61</name>
+      <pv_name>$(PREFIX):$(DI02).DESC</pv_name>
+      <y>10</y>
+      <width>259</width>
+      <horizontal_alignment>2</horizontal_alignment>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
+    </widget>
+    <widget type="xyplot" version="2.0.0">
+      <name>X/Y Plot_2</name>
+      <y>35</y>
+      <width>309</width>
+      <height>130</height>
+      <foreground_color>
+        <color name="Read_Background" red="230" green="235" blue="232">
+        </color>
+      </foreground_color>
+      <background_color>
+        <color name="BLACK" red="0" green="0" blue="0">
+        </color>
+      </background_color>
+      <grid_color>
+        <color red="77" green="77" blue="77">
+        </color>
+      </grid_color>
+      <show_legend>false</show_legend>
+      <x_axis>
+        <title></title>
+        <autoscale>false</autoscale>
+        <log_scale>false</log_scale>
+        <minimum>0.0</minimum>
+        <maximum>8000.0</maximum>
+        <show_grid>true</show_grid>
+        <title_font>
+          <font family="Source Sans Pro" style="BOLD" size="8.0">
+          </font>
+        </title_font>
+        <scale_font>
+          <font family="Source Sans Pro" style="REGULAR" size="8.0">
+          </font>
+        </scale_font>
+        <visible>true</visible>
+      </x_axis>
+      <y_axes>
+        <y_axis>
+          <title></title>
+          <autoscale>false</autoscale>
+          <log_scale>false</log_scale>
+          <minimum>-0.5</minimum>
+          <maximum>1.5</maximum>
+          <show_grid>true</show_grid>
+          <title_font>
+            <font family="Source Sans Pro" style="BOLD" size="8.0">
+            </font>
+          </title_font>
+          <scale_font>
+            <font family="Source Sans Pro" style="REGULAR" size="8.0">
+            </font>
+          </scale_font>
+          <visible>true</visible>
+        </y_axis>
+      </y_axes>
+      <traces>
+        <trace>
+          <name>$(traces[0].y_pv)</name>
+          <x_pv></x_pv>
+          <y_pv>$(PREFIX):$(DI02):Wave</y_pv>
+          <err_pv></err_pv>
+          <axis>0</axis>
+          <trace_type>1</trace_type>
+          <color>
+            <color red="60" green="255" blue="60">
+            </color>
+          </color>
+          <line_width>1</line_width>
+          <line_style>0</line_style>
+          <point_type>0</point_type>
+          <point_size>10</point_size>
+          <visible>true</visible>
+        </trace>
+      </traces>
+    </widget>
+  </widget>
+  <widget type="group" version="2.0.0">
+    <name>DIGITAL INPUT 3</name>
+    <x>11</x>
+    <y>670</y>
+    <width>311</width>
+    <height>188</height>
+    <style>1</style>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="16.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
+      </color>
+    </foreground_color>
+    <transparent>true</transparent>
+    <widget type="led" version="2.0.0">
+      <name>LED_18</name>
+      <pv_name>$(PREFIX):$(DI03):InputVal</pv_name>
+      <x>259</x>
+      <y>10</y>
+      <width>49</width>
+      <square>true</square>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>Text Update_62</name>
+      <pv_name>$(PREFIX):$(DI03).DESC</pv_name>
+      <y>10</y>
+      <width>259</width>
+      <horizontal_alignment>2</horizontal_alignment>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
+    </widget>
+    <widget type="xyplot" version="2.0.0">
+      <name>X/Y Plot_3</name>
+      <y>35</y>
+      <width>309</width>
+      <height>130</height>
+      <foreground_color>
+        <color name="Read_Background" red="230" green="235" blue="232">
+        </color>
+      </foreground_color>
+      <background_color>
+        <color name="BLACK" red="0" green="0" blue="0">
+        </color>
+      </background_color>
+      <grid_color>
+        <color red="77" green="77" blue="77">
+        </color>
+      </grid_color>
+      <show_legend>false</show_legend>
+      <x_axis>
+        <title></title>
+        <autoscale>false</autoscale>
+        <log_scale>false</log_scale>
+        <minimum>0.0</minimum>
+        <maximum>8000.0</maximum>
+        <show_grid>true</show_grid>
+        <title_font>
+          <font family="Source Sans Pro" style="BOLD" size="8.0">
+          </font>
+        </title_font>
+        <scale_font>
+          <font family="Source Sans Pro" style="REGULAR" size="8.0">
+          </font>
+        </scale_font>
+        <visible>true</visible>
+      </x_axis>
+      <y_axes>
+        <y_axis>
+          <title></title>
+          <autoscale>false</autoscale>
+          <log_scale>false</log_scale>
+          <minimum>-0.5</minimum>
+          <maximum>1.5</maximum>
+          <show_grid>true</show_grid>
+          <title_font>
+            <font family="Source Sans Pro" style="BOLD" size="8.0">
+            </font>
+          </title_font>
+          <scale_font>
+            <font family="Source Sans Pro" style="REGULAR" size="8.0">
+            </font>
+          </scale_font>
+          <visible>true</visible>
+        </y_axis>
+      </y_axes>
+      <traces>
+        <trace>
+          <name>$(traces[0].y_pv)</name>
+          <x_pv></x_pv>
+          <y_pv>$(PREFIX):$(DI03):Wave</y_pv>
+          <err_pv></err_pv>
+          <axis>0</axis>
+          <trace_type>1</trace_type>
+          <color>
+            <color red="60" green="255" blue="60">
+            </color>
+          </color>
+          <line_width>1</line_width>
+          <line_style>0</line_style>
+          <point_type>0</point_type>
+          <point_size>10</point_size>
+          <visible>true</visible>
+        </trace>
+      </traces>
+    </widget>
+  </widget>
+  <widget type="group" version="2.0.0">
+    <name>DIGITAL INPUT 4</name>
+    <x>11</x>
+    <y>870</y>
+    <width>311</width>
+    <height>188</height>
+    <style>1</style>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="16.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
+      </color>
+    </foreground_color>
+    <transparent>true</transparent>
+    <widget type="led" version="2.0.0">
+      <name>LED_19</name>
+      <pv_name>$(PREFIX):$(DI04):InputVal</pv_name>
+      <x>259</x>
+      <y>10</y>
+      <width>49</width>
+      <square>true</square>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>Text Update_63</name>
+      <pv_name>$(PREFIX):$(DI04).DESC</pv_name>
+      <y>10</y>
+      <width>259</width>
+      <horizontal_alignment>2</horizontal_alignment>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
+    </widget>
+    <widget type="xyplot" version="2.0.0">
+      <name>X/Y Plot_4</name>
+      <y>35</y>
+      <width>309</width>
+      <height>130</height>
+      <foreground_color>
+        <color name="Read_Background" red="230" green="235" blue="232">
+        </color>
+      </foreground_color>
+      <background_color>
+        <color name="BLACK" red="0" green="0" blue="0">
+        </color>
+      </background_color>
+      <grid_color>
+        <color red="77" green="77" blue="77">
+        </color>
+      </grid_color>
+      <show_legend>false</show_legend>
+      <x_axis>
+        <title></title>
+        <autoscale>false</autoscale>
+        <log_scale>false</log_scale>
+        <minimum>0.0</minimum>
+        <maximum>8000.0</maximum>
+        <show_grid>true</show_grid>
+        <title_font>
+          <font family="Source Sans Pro" style="BOLD" size="8.0">
+          </font>
+        </title_font>
+        <scale_font>
+          <font family="Source Sans Pro" style="REGULAR" size="8.0">
+          </font>
+        </scale_font>
+        <visible>true</visible>
+      </x_axis>
+      <y_axes>
+        <y_axis>
+          <title></title>
+          <autoscale>false</autoscale>
+          <log_scale>false</log_scale>
+          <minimum>-0.5</minimum>
+          <maximum>1.5</maximum>
+          <show_grid>true</show_grid>
+          <title_font>
+            <font family="Source Sans Pro" style="BOLD" size="8.0">
+            </font>
+          </title_font>
+          <scale_font>
+            <font family="Source Sans Pro" style="REGULAR" size="8.0">
+            </font>
+          </scale_font>
+          <visible>true</visible>
+        </y_axis>
+      </y_axes>
+      <traces>
+        <trace>
+          <name>$(traces[0].y_pv)</name>
+          <x_pv></x_pv>
+          <y_pv>$(PREFIX):$(DI04):Wave</y_pv>
+          <err_pv></err_pv>
+          <axis>0</axis>
+          <trace_type>1</trace_type>
+          <color>
+            <color red="60" green="255" blue="60">
+            </color>
+          </color>
+          <line_width>1</line_width>
+          <line_style>0</line_style>
+          <point_type>0</point_type>
+          <point_size>10</point_size>
+          <visible>true</visible>
+        </trace>
+      </traces>
+    </widget>
+  </widget>
+  <widget type="group" version="2.0.0">
+    <name>DIGITAL INPUT 5</name>
+    <x>350</x>
+    <y>70</y>
+    <width>311</width>
+    <height>188</height>
+    <style>1</style>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="16.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
+      </color>
+    </foreground_color>
+    <transparent>true</transparent>
+    <widget type="led" version="2.0.0">
+      <name>LED_20</name>
+      <pv_name>$(PREFIX):$(DI05):InputVal</pv_name>
+      <x>259</x>
+      <y>10</y>
+      <width>49</width>
+      <square>true</square>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>Text Update_64</name>
+      <pv_name>$(PREFIX):$(DI05).DESC</pv_name>
+      <y>10</y>
+      <width>259</width>
+      <horizontal_alignment>2</horizontal_alignment>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
+    </widget>
+    <widget type="xyplot" version="2.0.0">
+      <name>X/Y Plot_5</name>
+      <y>35</y>
+      <width>309</width>
+      <height>130</height>
+      <foreground_color>
+        <color name="Read_Background" red="230" green="235" blue="232">
+        </color>
+      </foreground_color>
+      <background_color>
+        <color name="BLACK" red="0" green="0" blue="0">
+        </color>
+      </background_color>
+      <grid_color>
+        <color red="77" green="77" blue="77">
+        </color>
+      </grid_color>
+      <show_legend>false</show_legend>
+      <x_axis>
+        <title></title>
+        <autoscale>false</autoscale>
+        <log_scale>false</log_scale>
+        <minimum>0.0</minimum>
+        <maximum>8000.0</maximum>
+        <show_grid>true</show_grid>
+        <title_font>
+          <font family="Source Sans Pro" style="BOLD" size="8.0">
+          </font>
+        </title_font>
+        <scale_font>
+          <font family="Source Sans Pro" style="REGULAR" size="8.0">
+          </font>
+        </scale_font>
+        <visible>true</visible>
+      </x_axis>
+      <y_axes>
+        <y_axis>
+          <title></title>
+          <autoscale>false</autoscale>
+          <log_scale>false</log_scale>
+          <minimum>-0.5</minimum>
+          <maximum>1.5</maximum>
+          <show_grid>true</show_grid>
+          <title_font>
+            <font family="Source Sans Pro" style="BOLD" size="8.0">
+            </font>
+          </title_font>
+          <scale_font>
+            <font family="Source Sans Pro" style="REGULAR" size="8.0">
+            </font>
+          </scale_font>
+          <visible>true</visible>
+        </y_axis>
+      </y_axes>
+      <traces>
+        <trace>
+          <name>$(traces[0].y_pv)</name>
+          <x_pv></x_pv>
+          <y_pv>$(PREFIX):$(DI05):Wave</y_pv>
+          <err_pv></err_pv>
+          <axis>0</axis>
+          <trace_type>1</trace_type>
+          <color>
+            <color red="60" green="255" blue="60">
+            </color>
+          </color>
+          <line_width>1</line_width>
+          <line_style>0</line_style>
+          <point_type>0</point_type>
+          <point_size>10</point_size>
+          <visible>true</visible>
+        </trace>
+      </traces>
+    </widget>
+  </widget>
+  <widget type="group" version="2.0.0">
+    <name>DIGITAL INPUT 6</name>
+    <x>350</x>
+    <y>270</y>
+    <width>311</width>
+    <height>188</height>
+    <style>1</style>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="16.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
+      </color>
+    </foreground_color>
+    <transparent>true</transparent>
+    <widget type="led" version="2.0.0">
+      <name>LED_21</name>
+      <pv_name>$(PREFIX):$(DI06):InputVal</pv_name>
+      <x>259</x>
+      <y>10</y>
+      <width>49</width>
+      <square>true</square>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>Text Update_65</name>
+      <pv_name>$(PREFIX):$(DI06).DESC</pv_name>
+      <y>10</y>
+      <width>259</width>
+      <horizontal_alignment>2</horizontal_alignment>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
+    </widget>
+    <widget type="xyplot" version="2.0.0">
+      <name>X/Y Plot_6</name>
+      <y>35</y>
+      <width>309</width>
+      <height>130</height>
+      <foreground_color>
+        <color name="Read_Background" red="230" green="235" blue="232">
+        </color>
+      </foreground_color>
+      <background_color>
+        <color name="BLACK" red="0" green="0" blue="0">
+        </color>
+      </background_color>
+      <grid_color>
+        <color red="77" green="77" blue="77">
+        </color>
+      </grid_color>
+      <show_legend>false</show_legend>
+      <x_axis>
+        <title></title>
+        <autoscale>false</autoscale>
+        <log_scale>false</log_scale>
+        <minimum>0.0</minimum>
+        <maximum>8000.0</maximum>
+        <show_grid>true</show_grid>
+        <title_font>
+          <font family="Source Sans Pro" style="BOLD" size="8.0">
+          </font>
+        </title_font>
+        <scale_font>
+          <font family="Source Sans Pro" style="REGULAR" size="8.0">
+          </font>
+        </scale_font>
+        <visible>true</visible>
+      </x_axis>
+      <y_axes>
+        <y_axis>
+          <title></title>
+          <autoscale>false</autoscale>
+          <log_scale>false</log_scale>
+          <minimum>-0.5</minimum>
+          <maximum>1.5</maximum>
+          <show_grid>true</show_grid>
+          <title_font>
+            <font family="Source Sans Pro" style="BOLD" size="8.0">
+            </font>
+          </title_font>
+          <scale_font>
+            <font family="Source Sans Pro" style="REGULAR" size="8.0">
+            </font>
+          </scale_font>
+          <visible>true</visible>
+        </y_axis>
+      </y_axes>
+      <traces>
+        <trace>
+          <name>$(traces[0].y_pv)</name>
+          <x_pv></x_pv>
+          <y_pv>$(PREFIX):$(DI06):Wave</y_pv>
+          <err_pv></err_pv>
+          <axis>0</axis>
+          <trace_type>1</trace_type>
+          <color>
+            <color red="60" green="255" blue="60">
+            </color>
+          </color>
+          <line_width>1</line_width>
+          <line_style>0</line_style>
+          <point_type>0</point_type>
+          <point_size>10</point_size>
+          <visible>true</visible>
+        </trace>
+      </traces>
+    </widget>
+  </widget>
+  <widget type="group" version="2.0.0">
+    <name>DIGITAL INPUT 7</name>
+    <x>350</x>
+    <y>471</y>
+    <width>311</width>
+    <height>188</height>
+    <style>1</style>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="16.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
+      </color>
+    </foreground_color>
+    <transparent>true</transparent>
+    <widget type="led" version="2.0.0">
+      <name>LED_22</name>
+      <pv_name>$(PREFIX):$(DI07):InputVal</pv_name>
+      <x>259</x>
+      <y>10</y>
+      <width>49</width>
+      <square>true</square>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>Text Update_66</name>
+      <pv_name>$(PREFIX):$(DI07).DESC</pv_name>
+      <y>10</y>
+      <width>259</width>
+      <horizontal_alignment>2</horizontal_alignment>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
+    </widget>
+    <widget type="xyplot" version="2.0.0">
+      <name>X/Y Plot_7</name>
+      <y>35</y>
+      <width>309</width>
+      <height>130</height>
+      <foreground_color>
+        <color name="Read_Background" red="230" green="235" blue="232">
+        </color>
+      </foreground_color>
+      <background_color>
+        <color name="BLACK" red="0" green="0" blue="0">
+        </color>
+      </background_color>
+      <grid_color>
+        <color red="77" green="77" blue="77">
+        </color>
+      </grid_color>
+      <show_legend>false</show_legend>
+      <x_axis>
+        <title></title>
+        <autoscale>false</autoscale>
+        <log_scale>false</log_scale>
+        <minimum>0.0</minimum>
+        <maximum>8000.0</maximum>
+        <show_grid>true</show_grid>
+        <title_font>
+          <font family="Source Sans Pro" style="BOLD" size="8.0">
+          </font>
+        </title_font>
+        <scale_font>
+          <font family="Source Sans Pro" style="REGULAR" size="8.0">
+          </font>
+        </scale_font>
+        <visible>true</visible>
+      </x_axis>
+      <y_axes>
+        <y_axis>
+          <title></title>
+          <autoscale>false</autoscale>
+          <log_scale>false</log_scale>
+          <minimum>-0.5</minimum>
+          <maximum>1.5</maximum>
+          <show_grid>true</show_grid>
+          <title_font>
+            <font family="Source Sans Pro" style="BOLD" size="8.0">
+            </font>
+          </title_font>
+          <scale_font>
+            <font family="Source Sans Pro" style="REGULAR" size="8.0">
+            </font>
+          </scale_font>
+          <visible>true</visible>
+        </y_axis>
+      </y_axes>
+      <traces>
+        <trace>
+          <name>$(traces[0].y_pv)</name>
+          <x_pv></x_pv>
+          <y_pv>$(PREFIX):$(DI07):Wave</y_pv>
+          <err_pv></err_pv>
+          <axis>0</axis>
+          <trace_type>1</trace_type>
+          <color>
+            <color red="60" green="255" blue="60">
+            </color>
+          </color>
+          <line_width>1</line_width>
+          <line_style>0</line_style>
+          <point_type>0</point_type>
+          <point_size>10</point_size>
+          <visible>true</visible>
+        </trace>
+      </traces>
+    </widget>
+  </widget>
+  <widget type="group" version="2.0.0">
+    <name>DIGITAL INPUT 8</name>
+    <x>350</x>
+    <y>670</y>
+    <width>311</width>
+    <height>188</height>
+    <style>1</style>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="16.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
+      </color>
+    </foreground_color>
+    <transparent>true</transparent>
+    <widget type="led" version="2.0.0">
+      <name>LED_23</name>
+      <pv_name>$(PREFIX):$(DI08):InputVal</pv_name>
+      <x>259</x>
+      <y>10</y>
+      <width>49</width>
+      <square>true</square>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>Text Update_67</name>
+      <pv_name>$(PREFIX):$(DI08).DESC</pv_name>
+      <y>10</y>
+      <width>259</width>
+      <horizontal_alignment>2</horizontal_alignment>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
+    </widget>
+    <widget type="xyplot" version="2.0.0">
+      <name>X/Y Plot_8</name>
+      <y>35</y>
+      <width>309</width>
+      <height>130</height>
+      <foreground_color>
+        <color name="Read_Background" red="230" green="235" blue="232">
+        </color>
+      </foreground_color>
+      <background_color>
+        <color name="BLACK" red="0" green="0" blue="0">
+        </color>
+      </background_color>
+      <grid_color>
+        <color red="77" green="77" blue="77">
+        </color>
+      </grid_color>
+      <show_legend>false</show_legend>
+      <x_axis>
+        <title></title>
+        <autoscale>false</autoscale>
+        <log_scale>false</log_scale>
+        <minimum>0.0</minimum>
+        <maximum>8000.0</maximum>
+        <show_grid>true</show_grid>
+        <title_font>
+          <font family="Source Sans Pro" style="BOLD" size="8.0">
+          </font>
+        </title_font>
+        <scale_font>
+          <font family="Source Sans Pro" style="REGULAR" size="8.0">
+          </font>
+        </scale_font>
+        <visible>true</visible>
+      </x_axis>
+      <y_axes>
+        <y_axis>
+          <title></title>
+          <autoscale>false</autoscale>
+          <log_scale>false</log_scale>
+          <minimum>-0.5</minimum>
+          <maximum>1.5</maximum>
+          <show_grid>true</show_grid>
+          <title_font>
+            <font family="Source Sans Pro" style="BOLD" size="8.0">
+            </font>
+          </title_font>
+          <scale_font>
+            <font family="Source Sans Pro" style="REGULAR" size="8.0">
+            </font>
+          </scale_font>
+          <visible>true</visible>
+        </y_axis>
+      </y_axes>
+      <traces>
+        <trace>
+          <name>$(traces[0].y_pv)</name>
+          <x_pv></x_pv>
+          <y_pv>$(PREFIX):$(DI08):Wave</y_pv>
+          <err_pv></err_pv>
+          <axis>0</axis>
+          <trace_type>1</trace_type>
+          <color>
+            <color red="60" green="255" blue="60">
+            </color>
+          </color>
+          <line_width>1</line_width>
+          <line_style>0</line_style>
+          <point_type>0</point_type>
+          <point_size>10</point_size>
+          <visible>true</visible>
+        </trace>
+      </traces>
+    </widget>
+  </widget>
+  <widget type="group" version="2.0.0">
+    <name>DIGITAL INPUT 9</name>
+    <x>350</x>
+    <y>868</y>
+    <width>311</width>
+    <height>188</height>
+    <style>1</style>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="16.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
+      </color>
+    </foreground_color>
+    <transparent>true</transparent>
+    <widget type="led" version="2.0.0">
+      <name>LED_24</name>
+      <pv_name>$(PREFIX):$(DI09):InputVal</pv_name>
+      <x>259</x>
+      <y>10</y>
+      <width>49</width>
+      <square>true</square>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>Text Update_68</name>
+      <pv_name>$(PREFIX):$(DI09).DESC</pv_name>
+      <y>10</y>
+      <width>259</width>
+      <horizontal_alignment>2</horizontal_alignment>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
+    </widget>
+    <widget type="xyplot" version="2.0.0">
+      <name>X/Y Plot_9</name>
+      <y>35</y>
+      <width>309</width>
+      <height>130</height>
+      <foreground_color>
+        <color name="Read_Background" red="230" green="235" blue="232">
+        </color>
+      </foreground_color>
+      <background_color>
+        <color name="BLACK" red="0" green="0" blue="0">
+        </color>
+      </background_color>
+      <grid_color>
+        <color red="77" green="77" blue="77">
+        </color>
+      </grid_color>
+      <show_legend>false</show_legend>
+      <x_axis>
+        <title></title>
+        <autoscale>false</autoscale>
+        <log_scale>false</log_scale>
+        <minimum>0.0</minimum>
+        <maximum>8000.0</maximum>
+        <show_grid>true</show_grid>
+        <title_font>
+          <font family="Source Sans Pro" style="BOLD" size="8.0">
+          </font>
+        </title_font>
+        <scale_font>
+          <font family="Source Sans Pro" style="REGULAR" size="8.0">
+          </font>
+        </scale_font>
+        <visible>true</visible>
+      </x_axis>
+      <y_axes>
+        <y_axis>
+          <title></title>
+          <autoscale>false</autoscale>
+          <log_scale>false</log_scale>
+          <minimum>-0.5</minimum>
+          <maximum>1.5</maximum>
+          <show_grid>true</show_grid>
+          <title_font>
+            <font family="Source Sans Pro" style="BOLD" size="8.0">
+            </font>
+          </title_font>
+          <scale_font>
+            <font family="Source Sans Pro" style="REGULAR" size="8.0">
+            </font>
+          </scale_font>
+          <visible>true</visible>
+        </y_axis>
+      </y_axes>
+      <traces>
+        <trace>
+          <name>$(traces[0].y_pv)</name>
+          <x_pv></x_pv>
+          <y_pv>$(PREFIX):$(DI09):Wave</y_pv>
+          <err_pv></err_pv>
+          <axis>0</axis>
+          <trace_type>1</trace_type>
+          <color>
+            <color red="60" green="255" blue="60">
+            </color>
+          </color>
+          <line_width>1</line_width>
+          <line_style>0</line_style>
+          <point_type>0</point_type>
+          <point_size>10</point_size>
+          <visible>true</visible>
+        </trace>
+      </traces>
+    </widget>
+  </widget>
+  <widget type="group" version="2.0.0">
+    <name>DIGITAL INPUT 10</name>
+    <x>680</x>
+    <y>70</y>
+    <width>311</width>
+    <height>188</height>
+    <style>1</style>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="16.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
+      </color>
+    </foreground_color>
+    <transparent>true</transparent>
+    <widget type="led" version="2.0.0">
+      <name>LED_25</name>
+      <pv_name>$(PREFIX):$(DI10):InputVal</pv_name>
+      <x>259</x>
+      <y>10</y>
+      <width>49</width>
+      <square>true</square>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>Text Update_69</name>
+      <pv_name>$(PREFIX):$(DI10).DESC</pv_name>
+      <y>10</y>
+      <width>259</width>
+      <horizontal_alignment>2</horizontal_alignment>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
+    </widget>
+    <widget type="xyplot" version="2.0.0">
+      <name>X/Y Plot_10</name>
+      <y>35</y>
+      <width>309</width>
+      <height>130</height>
+      <foreground_color>
+        <color name="Read_Background" red="230" green="235" blue="232">
+        </color>
+      </foreground_color>
+      <background_color>
+        <color name="BLACK" red="0" green="0" blue="0">
+        </color>
+      </background_color>
+      <grid_color>
+        <color red="77" green="77" blue="77">
+        </color>
+      </grid_color>
+      <show_legend>false</show_legend>
+      <x_axis>
+        <title></title>
+        <autoscale>false</autoscale>
+        <log_scale>false</log_scale>
+        <minimum>0.0</minimum>
+        <maximum>8000.0</maximum>
+        <show_grid>true</show_grid>
+        <title_font>
+          <font family="Source Sans Pro" style="BOLD" size="8.0">
+          </font>
+        </title_font>
+        <scale_font>
+          <font family="Source Sans Pro" style="REGULAR" size="8.0">
+          </font>
+        </scale_font>
+        <visible>true</visible>
+      </x_axis>
+      <y_axes>
+        <y_axis>
+          <title></title>
+          <autoscale>false</autoscale>
+          <log_scale>false</log_scale>
+          <minimum>-0.5</minimum>
+          <maximum>1.5</maximum>
+          <show_grid>true</show_grid>
+          <title_font>
+            <font family="Source Sans Pro" style="BOLD" size="8.0">
+            </font>
+          </title_font>
+          <scale_font>
+            <font family="Source Sans Pro" style="REGULAR" size="8.0">
+            </font>
+          </scale_font>
+          <visible>true</visible>
+        </y_axis>
+      </y_axes>
+      <traces>
+        <trace>
+          <name>$(traces[0].y_pv)</name>
+          <x_pv></x_pv>
+          <y_pv>$(PREFIX):$(DI10):Wave</y_pv>
+          <err_pv></err_pv>
+          <axis>0</axis>
+          <trace_type>1</trace_type>
+          <color>
+            <color red="60" green="255" blue="60">
+            </color>
+          </color>
+          <line_width>1</line_width>
+          <line_style>0</line_style>
+          <point_type>0</point_type>
+          <point_size>10</point_size>
+          <visible>true</visible>
+        </trace>
+      </traces>
+    </widget>
+  </widget>
+  <widget type="group" version="2.0.0">
+    <name>DIGITAL INPUT 11</name>
+    <x>680</x>
+    <y>271</y>
+    <width>311</width>
+    <height>188</height>
+    <style>1</style>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="16.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
+      </color>
+    </foreground_color>
+    <transparent>true</transparent>
+    <widget type="led" version="2.0.0">
+      <name>LED_26</name>
+      <pv_name>$(PREFIX):$(DI11):InputVal</pv_name>
+      <x>259</x>
+      <y>10</y>
+      <width>49</width>
+      <square>true</square>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>Text Update_70</name>
+      <pv_name>$(PREFIX):$(DI11).DESC</pv_name>
+      <y>10</y>
+      <width>259</width>
+      <horizontal_alignment>2</horizontal_alignment>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
+    </widget>
+    <widget type="xyplot" version="2.0.0">
+      <name>X/Y Plot_11</name>
+      <y>35</y>
+      <width>309</width>
+      <height>130</height>
+      <foreground_color>
+        <color name="Read_Background" red="230" green="235" blue="232">
+        </color>
+      </foreground_color>
+      <background_color>
+        <color name="BLACK" red="0" green="0" blue="0">
+        </color>
+      </background_color>
+      <grid_color>
+        <color red="77" green="77" blue="77">
+        </color>
+      </grid_color>
+      <show_legend>false</show_legend>
+      <x_axis>
+        <title></title>
+        <autoscale>false</autoscale>
+        <log_scale>false</log_scale>
+        <minimum>0.0</minimum>
+        <maximum>8000.0</maximum>
+        <show_grid>true</show_grid>
+        <title_font>
+          <font family="Source Sans Pro" style="BOLD" size="8.0">
+          </font>
+        </title_font>
+        <scale_font>
+          <font family="Source Sans Pro" style="REGULAR" size="8.0">
+          </font>
+        </scale_font>
+        <visible>true</visible>
+      </x_axis>
+      <y_axes>
+        <y_axis>
+          <title></title>
+          <autoscale>false</autoscale>
+          <log_scale>false</log_scale>
+          <minimum>-0.5</minimum>
+          <maximum>1.5</maximum>
+          <show_grid>true</show_grid>
+          <title_font>
+            <font family="Source Sans Pro" style="BOLD" size="8.0">
+            </font>
+          </title_font>
+          <scale_font>
+            <font family="Source Sans Pro" style="REGULAR" size="8.0">
+            </font>
+          </scale_font>
+          <visible>true</visible>
+        </y_axis>
+      </y_axes>
+      <traces>
+        <trace>
+          <name>$(traces[0].y_pv)</name>
+          <x_pv></x_pv>
+          <y_pv>$(PREFIX):$(DI11):Wave</y_pv>
+          <err_pv></err_pv>
+          <axis>0</axis>
+          <trace_type>1</trace_type>
+          <color>
+            <color red="60" green="255" blue="60">
+            </color>
+          </color>
+          <line_width>1</line_width>
+          <line_style>0</line_style>
+          <point_type>0</point_type>
+          <point_size>10</point_size>
+          <visible>true</visible>
+        </trace>
+      </traces>
+    </widget>
+  </widget>
+  <widget type="group" version="2.0.0">
+    <name>DIGITAL INPUT 12</name>
+    <x>681</x>
+    <y>471</y>
+    <width>311</width>
+    <height>188</height>
+    <style>1</style>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="16.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
+      </color>
+    </foreground_color>
+    <transparent>true</transparent>
+    <widget type="led" version="2.0.0">
+      <name>LED_27</name>
+      <pv_name>$(PREFIX):$(DI12):InputVal</pv_name>
+      <x>259</x>
+      <y>10</y>
+      <width>49</width>
+      <square>true</square>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>Text Update_71</name>
+      <pv_name>$(PREFIX):$(DI12).DESC</pv_name>
+      <y>10</y>
+      <width>259</width>
+      <horizontal_alignment>2</horizontal_alignment>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
+    </widget>
+    <widget type="xyplot" version="2.0.0">
+      <name>X/Y Plot_12</name>
+      <y>35</y>
+      <width>309</width>
+      <height>130</height>
+      <foreground_color>
+        <color name="Read_Background" red="230" green="235" blue="232">
+        </color>
+      </foreground_color>
+      <background_color>
+        <color name="BLACK" red="0" green="0" blue="0">
+        </color>
+      </background_color>
+      <grid_color>
+        <color red="77" green="77" blue="77">
+        </color>
+      </grid_color>
+      <show_legend>false</show_legend>
+      <x_axis>
+        <title></title>
+        <autoscale>false</autoscale>
+        <log_scale>false</log_scale>
+        <minimum>0.0</minimum>
+        <maximum>8000.0</maximum>
+        <show_grid>true</show_grid>
+        <title_font>
+          <font family="Source Sans Pro" style="BOLD" size="8.0">
+          </font>
+        </title_font>
+        <scale_font>
+          <font family="Source Sans Pro" style="REGULAR" size="8.0">
+          </font>
+        </scale_font>
+        <visible>true</visible>
+      </x_axis>
+      <y_axes>
+        <y_axis>
+          <title></title>
+          <autoscale>false</autoscale>
+          <log_scale>false</log_scale>
+          <minimum>-0.5</minimum>
+          <maximum>1.5</maximum>
+          <show_grid>true</show_grid>
+          <title_font>
+            <font family="Source Sans Pro" style="BOLD" size="8.0">
+            </font>
+          </title_font>
+          <scale_font>
+            <font family="Source Sans Pro" style="REGULAR" size="8.0">
+            </font>
+          </scale_font>
+          <visible>true</visible>
+        </y_axis>
+      </y_axes>
+      <traces>
+        <trace>
+          <name>$(traces[0].y_pv)</name>
+          <x_pv></x_pv>
+          <y_pv>$(PREFIX):$(DI12):Wave</y_pv>
+          <err_pv></err_pv>
+          <axis>0</axis>
+          <trace_type>1</trace_type>
+          <color>
+            <color red="60" green="255" blue="60">
+            </color>
+          </color>
+          <line_width>1</line_width>
+          <line_style>0</line_style>
+          <point_type>0</point_type>
+          <point_size>10</point_size>
+          <visible>true</visible>
+        </trace>
+      </traces>
+    </widget>
+  </widget>
+  <widget type="group" version="2.0.0">
+    <name>DIGITAL INPUT 13</name>
+    <x>682</x>
+    <y>670</y>
+    <width>311</width>
+    <height>188</height>
+    <style>1</style>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="16.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
+      </color>
+    </foreground_color>
+    <transparent>true</transparent>
+    <widget type="led" version="2.0.0">
+      <name>LED_28</name>
+      <pv_name>$(PREFIX):$(DI13):InputVal</pv_name>
+      <x>259</x>
+      <y>10</y>
+      <width>49</width>
+      <square>true</square>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>Text Update_72</name>
+      <pv_name>$(PREFIX):$(DI13).DESC</pv_name>
+      <y>10</y>
+      <width>259</width>
+      <horizontal_alignment>2</horizontal_alignment>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
+    </widget>
+    <widget type="xyplot" version="2.0.0">
+      <name>X/Y Plot_13</name>
+      <y>35</y>
+      <width>309</width>
+      <height>130</height>
+      <foreground_color>
+        <color name="Read_Background" red="230" green="235" blue="232">
+        </color>
+      </foreground_color>
+      <background_color>
+        <color name="BLACK" red="0" green="0" blue="0">
+        </color>
+      </background_color>
+      <grid_color>
+        <color red="77" green="77" blue="77">
+        </color>
+      </grid_color>
+      <show_legend>false</show_legend>
+      <x_axis>
+        <title></title>
+        <autoscale>false</autoscale>
+        <log_scale>false</log_scale>
+        <minimum>0.0</minimum>
+        <maximum>8000.0</maximum>
+        <show_grid>true</show_grid>
+        <title_font>
+          <font family="Source Sans Pro" style="BOLD" size="8.0">
+          </font>
+        </title_font>
+        <scale_font>
+          <font family="Source Sans Pro" style="REGULAR" size="8.0">
+          </font>
+        </scale_font>
+        <visible>true</visible>
+      </x_axis>
+      <y_axes>
+        <y_axis>
+          <title></title>
+          <autoscale>false</autoscale>
+          <log_scale>false</log_scale>
+          <minimum>-0.5</minimum>
+          <maximum>1.5</maximum>
+          <show_grid>true</show_grid>
+          <title_font>
+            <font family="Source Sans Pro" style="BOLD" size="8.0">
+            </font>
+          </title_font>
+          <scale_font>
+            <font family="Source Sans Pro" style="REGULAR" size="8.0">
+            </font>
+          </scale_font>
+          <visible>true</visible>
+        </y_axis>
+      </y_axes>
+      <traces>
+        <trace>
+          <name>$(traces[0].y_pv)</name>
+          <x_pv></x_pv>
+          <y_pv>$(PREFIX):$(DI13):Wave</y_pv>
+          <err_pv></err_pv>
+          <axis>0</axis>
+          <trace_type>1</trace_type>
+          <color>
+            <color red="60" green="255" blue="60">
+            </color>
+          </color>
+          <line_width>1</line_width>
+          <line_style>0</line_style>
+          <point_type>0</point_type>
+          <point_size>10</point_size>
+          <visible>true</visible>
+        </trace>
+      </traces>
+    </widget>
+  </widget>
+  <widget type="group" version="2.0.0">
+    <name>DIGITAL INPUT 14</name>
+    <x>682</x>
+    <y>868</y>
+    <width>311</width>
+    <height>188</height>
+    <style>1</style>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="16.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
+      </color>
+    </foreground_color>
+    <transparent>true</transparent>
+    <widget type="led" version="2.0.0">
+      <name>LED_29</name>
+      <pv_name>$(PREFIX):$(DI14):InputVal</pv_name>
+      <x>259</x>
+      <y>10</y>
+      <width>49</width>
+      <square>true</square>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>Text Update_73</name>
+      <pv_name>$(PREFIX):$(DI14).DESC</pv_name>
+      <y>10</y>
+      <width>259</width>
+      <horizontal_alignment>2</horizontal_alignment>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
+    </widget>
+    <widget type="xyplot" version="2.0.0">
+      <name>X/Y Plot_14</name>
+      <y>35</y>
+      <width>309</width>
+      <height>130</height>
+      <foreground_color>
+        <color name="Read_Background" red="230" green="235" blue="232">
+        </color>
+      </foreground_color>
+      <background_color>
+        <color name="BLACK" red="0" green="0" blue="0">
+        </color>
+      </background_color>
+      <grid_color>
+        <color red="77" green="77" blue="77">
+        </color>
+      </grid_color>
+      <show_legend>false</show_legend>
+      <x_axis>
+        <title></title>
+        <autoscale>false</autoscale>
+        <log_scale>false</log_scale>
+        <minimum>0.0</minimum>
+        <maximum>8000.0</maximum>
+        <show_grid>true</show_grid>
+        <title_font>
+          <font family="Source Sans Pro" style="BOLD" size="8.0">
+          </font>
+        </title_font>
+        <scale_font>
+          <font family="Source Sans Pro" style="REGULAR" size="8.0">
+          </font>
+        </scale_font>
+        <visible>true</visible>
+      </x_axis>
+      <y_axes>
+        <y_axis>
+          <title></title>
+          <autoscale>false</autoscale>
+          <log_scale>false</log_scale>
+          <minimum>-0.5</minimum>
+          <maximum>1.5</maximum>
+          <show_grid>true</show_grid>
+          <title_font>
+            <font family="Source Sans Pro" style="BOLD" size="8.0">
+            </font>
+          </title_font>
+          <scale_font>
+            <font family="Source Sans Pro" style="REGULAR" size="8.0">
+            </font>
+          </scale_font>
+          <visible>true</visible>
+        </y_axis>
+      </y_axes>
+      <traces>
+        <trace>
+          <name>$(traces[0].y_pv)</name>
+          <x_pv></x_pv>
+          <y_pv>$(PREFIX):$(DI14):Wave</y_pv>
+          <err_pv></err_pv>
+          <axis>0</axis>
+          <trace_type>1</trace_type>
+          <color>
+            <color red="60" green="255" blue="60">
+            </color>
+          </color>
+          <line_width>1</line_width>
+          <line_style>0</line_style>
+          <point_type>0</point_type>
+          <point_size>10</point_size>
+          <visible>true</visible>
+        </trace>
+      </traces>
+    </widget>
+  </widget>
+  <widget type="group" version="2.0.0">
+    <name>DIGITAL INPUT 15</name>
+    <x>1020</x>
+    <y>70</y>
+    <width>311</width>
+    <height>188</height>
+    <style>1</style>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="16.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
+      </color>
+    </foreground_color>
+    <transparent>true</transparent>
+    <widget type="led" version="2.0.0">
+      <name>LED_30</name>
+      <pv_name>$(PREFIX):$(DI15):InputVal</pv_name>
+      <x>259</x>
+      <y>10</y>
+      <width>49</width>
+      <square>true</square>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>Text Update_74</name>
+      <pv_name>$(PREFIX):$(DI15).DESC</pv_name>
+      <y>10</y>
+      <width>259</width>
+      <horizontal_alignment>2</horizontal_alignment>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
+    </widget>
+    <widget type="xyplot" version="2.0.0">
+      <name>X/Y Plot_15</name>
+      <y>35</y>
+      <width>309</width>
+      <height>130</height>
+      <foreground_color>
+        <color name="Read_Background" red="230" green="235" blue="232">
+        </color>
+      </foreground_color>
+      <background_color>
+        <color name="BLACK" red="0" green="0" blue="0">
+        </color>
+      </background_color>
+      <grid_color>
+        <color red="77" green="77" blue="77">
+        </color>
+      </grid_color>
+      <show_legend>false</show_legend>
+      <x_axis>
+        <title></title>
+        <autoscale>false</autoscale>
+        <log_scale>false</log_scale>
+        <minimum>0.0</minimum>
+        <maximum>8000.0</maximum>
+        <show_grid>true</show_grid>
+        <title_font>
+          <font family="Source Sans Pro" style="BOLD" size="8.0">
+          </font>
+        </title_font>
+        <scale_font>
+          <font family="Source Sans Pro" style="REGULAR" size="8.0">
+          </font>
+        </scale_font>
+        <visible>true</visible>
+      </x_axis>
+      <y_axes>
+        <y_axis>
+          <title></title>
+          <autoscale>false</autoscale>
+          <log_scale>false</log_scale>
+          <minimum>-0.5</minimum>
+          <maximum>1.5</maximum>
+          <show_grid>true</show_grid>
+          <title_font>
+            <font family="Source Sans Pro" style="BOLD" size="8.0">
+            </font>
+          </title_font>
+          <scale_font>
+            <font family="Source Sans Pro" style="REGULAR" size="8.0">
+            </font>
+          </scale_font>
+          <visible>true</visible>
+        </y_axis>
+      </y_axes>
+      <traces>
+        <trace>
+          <name>$(traces[0].y_pv)</name>
+          <x_pv></x_pv>
+          <y_pv>$(PREFIX):$(DI15):Wave</y_pv>
+          <err_pv></err_pv>
+          <axis>0</axis>
+          <trace_type>1</trace_type>
+          <color>
+            <color red="60" green="255" blue="60">
+            </color>
+          </color>
+          <line_width>1</line_width>
+          <line_style>0</line_style>
+          <point_type>0</point_type>
+          <point_size>10</point_size>
+          <visible>true</visible>
+        </trace>
+      </traces>
+    </widget>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED_31</name>
+    <pv_name>$(PREFIX):$(DI00):InputVal</pv_name>
+    <x>1560</x>
+    <y>170</y>
+    <square>true</square>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_75</name>
+    <pv_name>$(PREFIX):$(DI00).DESC</pv_name>
+    <x>1380</x>
+    <y>170</y>
+    <width>170</width>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+  </widget>
+  <widget type="group" version="2.0.0">
+    <name>DIGITAL INPUT 16</name>
+    <x>1020</x>
+    <y>271</y>
+    <width>311</width>
+    <height>188</height>
+    <style>1</style>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="16.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
+      </color>
+    </foreground_color>
+    <transparent>true</transparent>
+    <widget type="led" version="2.0.0">
+      <name>LED_32</name>
+      <pv_name>$(PREFIX):$(DI16):InputVal</pv_name>
+      <x>259</x>
+      <y>10</y>
+      <width>49</width>
+      <square>true</square>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>Text Update_76</name>
+      <pv_name>$(PREFIX):$(DI16).DESC</pv_name>
+      <y>10</y>
+      <width>259</width>
+      <horizontal_alignment>2</horizontal_alignment>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
+    </widget>
+    <widget type="xyplot" version="2.0.0">
+      <name>X/Y Plot_16</name>
+      <y>35</y>
+      <width>309</width>
+      <height>130</height>
+      <foreground_color>
+        <color name="Read_Background" red="230" green="235" blue="232">
+        </color>
+      </foreground_color>
+      <background_color>
+        <color name="BLACK" red="0" green="0" blue="0">
+        </color>
+      </background_color>
+      <grid_color>
+        <color red="77" green="77" blue="77">
+        </color>
+      </grid_color>
+      <show_legend>false</show_legend>
+      <x_axis>
+        <title></title>
+        <autoscale>false</autoscale>
+        <log_scale>false</log_scale>
+        <minimum>0.0</minimum>
+        <maximum>8000.0</maximum>
+        <show_grid>true</show_grid>
+        <title_font>
+          <font family="Source Sans Pro" style="BOLD" size="8.0">
+          </font>
+        </title_font>
+        <scale_font>
+          <font family="Source Sans Pro" style="REGULAR" size="8.0">
+          </font>
+        </scale_font>
+        <visible>true</visible>
+      </x_axis>
+      <y_axes>
+        <y_axis>
+          <title></title>
+          <autoscale>false</autoscale>
+          <log_scale>false</log_scale>
+          <minimum>-0.5</minimum>
+          <maximum>1.5</maximum>
+          <show_grid>true</show_grid>
+          <title_font>
+            <font family="Source Sans Pro" style="BOLD" size="8.0">
+            </font>
+          </title_font>
+          <scale_font>
+            <font family="Source Sans Pro" style="REGULAR" size="8.0">
+            </font>
+          </scale_font>
+          <visible>true</visible>
+        </y_axis>
+      </y_axes>
+      <traces>
+        <trace>
+          <name>$(traces[0].y_pv)</name>
+          <x_pv></x_pv>
+          <y_pv>$(PREFIX):$(DI16):Wave</y_pv>
+          <err_pv></err_pv>
+          <axis>0</axis>
+          <trace_type>1</trace_type>
+          <color>
+            <color red="60" green="255" blue="60">
+            </color>
+          </color>
+          <line_width>1</line_width>
+          <line_style>0</line_style>
+          <point_type>0</point_type>
+          <point_size>10</point_size>
+          <visible>true</visible>
+        </trace>
+      </traces>
+    </widget>
+  </widget>
+  <widget type="group" version="2.0.0">
+    <name>DIGITAL INPUT 17</name>
+    <x>1020</x>
+    <y>471</y>
+    <width>311</width>
+    <height>188</height>
+    <style>1</style>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="16.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
+      </color>
+    </foreground_color>
+    <transparent>true</transparent>
+    <widget type="led" version="2.0.0">
+      <name>LED_33</name>
+      <pv_name>$(PREFIX):$(DI17):InputVal</pv_name>
+      <x>259</x>
+      <y>10</y>
+      <width>49</width>
+      <square>true</square>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>Text Update_77</name>
+      <pv_name>$(PREFIX):$(DI17).DESC</pv_name>
+      <y>10</y>
+      <width>259</width>
+      <horizontal_alignment>2</horizontal_alignment>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
+    </widget>
+    <widget type="xyplot" version="2.0.0">
+      <name>X/Y Plot_17</name>
+      <y>35</y>
+      <width>309</width>
+      <height>130</height>
+      <foreground_color>
+        <color name="Read_Background" red="230" green="235" blue="232">
+        </color>
+      </foreground_color>
+      <background_color>
+        <color name="BLACK" red="0" green="0" blue="0">
+        </color>
+      </background_color>
+      <grid_color>
+        <color red="77" green="77" blue="77">
+        </color>
+      </grid_color>
+      <show_legend>false</show_legend>
+      <x_axis>
+        <title></title>
+        <autoscale>false</autoscale>
+        <log_scale>false</log_scale>
+        <minimum>0.0</minimum>
+        <maximum>8000.0</maximum>
+        <show_grid>true</show_grid>
+        <title_font>
+          <font family="Source Sans Pro" style="BOLD" size="8.0">
+          </font>
+        </title_font>
+        <scale_font>
+          <font family="Source Sans Pro" style="REGULAR" size="8.0">
+          </font>
+        </scale_font>
+        <visible>true</visible>
+      </x_axis>
+      <y_axes>
+        <y_axis>
+          <title></title>
+          <autoscale>false</autoscale>
+          <log_scale>false</log_scale>
+          <minimum>-0.5</minimum>
+          <maximum>1.5</maximum>
+          <show_grid>true</show_grid>
+          <title_font>
+            <font family="Source Sans Pro" style="BOLD" size="8.0">
+            </font>
+          </title_font>
+          <scale_font>
+            <font family="Source Sans Pro" style="REGULAR" size="8.0">
+            </font>
+          </scale_font>
+          <visible>true</visible>
+        </y_axis>
+      </y_axes>
+      <traces>
+        <trace>
+          <name>$(traces[0].y_pv)</name>
+          <x_pv></x_pv>
+          <y_pv>$(PREFIX):$(DI17):Wave</y_pv>
+          <err_pv></err_pv>
+          <axis>0</axis>
+          <trace_type>1</trace_type>
+          <color>
+            <color red="60" green="255" blue="60">
+            </color>
+          </color>
+          <line_width>1</line_width>
+          <line_style>0</line_style>
+          <point_type>0</point_type>
+          <point_size>10</point_size>
+          <visible>true</visible>
+        </trace>
+      </traces>
+    </widget>
+  </widget>
+  <widget type="group" version="2.0.0">
+    <name>DIGITAL INPUT 18</name>
+    <x>1020</x>
+    <y>670</y>
+    <width>311</width>
+    <height>188</height>
+    <style>1</style>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="16.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
+      </color>
+    </foreground_color>
+    <transparent>true</transparent>
+    <widget type="led" version="2.0.0">
+      <name>LED_34</name>
+      <pv_name>$(PREFIX):$(DI18):InputVal</pv_name>
+      <x>259</x>
+      <y>10</y>
+      <width>49</width>
+      <square>true</square>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>Text Update_78</name>
+      <pv_name>$(PREFIX):$(DI18).DESC</pv_name>
+      <y>10</y>
+      <width>259</width>
+      <horizontal_alignment>2</horizontal_alignment>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
+    </widget>
+    <widget type="xyplot" version="2.0.0">
+      <name>X/Y Plot_18</name>
+      <y>35</y>
+      <width>309</width>
+      <height>130</height>
+      <foreground_color>
+        <color name="Read_Background" red="230" green="235" blue="232">
+        </color>
+      </foreground_color>
+      <background_color>
+        <color name="BLACK" red="0" green="0" blue="0">
+        </color>
+      </background_color>
+      <grid_color>
+        <color red="77" green="77" blue="77">
+        </color>
+      </grid_color>
+      <show_legend>false</show_legend>
+      <x_axis>
+        <title></title>
+        <autoscale>false</autoscale>
+        <log_scale>false</log_scale>
+        <minimum>0.0</minimum>
+        <maximum>8000.0</maximum>
+        <show_grid>true</show_grid>
+        <title_font>
+          <font family="Source Sans Pro" style="BOLD" size="8.0">
+          </font>
+        </title_font>
+        <scale_font>
+          <font family="Source Sans Pro" style="REGULAR" size="8.0">
+          </font>
+        </scale_font>
+        <visible>true</visible>
+      </x_axis>
+      <y_axes>
+        <y_axis>
+          <title></title>
+          <autoscale>false</autoscale>
+          <log_scale>false</log_scale>
+          <minimum>-0.5</minimum>
+          <maximum>1.5</maximum>
+          <show_grid>true</show_grid>
+          <title_font>
+            <font family="Source Sans Pro" style="BOLD" size="8.0">
+            </font>
+          </title_font>
+          <scale_font>
+            <font family="Source Sans Pro" style="REGULAR" size="8.0">
+            </font>
+          </scale_font>
+          <visible>true</visible>
+        </y_axis>
+      </y_axes>
+      <traces>
+        <trace>
+          <name>$(traces[0].y_pv)</name>
+          <x_pv></x_pv>
+          <y_pv>$(PREFIX):$(DI18):Wave</y_pv>
+          <err_pv></err_pv>
+          <axis>0</axis>
+          <trace_type>1</trace_type>
+          <color>
+            <color red="60" green="255" blue="60">
+            </color>
+          </color>
+          <line_width>1</line_width>
+          <line_style>0</line_style>
+          <point_type>0</point_type>
+          <point_size>10</point_size>
+          <visible>true</visible>
+        </trace>
+      </traces>
+    </widget>
+  </widget>
+  <widget type="group" version="2.0.0">
+    <name>DIGITAL INPUT 19</name>
+    <x>1020</x>
+    <y>868</y>
+    <width>311</width>
+    <height>188</height>
+    <style>1</style>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="16.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
+      </color>
+    </foreground_color>
+    <transparent>true</transparent>
+    <widget type="led" version="2.0.0">
+      <name>LED_35</name>
+      <pv_name>$(PREFIX):$(DI19):InputVal</pv_name>
+      <x>259</x>
+      <y>10</y>
+      <width>49</width>
+      <square>true</square>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>Text Update_79</name>
+      <pv_name>$(PREFIX):$(DI19).DESC</pv_name>
+      <y>10</y>
+      <width>259</width>
+      <horizontal_alignment>2</horizontal_alignment>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
+    </widget>
+    <widget type="xyplot" version="2.0.0">
+      <name>X/Y Plot_19</name>
+      <y>35</y>
+      <width>309</width>
+      <height>130</height>
+      <foreground_color>
+        <color name="Read_Background" red="230" green="235" blue="232">
+        </color>
+      </foreground_color>
+      <background_color>
+        <color name="BLACK" red="0" green="0" blue="0">
+        </color>
+      </background_color>
+      <grid_color>
+        <color red="77" green="77" blue="77">
+        </color>
+      </grid_color>
+      <show_legend>false</show_legend>
+      <x_axis>
+        <title></title>
+        <autoscale>false</autoscale>
+        <log_scale>false</log_scale>
+        <minimum>0.0</minimum>
+        <maximum>8000.0</maximum>
+        <show_grid>true</show_grid>
+        <title_font>
+          <font family="Source Sans Pro" style="BOLD" size="8.0">
+          </font>
+        </title_font>
+        <scale_font>
+          <font family="Source Sans Pro" style="REGULAR" size="8.0">
+          </font>
+        </scale_font>
+        <visible>true</visible>
+      </x_axis>
+      <y_axes>
+        <y_axis>
+          <title></title>
+          <autoscale>false</autoscale>
+          <log_scale>false</log_scale>
+          <minimum>-0.5</minimum>
+          <maximum>1.5</maximum>
+          <show_grid>true</show_grid>
+          <title_font>
+            <font family="Source Sans Pro" style="BOLD" size="8.0">
+            </font>
+          </title_font>
+          <scale_font>
+            <font family="Source Sans Pro" style="REGULAR" size="8.0">
+            </font>
+          </scale_font>
+          <visible>true</visible>
+        </y_axis>
+      </y_axes>
+      <traces>
+        <trace>
+          <name>$(traces[0].y_pv)</name>
+          <x_pv></x_pv>
+          <y_pv>$(PREFIX):$(DI19):Wave</y_pv>
+          <err_pv></err_pv>
+          <axis>0</axis>
+          <trace_type>1</trace_type>
+          <color>
+            <color red="60" green="255" blue="60">
+            </color>
+          </color>
+          <line_width>1</line_width>
+          <line_style>0</line_style>
+          <point_type>0</point_type>
+          <point_size>10</point_size>
+          <visible>true</visible>
+        </trace>
+      </traces>
+    </widget>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED_36</name>
+    <pv_name>$(PREFIX):$(DI17):InputVal</pv_name>
+    <x>1560</x>
+    <y>648</y>
+    <square>true</square>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_80</name>
+    <pv_name>$(PREFIX):$(DI17).DESC</pv_name>
+    <x>1380</x>
+    <y>648</y>
+    <width>170</width>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED_37</name>
+    <pv_name>$(PREFIX):$(DI18):InputVal</pv_name>
+    <x>1560</x>
+    <y>675</y>
+    <square>true</square>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_81</name>
+    <pv_name>$(PREFIX):$(DI18).DESC</pv_name>
+    <x>1380</x>
+    <y>675</y>
+    <width>170</width>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED_38</name>
+    <pv_name>$(PREFIX):$(DI19):InputVal</pv_name>
+    <x>1560</x>
+    <y>703</y>
+    <square>true</square>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_82</name>
+    <pv_name>$(PREFIX):$(DI19).DESC</pv_name>
+    <x>1380</x>
+    <y>703</y>
+    <width>170</width>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED_39</name>
+    <pv_name>$(PREFIX):$(DI16):InputVal</pv_name>
+    <x>1560</x>
+    <y>620</y>
+    <square>true</square>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_83</name>
+    <pv_name>$(PREFIX):$(DI16).DESC</pv_name>
+    <x>1380</x>
+    <y>620</y>
+    <width>170</width>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+  </widget>
+  <widget type="group" version="2.0.0">
+    <name>DIGITAL INPUT 20 - LVDS</name>
+    <x>1370</x>
+    <y>868</y>
+    <width>311</width>
+    <height>188</height>
+    <style>1</style>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="16.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
+      </color>
+    </foreground_color>
+    <transparent>true</transparent>
+    <widget type="led" version="2.0.0">
+      <name>LED_40</name>
+      <pv_name>$(PREFIX):$(DI20):InputVal</pv_name>
+      <x>259</x>
+      <y>10</y>
+      <width>49</width>
+      <square>true</square>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>Text Update_84</name>
+      <pv_name>$(PREFIX):$(DI20).DESC</pv_name>
+      <y>10</y>
+      <width>259</width>
+      <horizontal_alignment>2</horizontal_alignment>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
+    </widget>
+    <widget type="xyplot" version="2.0.0">
+      <name>X/Y Plot_20</name>
+      <y>35</y>
+      <width>309</width>
+      <height>130</height>
+      <foreground_color>
+        <color name="Read_Background" red="230" green="235" blue="232">
+        </color>
+      </foreground_color>
+      <background_color>
+        <color name="BLACK" red="0" green="0" blue="0">
+        </color>
+      </background_color>
+      <grid_color>
+        <color red="77" green="77" blue="77">
+        </color>
+      </grid_color>
+      <show_legend>false</show_legend>
+      <x_axis>
+        <title></title>
+        <autoscale>false</autoscale>
+        <log_scale>false</log_scale>
+        <minimum>0.0</minimum>
+        <maximum>8000.0</maximum>
+        <show_grid>true</show_grid>
+        <title_font>
+          <font family="Source Sans Pro" style="BOLD" size="8.0">
+          </font>
+        </title_font>
+        <scale_font>
+          <font family="Source Sans Pro" style="REGULAR" size="8.0">
+          </font>
+        </scale_font>
+        <visible>true</visible>
+      </x_axis>
+      <y_axes>
+        <y_axis>
+          <title></title>
+          <autoscale>false</autoscale>
+          <log_scale>false</log_scale>
+          <minimum>-0.5</minimum>
+          <maximum>1.5</maximum>
+          <show_grid>true</show_grid>
+          <title_font>
+            <font family="Source Sans Pro" style="BOLD" size="8.0">
+            </font>
+          </title_font>
+          <scale_font>
+            <font family="Source Sans Pro" style="REGULAR" size="8.0">
+            </font>
+          </scale_font>
+          <visible>true</visible>
+        </y_axis>
+      </y_axes>
+      <traces>
+        <trace>
+          <name>$(traces[0].y_pv)</name>
+          <x_pv></x_pv>
+          <y_pv>$(PREFIX):$(DI20):Wave</y_pv>
+          <err_pv></err_pv>
+          <axis>0</axis>
+          <trace_type>1</trace_type>
+          <color>
+            <color red="60" green="255" blue="60">
+            </color>
+          </color>
+          <line_width>1</line_width>
+          <line_style>0</line_style>
+          <point_type>0</point_type>
+          <point_size>10</point_size>
+          <visible>true</visible>
+        </trace>
+      </traces>
+    </widget>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED_41</name>
+    <pv_name>$(PREFIX):$(DI20):InputVal</pv_name>
+    <x>1560</x>
+    <y>750</y>
+    <square>true</square>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_85</name>
+    <pv_name>$(PREFIX):$(DI20).DESC</pv_name>
+    <x>1380</x>
+    <y>750</y>
+    <width>170</width>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+  </widget>
+</display>
diff --git a/NON-APPROVED/TS2/ts2-010rfc-rflps/support/iocStats/iocStats.bob b/NON-APPROVED/TS2/ts2-010rfc-rflps/support/iocStats/iocStats.bob
new file mode 100644
index 0000000000000000000000000000000000000000..8ce81031d10ae97e8b10a2719f4a0fc76183ea82
--- /dev/null
+++ b/NON-APPROVED/TS2/ts2-010rfc-rflps/support/iocStats/iocStats.bob
@@ -0,0 +1,340 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<display version="2.0.0">
+  <name>iocStats</name>
+  <width>410</width>
+  <height>240</height>
+  <grid_visible>false</grid_visible>
+  <widget type="group" version="2.0.0">
+    <name>BGGrey02</name>
+    <width>410</width>
+    <height>240</height>
+    <style>3</style>
+    <background_color>
+      <color name="BACKGROUND" red="220" green="225" blue="221">
+      </color>
+    </background_color>
+    <widget type="rectangle" version="2.0.0">
+      <name>BGGrey02-titlebar</name>
+      <width>410</width>
+      <height>59</height>
+      <line_width>0</line_width>
+      <background_color>
+        <color name="GROUP-BORDER" red="150" green="155" blue="151">
+        </color>
+      </background_color>
+      <corner_width>10</corner_width>
+      <corner_height>10</corner_height>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>BGGrey02-title</name>
+      <text>$(IOCNAME)</text>
+      <x>10</x>
+      <width>388</width>
+      <height>30</height>
+      <font>
+        <font name="SUBSUB-GROUP-HEADER" family="Source Sans Pro" style="BOLD" size="16.0">
+        </font>
+      </font>
+      <foreground_color>
+        <color name="TEXT-LIGHT" red="230" green="230" blue="230">
+        </color>
+      </foreground_color>
+      <horizontal_alignment>1</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+    </widget>
+    <widget type="rectangle" version="2.0.0">
+      <name>BGGrey02-background</name>
+      <y>30</y>
+      <width>410</width>
+      <height>210</height>
+      <line_width>2</line_width>
+      <line_color>
+        <color name="GROUP-BORDER" red="150" green="155" blue="151">
+        </color>
+      </line_color>
+      <background_color>
+        <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+        </color>
+      </background_color>
+      <corner_height>10</corner_height>
+    </widget>
+    <widget type="group" version="2.0.0">
+      <name>General_1</name>
+      <x>10</x>
+      <y>40</y>
+      <width>308</width>
+      <height>190</height>
+      <style>3</style>
+      <widget type="label" version="2.0.0">
+        <name>Label_64</name>
+        <text>Up Time</text>
+        <x>9</x>
+        <y>70</y>
+        <width>90</width>
+        <background_color>
+          <color red="255" green="255" blue="255">
+          </color>
+        </background_color>
+        <horizontal_alignment>2</horizontal_alignment>
+        <vertical_alignment>1</vertical_alignment>
+        <actions>
+        </actions>
+        <border_color>
+          <color red="0" green="128" blue="255">
+          </color>
+        </border_color>
+      </widget>
+      <widget type="label" version="2.0.0">
+        <name>Label_68</name>
+        <text>Host Name</text>
+        <x>9</x>
+        <y>100</y>
+        <width>90</width>
+        <background_color>
+          <color red="255" green="255" blue="255">
+          </color>
+        </background_color>
+        <horizontal_alignment>2</horizontal_alignment>
+        <vertical_alignment>1</vertical_alignment>
+        <actions>
+        </actions>
+        <border_color>
+          <color red="0" green="128" blue="255">
+          </color>
+        </border_color>
+      </widget>
+      <widget type="label" version="2.0.0">
+        <name>Label_69</name>
+        <text>User Name</text>
+        <x>9</x>
+        <y>130</y>
+        <width>90</width>
+        <background_color>
+          <color red="255" green="255" blue="255">
+          </color>
+        </background_color>
+        <horizontal_alignment>2</horizontal_alignment>
+        <vertical_alignment>1</vertical_alignment>
+        <actions>
+        </actions>
+        <border_color>
+          <color red="0" green="128" blue="255">
+          </color>
+        </border_color>
+      </widget>
+      <widget type="label" version="2.0.0">
+        <name>Label_70</name>
+        <text>Location</text>
+        <x>9</x>
+        <y>160</y>
+        <width>90</width>
+        <background_color>
+          <color red="255" green="255" blue="255">
+          </color>
+        </background_color>
+        <horizontal_alignment>2</horizontal_alignment>
+        <vertical_alignment>1</vertical_alignment>
+        <actions>
+        </actions>
+        <border_color>
+          <color red="0" green="128" blue="255">
+          </color>
+        </border_color>
+      </widget>
+      <widget type="textupdate" version="2.0.0">
+        <name>Text Update_62</name>
+        <pv_name>$(IOCNAME):STARTTOD</pv_name>
+        <x>109</x>
+        <y>40</y>
+        <width>190</width>
+        <format>1</format>
+        <show_units>false</show_units>
+        <vertical_alignment>1</vertical_alignment>
+        <wrap_words>false</wrap_words>
+        <actions>
+        </actions>
+        <border_color>
+          <color red="0" green="128" blue="255">
+          </color>
+        </border_color>
+      </widget>
+      <widget type="textupdate" version="2.0.0">
+        <name>Text Update_69</name>
+        <pv_name>$(IOCNAME):HOSTNAME</pv_name>
+        <x>109</x>
+        <y>100</y>
+        <width>190</width>
+        <format>1</format>
+        <show_units>false</show_units>
+        <vertical_alignment>1</vertical_alignment>
+        <wrap_words>false</wrap_words>
+        <actions>
+        </actions>
+        <border_color>
+          <color red="0" green="128" blue="255">
+          </color>
+        </border_color>
+      </widget>
+      <widget type="textupdate" version="2.0.0">
+        <name>Text Update_70</name>
+        <pv_name>$(IOCNAME):ENGINEER</pv_name>
+        <x>109</x>
+        <y>130</y>
+        <width>190</width>
+        <format>1</format>
+        <show_units>false</show_units>
+        <vertical_alignment>1</vertical_alignment>
+        <wrap_words>false</wrap_words>
+        <actions>
+        </actions>
+        <border_color>
+          <color red="0" green="128" blue="255">
+          </color>
+        </border_color>
+      </widget>
+      <widget type="textupdate" version="2.0.0">
+        <name>Text Update_71</name>
+        <pv_name>$(IOCNAME):LOCATION</pv_name>
+        <x>109</x>
+        <y>160</y>
+        <width>190</width>
+        <format>1</format>
+        <show_units>false</show_units>
+        <vertical_alignment>1</vertical_alignment>
+        <wrap_words>false</wrap_words>
+        <actions>
+        </actions>
+        <border_color>
+          <color red="0" green="128" blue="255">
+          </color>
+        </border_color>
+      </widget>
+      <widget type="textupdate" version="2.0.0">
+        <name>Text Update_72</name>
+        <pv_name>$(IOCNAME):HEARTBEAT</pv_name>
+        <x>109</x>
+        <y>10</y>
+        <width>140</width>
+        <format>1</format>
+        <show_units>false</show_units>
+        <vertical_alignment>1</vertical_alignment>
+        <wrap_words>false</wrap_words>
+        <actions>
+        </actions>
+        <border_color>
+          <color red="0" green="128" blue="255">
+          </color>
+        </border_color>
+      </widget>
+      <widget type="label" version="2.0.0">
+        <name>Label_71</name>
+        <text>Heartbeat</text>
+        <x>9</x>
+        <y>10</y>
+        <width>90</width>
+        <background_color>
+          <color red="255" green="255" blue="255">
+          </color>
+        </background_color>
+        <horizontal_alignment>2</horizontal_alignment>
+        <vertical_alignment>1</vertical_alignment>
+        <actions>
+        </actions>
+        <border_color>
+          <color red="0" green="128" blue="255">
+          </color>
+        </border_color>
+      </widget>
+      <widget type="textupdate" version="2.0.0">
+        <name>Text Update_73</name>
+        <pv_name>$(IOCNAME):UPTIME</pv_name>
+        <x>109</x>
+        <y>70</y>
+        <width>190</width>
+        <format>1</format>
+        <show_units>false</show_units>
+        <vertical_alignment>1</vertical_alignment>
+        <wrap_words>false</wrap_words>
+        <actions>
+        </actions>
+        <border_color>
+          <color red="0" green="128" blue="255">
+          </color>
+        </border_color>
+      </widget>
+      <widget type="label" version="2.0.0">
+        <name>Label_72</name>
+        <text>Startup Time</text>
+        <x>9</x>
+        <y>40</y>
+        <width>90</width>
+        <background_color>
+          <color red="255" green="255" blue="255">
+          </color>
+        </background_color>
+        <horizontal_alignment>2</horizontal_alignment>
+        <vertical_alignment>1</vertical_alignment>
+        <actions>
+        </actions>
+        <border_color>
+          <color red="0" green="128" blue="255">
+          </color>
+        </border_color>
+      </widget>
+      <widget type="led" version="2.0.0">
+        <name>LED (Multi State)_1</name>
+        <pv_name>$(IOCNAME):HEARTBEAT</pv_name>
+        <bit>0</bit>
+        <x>279</x>
+        <y>10</y>
+      </widget>
+    </widget>
+    <widget type="group" version="2.0.0">
+      <name>BGGrey02-content-group</name>
+      <x>318</x>
+      <y>40</y>
+      <width>85</width>
+      <height>191</height>
+      <style>3</style>
+      <transparent>true</transparent>
+      <widget type="action_button" version="3.0.0">
+        <name>Action Button_7</name>
+        <actions>
+          <action type="open_display">
+            <file>ioc_stats_soft.bob</file>
+            <target>tab</target>
+            <description>Open Display</description>
+          </action>
+        </actions>
+        <text>System</text>
+        <x>5</x>
+        <width>80</width>
+        <tooltip>$(actions)</tooltip>
+      </widget>
+      <widget type="action_button" version="3.0.0">
+        <name>Action Button_9</name>
+        <actions>
+          <action type="write_pv">
+            <pv_name>$(IOCNAME):SysReset</pv_name>
+            <value>1</value>
+            <description>Reset IOC</description>
+          </action>
+        </actions>
+        <x>5</x>
+        <y>40</y>
+        <width>80</width>
+        <font>
+          <font family="Source Sans Pro" style="BOLD" size="16.0">
+          </font>
+        </font>
+        <background_color>
+          <color name="SECONDARY-LIGHT" red="202" green="151" blue="152">
+          </color>
+        </background_color>
+        <tooltip>$(actions)</tooltip>
+        <show_confirm_dialog>true</show_confirm_dialog>
+        <password>vaha23neca</password>
+      </widget>
+    </widget>
+  </widget>
+</display>
diff --git a/NON-APPROVED/TS2/ts2-010rfc-rflps/support/iocStats/ioc_stats_epics_env.bob b/NON-APPROVED/TS2/ts2-010rfc-rflps/support/iocStats/ioc_stats_epics_env.bob
new file mode 100644
index 0000000000000000000000000000000000000000..23ed60a0c2da62f6544df19099fc72af6747005f
--- /dev/null
+++ b/NON-APPROVED/TS2/ts2-010rfc-rflps/support/iocStats/ioc_stats_epics_env.bob
@@ -0,0 +1,631 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<display version="2.0.0">
+  <name>ioc_stats_epics_env</name>
+  <x>1126</x>
+  <y>181</y>
+  <width>540</width>
+  <height>330</height>
+  <actions>
+  </actions>
+  <widget type="group" version="2.0.0">
+    <name>BGGrey02</name>
+    <width>540</width>
+    <height>330</height>
+    <style>3</style>
+    <background_color>
+      <color name="BACKGROUND" red="220" green="225" blue="221">
+      </color>
+    </background_color>
+    <widget type="rectangle" version="2.0.0">
+      <name>BGGrey02-titlebar</name>
+      <width>540</width>
+      <height>59</height>
+      <line_width>0</line_width>
+      <background_color>
+        <color name="GROUP-BORDER" red="150" green="155" blue="151">
+        </color>
+      </background_color>
+      <corner_width>10</corner_width>
+      <corner_height>10</corner_height>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>BGGrey02-title</name>
+      <text>| Click to edit Title |</text>
+      <width>540</width>
+      <height>30</height>
+      <font>
+        <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
+        </font>
+      </font>
+      <horizontal_alignment>1</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+    </widget>
+    <widget type="rectangle" version="2.0.0">
+      <name>BGGrey02-background</name>
+      <y>30</y>
+      <width>540</width>
+      <height>300</height>
+      <line_width>2</line_width>
+      <line_color>
+        <color name="GROUP-BORDER" red="150" green="155" blue="151">
+        </color>
+      </line_color>
+      <background_color>
+        <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+        </color>
+      </background_color>
+      <corner_height>10</corner_height>
+    </widget>
+    <widget type="group" version="2.0.0">
+      <name>BGGrey02-content-group</name>
+      <x>10</x>
+      <y>40</y>
+      <width>520</width>
+      <height>280</height>
+      <style>3</style>
+      <transparent>true</transparent>
+      <widget type="label" version="2.0.0">
+        <name>Label</name>
+        <text>EPICS Environment Variables $(IOCNAME):</text>
+        <x>5</x>
+        <width>450</width>
+        <height>30</height>
+        <font>
+          <font family="Sans" style="REGULAR" size="23.762376237623762">
+          </font>
+        </font>
+        <background_color>
+          <color red="255" green="255" blue="255">
+          </color>
+        </background_color>
+        <vertical_alignment>1</vertical_alignment>
+        <actions>
+        </actions>
+        <border_color>
+          <color red="0" green="128" blue="255">
+          </color>
+        </border_color>
+      </widget>
+      <widget type="label" version="2.0.0">
+        <name>Label</name>
+        <text>EPICS_CA_SERVER_PORT</text>
+        <y>40</y>
+        <width>185</width>
+        <height>15</height>
+        <font>
+          <font family="Sans" style="REGULAR" size="8.910891089108912">
+          </font>
+        </font>
+        <background_color>
+          <color red="255" green="255" blue="255">
+          </color>
+        </background_color>
+        <horizontal_alignment>2</horizontal_alignment>
+        <vertical_alignment>1</vertical_alignment>
+        <actions>
+        </actions>
+        <border_color>
+          <color red="0" green="128" blue="255">
+          </color>
+        </border_color>
+      </widget>
+      <widget type="label" version="2.0.0">
+        <name>Label</name>
+        <text>EPICS_CA_REPEATER_PORT</text>
+        <y>60</y>
+        <width>185</width>
+        <height>15</height>
+        <font>
+          <font family="Sans" style="REGULAR" size="8.910891089108912">
+          </font>
+        </font>
+        <background_color>
+          <color red="255" green="255" blue="255">
+          </color>
+        </background_color>
+        <horizontal_alignment>2</horizontal_alignment>
+        <vertical_alignment>1</vertical_alignment>
+        <actions>
+        </actions>
+        <border_color>
+          <color red="0" green="128" blue="255">
+          </color>
+        </border_color>
+      </widget>
+      <widget type="label" version="2.0.0">
+        <name>Label</name>
+        <text>EPICS_CA_ADDR_LIST</text>
+        <y>80</y>
+        <width>185</width>
+        <height>15</height>
+        <font>
+          <font family="Sans" style="REGULAR" size="8.910891089108912">
+          </font>
+        </font>
+        <background_color>
+          <color red="255" green="255" blue="255">
+          </color>
+        </background_color>
+        <horizontal_alignment>2</horizontal_alignment>
+        <vertical_alignment>1</vertical_alignment>
+        <actions>
+        </actions>
+        <border_color>
+          <color red="0" green="128" blue="255">
+          </color>
+        </border_color>
+      </widget>
+      <widget type="label" version="2.0.0">
+        <name>Label</name>
+        <text>EPICS_CA_AUTO_ADDR_LIST</text>
+        <y>100</y>
+        <width>185</width>
+        <height>15</height>
+        <font>
+          <font family="Sans" style="REGULAR" size="8.910891089108912">
+          </font>
+        </font>
+        <background_color>
+          <color red="255" green="255" blue="255">
+          </color>
+        </background_color>
+        <horizontal_alignment>2</horizontal_alignment>
+        <vertical_alignment>1</vertical_alignment>
+        <actions>
+        </actions>
+        <border_color>
+          <color red="0" green="128" blue="255">
+          </color>
+        </border_color>
+      </widget>
+      <widget type="label" version="2.0.0">
+        <name>Label</name>
+        <text>EPICS_CA_MAX_ARRAY_BYTES</text>
+        <y>120</y>
+        <width>185</width>
+        <height>15</height>
+        <font>
+          <font family="Sans" style="REGULAR" size="8.910891089108912">
+          </font>
+        </font>
+        <background_color>
+          <color red="255" green="255" blue="255">
+          </color>
+        </background_color>
+        <horizontal_alignment>2</horizontal_alignment>
+        <vertical_alignment>1</vertical_alignment>
+        <actions>
+        </actions>
+        <border_color>
+          <color red="0" green="128" blue="255">
+          </color>
+        </border_color>
+      </widget>
+      <widget type="label" version="2.0.0">
+        <name>Label</name>
+        <text>EPICS_CA_CONN_TMO (sec)</text>
+        <y>140</y>
+        <width>185</width>
+        <height>15</height>
+        <font>
+          <font family="Sans" style="REGULAR" size="8.910891089108912">
+          </font>
+        </font>
+        <background_color>
+          <color red="255" green="255" blue="255">
+          </color>
+        </background_color>
+        <horizontal_alignment>2</horizontal_alignment>
+        <vertical_alignment>1</vertical_alignment>
+        <actions>
+        </actions>
+        <border_color>
+          <color red="0" green="128" blue="255">
+          </color>
+        </border_color>
+      </widget>
+      <widget type="label" version="2.0.0">
+        <name>Label</name>
+        <text>EPICS_CA_MAX_SEARCH_PERIOD (sec)</text>
+        <y>160</y>
+        <width>185</width>
+        <height>15</height>
+        <font>
+          <font family="Sans" style="REGULAR" size="8.910891089108912">
+          </font>
+        </font>
+        <background_color>
+          <color red="255" green="255" blue="255">
+          </color>
+        </background_color>
+        <horizontal_alignment>2</horizontal_alignment>
+        <vertical_alignment>1</vertical_alignment>
+        <actions>
+        </actions>
+        <border_color>
+          <color red="0" green="128" blue="255">
+          </color>
+        </border_color>
+      </widget>
+      <widget type="label" version="2.0.0">
+        <name>Label</name>
+        <text>EPICS_CA_BEACON_PERIOD (sec)</text>
+        <y>180</y>
+        <width>185</width>
+        <height>15</height>
+        <font>
+          <font family="Sans" style="REGULAR" size="8.910891089108912">
+          </font>
+        </font>
+        <background_color>
+          <color red="255" green="255" blue="255">
+          </color>
+        </background_color>
+        <horizontal_alignment>2</horizontal_alignment>
+        <vertical_alignment>1</vertical_alignment>
+        <actions>
+        </actions>
+        <border_color>
+          <color red="0" green="128" blue="255">
+          </color>
+        </border_color>
+      </widget>
+      <widget type="label" version="2.0.0">
+        <name>Label</name>
+        <text>EPICS_TIMEZONE</text>
+        <y>200</y>
+        <width>185</width>
+        <height>15</height>
+        <font>
+          <font family="Sans" style="REGULAR" size="8.910891089108912">
+          </font>
+        </font>
+        <background_color>
+          <color red="255" green="255" blue="255">
+          </color>
+        </background_color>
+        <horizontal_alignment>2</horizontal_alignment>
+        <vertical_alignment>1</vertical_alignment>
+        <actions>
+        </actions>
+        <border_color>
+          <color red="0" green="128" blue="255">
+          </color>
+        </border_color>
+      </widget>
+      <widget type="label" version="2.0.0">
+        <name>Label</name>
+        <text>EPICS_TS_NTP_INET</text>
+        <y>220</y>
+        <width>185</width>
+        <height>15</height>
+        <font>
+          <font family="Sans" style="REGULAR" size="8.910891089108912">
+          </font>
+        </font>
+        <background_color>
+          <color red="255" green="255" blue="255">
+          </color>
+        </background_color>
+        <horizontal_alignment>2</horizontal_alignment>
+        <vertical_alignment>1</vertical_alignment>
+        <actions>
+        </actions>
+        <border_color>
+          <color red="0" green="128" blue="255">
+          </color>
+        </border_color>
+      </widget>
+      <widget type="label" version="2.0.0">
+        <name>Label</name>
+        <text>EPICS_IOC_LOG_PORT</text>
+        <y>240</y>
+        <width>185</width>
+        <height>15</height>
+        <font>
+          <font family="Sans" style="REGULAR" size="8.910891089108912">
+          </font>
+        </font>
+        <background_color>
+          <color red="255" green="255" blue="255">
+          </color>
+        </background_color>
+        <horizontal_alignment>2</horizontal_alignment>
+        <vertical_alignment>1</vertical_alignment>
+        <actions>
+        </actions>
+        <border_color>
+          <color red="0" green="128" blue="255">
+          </color>
+        </border_color>
+      </widget>
+      <widget type="label" version="2.0.0">
+        <name>Label</name>
+        <text>EPICS_IOC_LOG_INET</text>
+        <y>260</y>
+        <width>185</width>
+        <height>15</height>
+        <font>
+          <font family="Sans" style="REGULAR" size="8.910891089108912">
+          </font>
+        </font>
+        <background_color>
+          <color red="255" green="255" blue="255">
+          </color>
+        </background_color>
+        <horizontal_alignment>2</horizontal_alignment>
+        <vertical_alignment>1</vertical_alignment>
+        <actions>
+        </actions>
+        <border_color>
+          <color red="0" green="128" blue="255">
+          </color>
+        </border_color>
+      </widget>
+      <widget type="textupdate" version="2.0.0">
+        <name>Text Update</name>
+        <pv_name>$(IOCNAME):CA_SRVR_PORT</pv_name>
+        <x>195</x>
+        <y>40</y>
+        <width>320</width>
+        <height>15</height>
+        <font>
+          <font family="Sans" style="REGULAR" size="8.910891089108912">
+          </font>
+        </font>
+        <format>1</format>
+        <show_units>false</show_units>
+        <vertical_alignment>1</vertical_alignment>
+        <wrap_words>false</wrap_words>
+        <actions>
+        </actions>
+        <border_color>
+          <color red="0" green="128" blue="255">
+          </color>
+        </border_color>
+      </widget>
+      <widget type="textupdate" version="2.0.0">
+        <name>Text Update</name>
+        <pv_name>$(IOCNAME):CA_RPTR_PORT</pv_name>
+        <x>195</x>
+        <y>60</y>
+        <width>320</width>
+        <height>15</height>
+        <font>
+          <font family="Sans" style="REGULAR" size="8.910891089108912">
+          </font>
+        </font>
+        <format>1</format>
+        <show_units>false</show_units>
+        <vertical_alignment>1</vertical_alignment>
+        <wrap_words>false</wrap_words>
+        <actions>
+        </actions>
+        <border_color>
+          <color red="0" green="128" blue="255">
+          </color>
+        </border_color>
+      </widget>
+      <widget type="textupdate" version="2.0.0">
+        <name>Text Update</name>
+        <pv_name>$(IOCNAME):CA_ADDR_LIST</pv_name>
+        <x>195</x>
+        <y>80</y>
+        <width>320</width>
+        <height>15</height>
+        <font>
+          <font family="Sans" style="REGULAR" size="8.910891089108912">
+          </font>
+        </font>
+        <format>1</format>
+        <show_units>false</show_units>
+        <vertical_alignment>1</vertical_alignment>
+        <wrap_words>false</wrap_words>
+        <actions>
+        </actions>
+        <border_color>
+          <color red="0" green="128" blue="255">
+          </color>
+        </border_color>
+      </widget>
+      <widget type="textupdate" version="2.0.0">
+        <name>Text Update</name>
+        <pv_name>$(IOCNAME):CA_AUTO_ADDR</pv_name>
+        <x>195</x>
+        <y>100</y>
+        <width>320</width>
+        <height>15</height>
+        <font>
+          <font family="Sans" style="REGULAR" size="8.910891089108912">
+          </font>
+        </font>
+        <format>1</format>
+        <show_units>false</show_units>
+        <vertical_alignment>1</vertical_alignment>
+        <wrap_words>false</wrap_words>
+        <actions>
+        </actions>
+        <border_color>
+          <color red="0" green="128" blue="255">
+          </color>
+        </border_color>
+      </widget>
+      <widget type="textupdate" version="2.0.0">
+        <name>Text Update</name>
+        <pv_name>$(IOCNAME):CA_MAX_ARRAY</pv_name>
+        <x>195</x>
+        <y>120</y>
+        <width>320</width>
+        <height>15</height>
+        <font>
+          <font family="Sans" style="REGULAR" size="8.910891089108912">
+          </font>
+        </font>
+        <format>1</format>
+        <show_units>false</show_units>
+        <vertical_alignment>1</vertical_alignment>
+        <wrap_words>false</wrap_words>
+        <actions>
+        </actions>
+        <border_color>
+          <color red="0" green="128" blue="255">
+          </color>
+        </border_color>
+      </widget>
+      <widget type="textupdate" version="2.0.0">
+        <name>Text Update</name>
+        <pv_name>$(IOCNAME):CA_CONN_TIME</pv_name>
+        <x>195</x>
+        <y>140</y>
+        <width>320</width>
+        <height>15</height>
+        <font>
+          <font family="Sans" style="REGULAR" size="8.910891089108912">
+          </font>
+        </font>
+        <format>1</format>
+        <show_units>false</show_units>
+        <vertical_alignment>1</vertical_alignment>
+        <wrap_words>false</wrap_words>
+        <actions>
+        </actions>
+        <border_color>
+          <color red="0" green="128" blue="255">
+          </color>
+        </border_color>
+      </widget>
+      <widget type="textupdate" version="2.0.0">
+        <name>Text Update</name>
+        <pv_name>$(IOCNAME):CA_SRCH_TIME</pv_name>
+        <x>195</x>
+        <y>160</y>
+        <width>320</width>
+        <height>15</height>
+        <font>
+          <font family="Sans" style="REGULAR" size="8.910891089108912">
+          </font>
+        </font>
+        <format>1</format>
+        <show_units>false</show_units>
+        <vertical_alignment>1</vertical_alignment>
+        <wrap_words>false</wrap_words>
+        <actions>
+        </actions>
+        <border_color>
+          <color red="0" green="128" blue="255">
+          </color>
+        </border_color>
+      </widget>
+      <widget type="textupdate" version="2.0.0">
+        <name>Text Update</name>
+        <pv_name>$(IOCNAME):CA_BEAC_TIME</pv_name>
+        <x>195</x>
+        <y>180</y>
+        <width>320</width>
+        <height>15</height>
+        <font>
+          <font family="Sans" style="REGULAR" size="8.910891089108912">
+          </font>
+        </font>
+        <format>1</format>
+        <show_units>false</show_units>
+        <vertical_alignment>1</vertical_alignment>
+        <wrap_words>false</wrap_words>
+        <actions>
+        </actions>
+        <border_color>
+          <color red="0" green="128" blue="255">
+          </color>
+        </border_color>
+      </widget>
+      <widget type="textupdate" version="2.0.0">
+        <name>Text Update</name>
+        <pv_name>$(IOCNAME):TIMEZONE</pv_name>
+        <x>195</x>
+        <y>200</y>
+        <width>320</width>
+        <height>15</height>
+        <font>
+          <font family="Sans" style="REGULAR" size="8.910891089108912">
+          </font>
+        </font>
+        <format>1</format>
+        <show_units>false</show_units>
+        <vertical_alignment>1</vertical_alignment>
+        <wrap_words>false</wrap_words>
+        <actions>
+        </actions>
+        <border_color>
+          <color red="0" green="128" blue="255">
+          </color>
+        </border_color>
+      </widget>
+      <widget type="textupdate" version="2.0.0">
+        <name>Text Update</name>
+        <pv_name>$(IOCNAME):TS_NTP_INET</pv_name>
+        <x>195</x>
+        <y>220</y>
+        <width>320</width>
+        <height>15</height>
+        <font>
+          <font family="Sans" style="REGULAR" size="8.910891089108912">
+          </font>
+        </font>
+        <format>1</format>
+        <show_units>false</show_units>
+        <vertical_alignment>1</vertical_alignment>
+        <wrap_words>false</wrap_words>
+        <actions>
+        </actions>
+        <border_color>
+          <color red="0" green="128" blue="255">
+          </color>
+        </border_color>
+      </widget>
+      <widget type="textupdate" version="2.0.0">
+        <name>Text Update</name>
+        <pv_name>$(IOCNAME):IOC_LOG_PORT</pv_name>
+        <x>195</x>
+        <y>240</y>
+        <width>320</width>
+        <height>15</height>
+        <font>
+          <font family="Sans" style="REGULAR" size="8.910891089108912">
+          </font>
+        </font>
+        <format>1</format>
+        <show_units>false</show_units>
+        <vertical_alignment>1</vertical_alignment>
+        <wrap_words>false</wrap_words>
+        <actions>
+        </actions>
+        <border_color>
+          <color red="0" green="128" blue="255">
+          </color>
+        </border_color>
+      </widget>
+      <widget type="textupdate" version="2.0.0">
+        <name>Text Update</name>
+        <pv_name>$(IOCNAME):IOC_LOG_INET</pv_name>
+        <x>195</x>
+        <y>260</y>
+        <width>320</width>
+        <height>15</height>
+        <font>
+          <font family="Sans" style="REGULAR" size="8.910891089108912">
+          </font>
+        </font>
+        <format>1</format>
+        <show_units>false</show_units>
+        <vertical_alignment>1</vertical_alignment>
+        <wrap_words>false</wrap_words>
+        <actions>
+        </actions>
+        <border_color>
+          <color red="0" green="128" blue="255">
+          </color>
+        </border_color>
+      </widget>
+    </widget>
+  </widget>
+</display>
diff --git a/NON-APPROVED/TS2/ts2-010rfc-rflps/support/iocStats/ioc_stats_limits.bob b/NON-APPROVED/TS2/ts2-010rfc-rflps/support/iocStats/ioc_stats_limits.bob
new file mode 100644
index 0000000000000000000000000000000000000000..688fe1d8e658d2b34b509b9eeb9f7eea8469204f
--- /dev/null
+++ b/NON-APPROVED/TS2/ts2-010rfc-rflps/support/iocStats/ioc_stats_limits.bob
@@ -0,0 +1,540 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<display version="2.0.0">
+  <name>ioc_stats_limits</name>
+  <x>1090</x>
+  <y>60</y>
+  <width>340</width>
+  <height>240</height>
+  <actions>
+  </actions>
+  <widget type="group" version="2.0.0">
+    <name>BGGrey02</name>
+    <width>340</width>
+    <height>240</height>
+    <style>3</style>
+    <background_color>
+      <color name="BACKGROUND" red="220" green="225" blue="221">
+      </color>
+    </background_color>
+    <widget type="rectangle" version="2.0.0">
+      <name>BGGrey02-titlebar</name>
+      <width>341</width>
+      <height>59</height>
+      <line_width>0</line_width>
+      <background_color>
+        <color name="GROUP-BORDER" red="150" green="155" blue="151">
+        </color>
+      </background_color>
+      <corner_width>10</corner_width>
+      <corner_height>10</corner_height>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>BGGrey02-title</name>
+      <text>IOC Alarm Limits $(IOCNAME)</text>
+      <width>341</width>
+      <height>30</height>
+      <font>
+        <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
+        </font>
+      </font>
+      <horizontal_alignment>1</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+    </widget>
+    <widget type="rectangle" version="2.0.0">
+      <name>BGGrey02-background</name>
+      <y>30</y>
+      <width>341</width>
+      <height>210</height>
+      <line_width>2</line_width>
+      <line_color>
+        <color name="GROUP-BORDER" red="150" green="155" blue="151">
+        </color>
+      </line_color>
+      <background_color>
+        <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+        </color>
+      </background_color>
+      <corner_height>10</corner_height>
+    </widget>
+    <widget type="group" version="2.0.0">
+      <name>BGGrey02-content-group</name>
+      <x>10</x>
+      <y>40</y>
+      <width>331</width>
+      <style>3</style>
+      <transparent>true</transparent>
+      <widget type="label" version="2.0.0">
+        <name>Label</name>
+        <text># CA Clients</text>
+        <y>27</y>
+        <width>89</width>
+        <height>15</height>
+        <background_color>
+          <color red="255" green="255" blue="255">
+          </color>
+        </background_color>
+        <vertical_alignment>1</vertical_alignment>
+        <actions>
+        </actions>
+        <border_color>
+          <color red="0" green="128" blue="255">
+          </color>
+        </border_color>
+      </widget>
+      <widget type="label" version="2.0.0">
+        <name>Label</name>
+        <text># CA PV Conns</text>
+        <y>57</y>
+        <width>89</width>
+        <height>15</height>
+        <background_color>
+          <color red="255" green="255" blue="255">
+          </color>
+        </background_color>
+        <vertical_alignment>1</vertical_alignment>
+        <actions>
+        </actions>
+        <border_color>
+          <color red="0" green="128" blue="255">
+          </color>
+        </border_color>
+      </widget>
+      <widget type="label" version="2.0.0">
+        <name>Label</name>
+        <text># Susp Tasks</text>
+        <y>87</y>
+        <width>89</width>
+        <height>15</height>
+        <background_color>
+          <color red="255" green="255" blue="255">
+          </color>
+        </background_color>
+        <vertical_alignment>1</vertical_alignment>
+        <actions>
+        </actions>
+        <border_color>
+          <color red="0" green="128" blue="255">
+          </color>
+        </border_color>
+      </widget>
+      <widget type="label" version="2.0.0">
+        <name>Label</name>
+        <text>LOLO</text>
+        <x>201</x>
+        <y>142</y>
+        <width>50</width>
+        <height>15</height>
+        <background_color>
+          <color red="255" green="255" blue="255">
+          </color>
+        </background_color>
+        <horizontal_alignment>1</horizontal_alignment>
+        <vertical_alignment>1</vertical_alignment>
+        <actions>
+        </actions>
+        <border_color>
+          <color red="0" green="128" blue="255">
+          </color>
+        </border_color>
+      </widget>
+      <widget type="label" version="2.0.0">
+        <name>Label</name>
+        <text>LOW</text>
+        <x>264</x>
+        <y>142</y>
+        <width>50</width>
+        <height>15</height>
+        <background_color>
+          <color red="255" green="255" blue="255">
+          </color>
+        </background_color>
+        <horizontal_alignment>1</horizontal_alignment>
+        <vertical_alignment>1</vertical_alignment>
+        <actions>
+        </actions>
+        <border_color>
+          <color red="0" green="128" blue="255">
+          </color>
+        </border_color>
+      </widget>
+      <widget type="label" version="2.0.0">
+        <name>Label</name>
+        <text>Value</text>
+        <x>116</x>
+        <width>50</width>
+        <height>15</height>
+        <background_color>
+          <color red="255" green="255" blue="255">
+          </color>
+        </background_color>
+        <horizontal_alignment>1</horizontal_alignment>
+        <vertical_alignment>1</vertical_alignment>
+        <actions>
+        </actions>
+        <border_color>
+          <color red="0" green="128" blue="255">
+          </color>
+        </border_color>
+      </widget>
+      <widget type="label" version="2.0.0">
+        <name>Label</name>
+        <text>HIGH</text>
+        <x>203</x>
+        <width>50</width>
+        <height>15</height>
+        <background_color>
+          <color red="255" green="255" blue="255">
+          </color>
+        </background_color>
+        <horizontal_alignment>1</horizontal_alignment>
+        <vertical_alignment>1</vertical_alignment>
+        <actions>
+        </actions>
+        <border_color>
+          <color red="0" green="128" blue="255">
+          </color>
+        </border_color>
+      </widget>
+      <widget type="label" version="2.0.0">
+        <name>Label</name>
+        <text>HIHI</text>
+        <x>266</x>
+        <width>50</width>
+        <height>15</height>
+        <background_color>
+          <color red="255" green="255" blue="255">
+          </color>
+        </background_color>
+        <horizontal_alignment>1</horizontal_alignment>
+        <vertical_alignment>1</vertical_alignment>
+        <actions>
+        </actions>
+        <border_color>
+          <color red="0" green="128" blue="255">
+          </color>
+        </border_color>
+      </widget>
+      <widget type="textupdate" version="2.0.0">
+        <name>Text Update</name>
+        <pv_name>$(IOCNAME):CA_CLNT_CNT</pv_name>
+        <x>91</x>
+        <y>24</y>
+        <font>
+          <font family="Sans" style="REGULAR" size="13.861386138613861">
+          </font>
+        </font>
+        <format>1</format>
+        <show_units>false</show_units>
+        <horizontal_alignment>1</horizontal_alignment>
+        <vertical_alignment>1</vertical_alignment>
+        <wrap_words>false</wrap_words>
+        <actions>
+        </actions>
+        <border_color>
+          <color red="0" green="128" blue="255">
+          </color>
+        </border_color>
+      </widget>
+      <widget type="textupdate" version="2.0.0">
+        <name>Text Update</name>
+        <pv_name>$(IOCNAME):CA_CONN_CNT</pv_name>
+        <x>91</x>
+        <y>54</y>
+        <font>
+          <font family="Sans" style="REGULAR" size="13.861386138613861">
+          </font>
+        </font>
+        <format>1</format>
+        <show_units>false</show_units>
+        <horizontal_alignment>1</horizontal_alignment>
+        <vertical_alignment>1</vertical_alignment>
+        <wrap_words>false</wrap_words>
+        <actions>
+        </actions>
+        <border_color>
+          <color red="0" green="128" blue="255">
+          </color>
+        </border_color>
+      </widget>
+      <widget type="textupdate" version="2.0.0">
+        <name>Text Update</name>
+        <pv_name>$(IOCNAME):SUSP_TASK_CNT</pv_name>
+        <x>91</x>
+        <y>84</y>
+        <font>
+          <font family="Sans" style="REGULAR" size="13.861386138613861">
+          </font>
+        </font>
+        <format>1</format>
+        <show_units>false</show_units>
+        <horizontal_alignment>1</horizontal_alignment>
+        <vertical_alignment>1</vertical_alignment>
+        <wrap_words>false</wrap_words>
+        <actions>
+        </actions>
+        <border_color>
+          <color red="0" green="128" blue="255">
+          </color>
+        </border_color>
+      </widget>
+      <widget type="label" version="2.0.0">
+        <name>Label</name>
+        <text># Free FDs</text>
+        <y>170</y>
+        <width>89</width>
+        <height>15</height>
+        <background_color>
+          <color red="255" green="255" blue="255">
+          </color>
+        </background_color>
+        <vertical_alignment>1</vertical_alignment>
+        <actions>
+        </actions>
+        <border_color>
+          <color red="0" green="128" blue="255">
+          </color>
+        </border_color>
+      </widget>
+      <widget type="textupdate" version="2.0.0">
+        <name>Text Update</name>
+        <pv_name>$(IOCNAME):FD_FREE</pv_name>
+        <x>91</x>
+        <y>167</y>
+        <font>
+          <font family="Sans" style="REGULAR" size="13.861386138613861">
+          </font>
+        </font>
+        <format>1</format>
+        <show_units>false</show_units>
+        <horizontal_alignment>1</horizontal_alignment>
+        <vertical_alignment>1</vertical_alignment>
+        <wrap_words>false</wrap_words>
+        <actions>
+        </actions>
+        <border_color>
+          <color red="0" green="128" blue="255">
+          </color>
+        </border_color>
+      </widget>
+      <widget type="label" version="2.0.0">
+        <name>Label</name>
+        <text>CPU Load (%)</text>
+        <y>117</y>
+        <width>69</width>
+        <height>15</height>
+        <background_color>
+          <color red="255" green="255" blue="255">
+          </color>
+        </background_color>
+        <vertical_alignment>1</vertical_alignment>
+        <actions>
+        </actions>
+        <border_color>
+          <color red="0" green="128" blue="255">
+          </color>
+        </border_color>
+      </widget>
+      <widget type="textupdate" version="2.0.0">
+        <name>Text Update</name>
+        <pv_name>$(IOCNAME):IOC_CPU_LOAD</pv_name>
+        <x>91</x>
+        <y>114</y>
+        <font>
+          <font family="Sans" style="REGULAR" size="13.861386138613861">
+          </font>
+        </font>
+        <format>1</format>
+        <show_units>false</show_units>
+        <horizontal_alignment>1</horizontal_alignment>
+        <vertical_alignment>1</vertical_alignment>
+        <wrap_words>false</wrap_words>
+        <actions>
+        </actions>
+        <border_color>
+          <color red="0" green="128" blue="255">
+          </color>
+        </border_color>
+      </widget>
+      <widget type="textentry" version="3.0.0">
+        <name>Text Input</name>
+        <pv_name>$(IOCNAME):CA_CLNT_CNT.HIGH</pv_name>
+        <x>201</x>
+        <y>24</y>
+        <width>56</width>
+        <font>
+          <font family="Sans" style="REGULAR" size="13.861386138613861">
+          </font>
+        </font>
+        <format>1</format>
+        <show_units>false</show_units>
+        <actions>
+        </actions>
+        <border_alarm_sensitive>false</border_alarm_sensitive>
+        <border_color>
+          <color red="0" green="128" blue="255">
+          </color>
+        </border_color>
+      </widget>
+      <widget type="textentry" version="3.0.0">
+        <name>Text Input</name>
+        <pv_name>$(IOCNAME):CA_CLNT_CNT.HIHI</pv_name>
+        <x>262</x>
+        <y>24</y>
+        <width>56</width>
+        <font>
+          <font family="Sans" style="REGULAR" size="13.861386138613861">
+          </font>
+        </font>
+        <format>1</format>
+        <show_units>false</show_units>
+        <actions>
+        </actions>
+        <border_alarm_sensitive>false</border_alarm_sensitive>
+        <border_color>
+          <color red="0" green="128" blue="255">
+          </color>
+        </border_color>
+      </widget>
+      <widget type="textentry" version="3.0.0">
+        <name>Text Input</name>
+        <pv_name>$(IOCNAME):CA_CONN_CNT.HIGH</pv_name>
+        <x>201</x>
+        <y>54</y>
+        <width>56</width>
+        <font>
+          <font family="Sans" style="REGULAR" size="13.861386138613861">
+          </font>
+        </font>
+        <format>1</format>
+        <show_units>false</show_units>
+        <actions>
+        </actions>
+        <border_alarm_sensitive>false</border_alarm_sensitive>
+        <border_color>
+          <color red="0" green="128" blue="255">
+          </color>
+        </border_color>
+      </widget>
+      <widget type="textentry" version="3.0.0">
+        <name>Text Input</name>
+        <pv_name>$(IOCNAME):CA_CONN_CNT.HIHI</pv_name>
+        <x>262</x>
+        <y>54</y>
+        <width>56</width>
+        <font>
+          <font family="Sans" style="REGULAR" size="13.861386138613861">
+          </font>
+        </font>
+        <format>1</format>
+        <show_units>false</show_units>
+        <actions>
+        </actions>
+        <border_alarm_sensitive>false</border_alarm_sensitive>
+        <border_color>
+          <color red="0" green="128" blue="255">
+          </color>
+        </border_color>
+      </widget>
+      <widget type="textentry" version="3.0.0">
+        <name>Text Input</name>
+        <pv_name>$(IOCNAME):SUSP_TASK_CNT.HIHI</pv_name>
+        <x>262</x>
+        <y>84</y>
+        <width>56</width>
+        <font>
+          <font family="Sans" style="REGULAR" size="13.861386138613861">
+          </font>
+        </font>
+        <format>1</format>
+        <show_units>false</show_units>
+        <actions>
+        </actions>
+        <border_alarm_sensitive>false</border_alarm_sensitive>
+        <border_color>
+          <color red="0" green="128" blue="255">
+          </color>
+        </border_color>
+      </widget>
+      <widget type="textentry" version="3.0.0">
+        <name>Text Input</name>
+        <pv_name>$(IOCNAME):IOC_CPU_LOAD.HIGH</pv_name>
+        <x>201</x>
+        <y>114</y>
+        <width>56</width>
+        <font>
+          <font family="Sans" style="REGULAR" size="13.861386138613861">
+          </font>
+        </font>
+        <format>1</format>
+        <show_units>false</show_units>
+        <actions>
+        </actions>
+        <border_alarm_sensitive>false</border_alarm_sensitive>
+        <border_color>
+          <color red="0" green="128" blue="255">
+          </color>
+        </border_color>
+      </widget>
+      <widget type="textentry" version="3.0.0">
+        <name>Text Input</name>
+        <pv_name>$(IOCNAME):IOC_CPU_LOAD.HIHI</pv_name>
+        <x>262</x>
+        <y>114</y>
+        <width>56</width>
+        <font>
+          <font family="Sans" style="REGULAR" size="13.861386138613861">
+          </font>
+        </font>
+        <format>1</format>
+        <show_units>false</show_units>
+        <actions>
+        </actions>
+        <border_alarm_sensitive>false</border_alarm_sensitive>
+        <border_color>
+          <color red="0" green="128" blue="255">
+          </color>
+        </border_color>
+      </widget>
+      <widget type="textentry" version="3.0.0">
+        <name>Text Input</name>
+        <pv_name>$(IOCNAME):FD_FREE.LOLO</pv_name>
+        <x>201</x>
+        <y>166</y>
+        <width>56</width>
+        <font>
+          <font family="Sans" style="REGULAR" size="13.861386138613861">
+          </font>
+        </font>
+        <format>1</format>
+        <show_units>false</show_units>
+        <actions>
+        </actions>
+        <border_alarm_sensitive>false</border_alarm_sensitive>
+        <border_color>
+          <color red="0" green="128" blue="255">
+          </color>
+        </border_color>
+      </widget>
+      <widget type="textentry" version="3.0.0">
+        <name>Text Input</name>
+        <pv_name>$(IOCNAME):FD_FREE.LOW</pv_name>
+        <x>262</x>
+        <y>166</y>
+        <width>56</width>
+        <font>
+          <font family="Sans" style="REGULAR" size="13.861386138613861">
+          </font>
+        </font>
+        <format>1</format>
+        <show_units>false</show_units>
+        <actions>
+        </actions>
+        <border_alarm_sensitive>false</border_alarm_sensitive>
+        <border_color>
+          <color red="0" green="128" blue="255">
+          </color>
+        </border_color>
+      </widget>
+    </widget>
+  </widget>
+</display>
diff --git a/NON-APPROVED/TS2/ts2-010rfc-rflps/support/iocStats/ioc_stats_soft.bob b/NON-APPROVED/TS2/ts2-010rfc-rflps/support/iocStats/ioc_stats_soft.bob
new file mode 100644
index 0000000000000000000000000000000000000000..f442a131b15f164ead67e9a8a3c5585917ac20db
--- /dev/null
+++ b/NON-APPROVED/TS2/ts2-010rfc-rflps/support/iocStats/ioc_stats_soft.bob
@@ -0,0 +1,1350 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<display version="2.0.0">
+  <name>ioc_stats_soft</name>
+  <x>903</x>
+  <y>166</y>
+  <width>640</width>
+  <height>1080</height>
+  <actions>
+  </actions>
+  <widget type="group" version="2.0.0">
+    <name>BGGrey02</name>
+    <width>640</width>
+    <height>1067</height>
+    <style>3</style>
+    <background_color>
+      <color name="BACKGROUND" red="220" green="225" blue="221">
+      </color>
+    </background_color>
+    <widget type="rectangle" version="2.0.0">
+      <name>BGGrey02-titlebar</name>
+      <width>640</width>
+      <height>59</height>
+      <line_width>0</line_width>
+      <background_color>
+        <color name="GROUP-BORDER" red="150" green="155" blue="151">
+        </color>
+      </background_color>
+      <corner_width>10</corner_width>
+      <corner_height>10</corner_height>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>BGGrey02-title</name>
+      <text>| Click to edit Title |</text>
+      <width>640</width>
+      <height>30</height>
+      <font>
+        <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
+        </font>
+      </font>
+      <horizontal_alignment>1</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+    </widget>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey02-background</name>
+    <y>30</y>
+    <width>640</width>
+    <height>1050</height>
+    <line_width>2</line_width>
+    <line_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
+      </color>
+    </line_color>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_height>10</corner_height>
+  </widget>
+  <widget type="group" version="2.0.0">
+    <name>BGGrey02-content-group_3</name>
+    <x>10</x>
+    <y>40</y>
+    <width>620</width>
+    <height>1031</height>
+    <style>3</style>
+    <transparent>true</transparent>
+    <widget type="group" version="2.0.0">
+      <name>Group_1</name>
+      <x>320</x>
+      <height>131</height>
+      <style>2</style>
+      <widget type="label" version="2.0.0">
+        <name>Label_31</name>
+        <text># CA Clients</text>
+        <x>11</x>
+        <y>10</y>
+        <width>120</width>
+        <height>15</height>
+        <background_color>
+          <color red="255" green="255" blue="255">
+          </color>
+        </background_color>
+        <vertical_alignment>1</vertical_alignment>
+        <actions>
+        </actions>
+        <border_color>
+          <color red="0" green="128" blue="255">
+          </color>
+        </border_color>
+      </widget>
+      <widget type="label" version="2.0.0">
+        <name>Label_32</name>
+        <text># CA PV Conns</text>
+        <x>11</x>
+        <y>40</y>
+        <width>120</width>
+        <height>15</height>
+        <background_color>
+          <color red="255" green="255" blue="255">
+          </color>
+        </background_color>
+        <vertical_alignment>1</vertical_alignment>
+        <actions>
+        </actions>
+        <border_color>
+          <color red="0" green="128" blue="255">
+          </color>
+        </border_color>
+      </widget>
+      <widget type="label" version="2.0.0">
+        <name>Label_33</name>
+        <text># Susp Tasks</text>
+        <x>11</x>
+        <y>70</y>
+        <width>120</width>
+        <height>15</height>
+        <background_color>
+          <color red="255" green="255" blue="255">
+          </color>
+        </background_color>
+        <vertical_alignment>1</vertical_alignment>
+        <actions>
+        </actions>
+        <border_color>
+          <color red="0" green="128" blue="255">
+          </color>
+        </border_color>
+      </widget>
+      <widget type="action_button" version="3.0.0">
+        <name>Menu Button_5</name>
+        <actions>
+          <action type="open_display">
+            <file>ioc_stats_limits.opi</file>
+            <target>window</target>
+            <description>Alarm Limits</description>
+          </action>
+        </actions>
+        <text>Alarm Limits</text>
+        <x>11</x>
+        <y>100</y>
+        <width>110</width>
+        <height>20</height>
+        <tooltip>$(actions)</tooltip>
+      </widget>
+      <widget type="action_button" version="3.0.0">
+        <name>Menu Button_6</name>
+        <actions>
+          <action type="open_display">
+            <file>ioc_stats_epics_env.opi</file>
+            <target>window</target>
+            <description>EPICS Env Vars</description>
+          </action>
+        </actions>
+        <text>EPICS Env Vars</text>
+        <x>139</x>
+        <y>100</y>
+        <width>149</width>
+        <height>21</height>
+        <tooltip>$(actions)</tooltip>
+      </widget>
+      <widget type="textupdate" version="2.0.0">
+        <name>Text Update_31</name>
+        <pv_name>$(IOCNAME):CA_CLNT_CNT</pv_name>
+        <x>139</x>
+        <y>10</y>
+        <width>150</width>
+        <format>1</format>
+        <show_units>false</show_units>
+        <horizontal_alignment>1</horizontal_alignment>
+        <vertical_alignment>1</vertical_alignment>
+        <wrap_words>false</wrap_words>
+        <actions>
+        </actions>
+        <border_color>
+          <color red="0" green="128" blue="255">
+          </color>
+        </border_color>
+      </widget>
+      <widget type="textupdate" version="2.0.0">
+        <name>Text Update_32</name>
+        <pv_name>$(IOCNAME):CA_CONN_CNT</pv_name>
+        <x>139</x>
+        <y>40</y>
+        <width>150</width>
+        <format>1</format>
+        <show_units>false</show_units>
+        <horizontal_alignment>1</horizontal_alignment>
+        <vertical_alignment>1</vertical_alignment>
+        <wrap_words>false</wrap_words>
+        <actions>
+        </actions>
+        <border_color>
+          <color red="0" green="128" blue="255">
+          </color>
+        </border_color>
+      </widget>
+      <widget type="textupdate" version="2.0.0">
+        <name>Text Update_33</name>
+        <pv_name>$(IOCNAME):SUSP_TASK_CNT</pv_name>
+        <x>139</x>
+        <y>70</y>
+        <width>150</width>
+        <format>1</format>
+        <show_units>false</show_units>
+        <horizontal_alignment>1</horizontal_alignment>
+        <vertical_alignment>1</vertical_alignment>
+        <wrap_words>false</wrap_words>
+        <actions>
+        </actions>
+        <border_color>
+          <color red="0" green="128" blue="255">
+          </color>
+        </border_color>
+      </widget>
+    </widget>
+    <widget type="group" version="2.0.0">
+      <name>Group_3</name>
+      <y>260</y>
+      <width>620</width>
+      <height>140</height>
+      <style>2</style>
+      <widget type="label" version="2.0.0">
+        <name>Label_34</name>
+        <text>Current</text>
+        <x>10</x>
+        <y>40</y>
+        <width>110</width>
+        <background_color>
+          <color red="255" green="255" blue="255">
+          </color>
+        </background_color>
+        <vertical_alignment>1</vertical_alignment>
+        <actions>
+        </actions>
+        <border_color>
+          <color red="0" green="128" blue="255">
+          </color>
+        </border_color>
+      </widget>
+      <widget type="label" version="2.0.0">
+        <name>Label_35</name>
+        <text>Event</text>
+        <x>10</x>
+        <y>70</y>
+        <width>110</width>
+        <background_color>
+          <color red="255" green="255" blue="255">
+          </color>
+        </background_color>
+        <vertical_alignment>1</vertical_alignment>
+        <actions>
+        </actions>
+        <border_color>
+          <color red="0" green="128" blue="255">
+          </color>
+        </border_color>
+      </widget>
+      <widget type="label" version="2.0.0">
+        <name>Label_36</name>
+        <text>Highest Priority</text>
+        <x>10</x>
+        <y>100</y>
+        <width>110</width>
+        <background_color>
+          <color red="255" green="255" blue="255">
+          </color>
+        </background_color>
+        <vertical_alignment>1</vertical_alignment>
+        <actions>
+        </actions>
+        <border_color>
+          <color red="0" green="128" blue="255">
+          </color>
+        </border_color>
+      </widget>
+      <widget type="label" version="2.0.0">
+        <name>Label_37</name>
+        <text>General Time Providers</text>
+        <x>110</x>
+        <y>10</y>
+        <width>190</width>
+        <background_color>
+          <color red="255" green="255" blue="255">
+          </color>
+        </background_color>
+        <vertical_alignment>1</vertical_alignment>
+        <actions>
+        </actions>
+        <border_color>
+          <color red="0" green="128" blue="255">
+          </color>
+        </border_color>
+      </widget>
+      <widget type="textupdate" version="2.0.0">
+        <name>Text Update_34</name>
+        <pv_name>$(IOCNAME):GTIM_CUR_SRC</pv_name>
+        <x>110</x>
+        <y>40</y>
+        <width>190</width>
+        <format>1</format>
+        <show_units>false</show_units>
+        <vertical_alignment>1</vertical_alignment>
+        <wrap_words>false</wrap_words>
+        <actions>
+        </actions>
+        <border_color>
+          <color red="0" green="128" blue="255">
+          </color>
+        </border_color>
+      </widget>
+      <widget type="textupdate" version="2.0.0">
+        <name>Text Update_35</name>
+        <pv_name>$(IOCNAME):GTIM_EVT_SRC</pv_name>
+        <x>110</x>
+        <y>70</y>
+        <width>190</width>
+        <format>1</format>
+        <show_units>false</show_units>
+        <vertical_alignment>1</vertical_alignment>
+        <wrap_words>false</wrap_words>
+        <actions>
+        </actions>
+        <border_color>
+          <color red="0" green="128" blue="255">
+          </color>
+        </border_color>
+      </widget>
+      <widget type="textupdate" version="2.0.0">
+        <name>Text Update_36</name>
+        <pv_name>$(IOCNAME):GTIM_HI_SRC</pv_name>
+        <x>110</x>
+        <y>100</y>
+        <width>190</width>
+        <format>1</format>
+        <show_units>false</show_units>
+        <vertical_alignment>1</vertical_alignment>
+        <wrap_words>false</wrap_words>
+        <actions>
+        </actions>
+        <border_color>
+          <color red="0" green="128" blue="255">
+          </color>
+        </border_color>
+      </widget>
+      <widget type="label" version="2.0.0">
+        <name>Label_38</name>
+        <text># Secs since 1990</text>
+        <x>321</x>
+        <y>40</y>
+        <width>208</width>
+        <background_color>
+          <color red="255" green="255" blue="255">
+          </color>
+        </background_color>
+        <vertical_alignment>1</vertical_alignment>
+        <actions>
+        </actions>
+        <border_color>
+          <color red="0" green="128" blue="255">
+          </color>
+        </border_color>
+      </widget>
+      <widget type="textupdate" version="2.0.0">
+        <name>Text Update_37</name>
+        <pv_name>$(IOCNAME):GTIM_TIME</pv_name>
+        <x>389</x>
+        <y>60</y>
+        <width>220</width>
+        <format>1</format>
+        <show_units>false</show_units>
+        <vertical_alignment>1</vertical_alignment>
+        <wrap_words>false</wrap_words>
+        <actions>
+        </actions>
+        <border_color>
+          <color red="0" green="128" blue="255">
+          </color>
+        </border_color>
+      </widget>
+      <widget type="label" version="2.0.0">
+        <name>Label_39</name>
+        <text># Errors</text>
+        <x>321</x>
+        <y>100</y>
+        <width>87</width>
+        <background_color>
+          <color red="255" green="255" blue="255">
+          </color>
+        </background_color>
+        <vertical_alignment>1</vertical_alignment>
+        <actions>
+        </actions>
+        <border_color>
+          <color red="0" green="128" blue="255">
+          </color>
+        </border_color>
+      </widget>
+      <widget type="textupdate" version="2.0.0">
+        <name>Text Update_38</name>
+        <pv_name>$(IOCNAME):GTIM_ERR_CNT</pv_name>
+        <x>389</x>
+        <y>100</y>
+        <width>110</width>
+        <format>1</format>
+        <show_units>false</show_units>
+        <vertical_alignment>1</vertical_alignment>
+        <wrap_words>false</wrap_words>
+        <actions>
+        </actions>
+        <border_color>
+          <color red="0" green="128" blue="255">
+          </color>
+        </border_color>
+      </widget>
+      <widget type="action_button" version="3.0.0">
+        <name>Action Button_1</name>
+        <actions>
+          <action type="write_pv">
+            <pv_name>$(IOCNAME):GTIM_RESET.PROC</pv_name>
+            <value>0</value>
+          </action>
+        </actions>
+        <pv_name>$(IOCNAME):GTIM_RESET.PROC</pv_name>
+        <text>Reset</text>
+        <x>517</x>
+        <y>100</y>
+        <width>92</width>
+        <height>20</height>
+      </widget>
+    </widget>
+    <widget type="group" version="2.0.0">
+      <name>Group_5</name>
+      <y>410</y>
+      <width>620</width>
+      <style>2</style>
+      <widget type="label" version="2.0.0">
+        <name>Label_41</name>
+        <text>EPICS Version</text>
+        <x>10</x>
+        <y>10</y>
+        <width>110</width>
+        <background_color>
+          <color red="255" green="255" blue="255">
+          </color>
+        </background_color>
+        <vertical_alignment>1</vertical_alignment>
+        <actions>
+        </actions>
+        <border_color>
+          <color red="0" green="128" blue="255">
+          </color>
+        </border_color>
+      </widget>
+      <widget type="label" version="2.0.0">
+        <name>Label_42</name>
+        <text>OS Version</text>
+        <x>10</x>
+        <y>40</y>
+        <width>110</width>
+        <background_color>
+          <color red="255" green="255" blue="255">
+          </color>
+        </background_color>
+        <vertical_alignment>1</vertical_alignment>
+        <actions>
+        </actions>
+        <border_color>
+          <color red="0" green="128" blue="255">
+          </color>
+        </border_color>
+      </widget>
+      <widget type="textupdate" version="2.0.0">
+        <name>Text Update_39</name>
+        <pv_name>$(IOCNAME):EPICS_VERS</pv_name>
+        <x>162</x>
+        <y>10</y>
+        <width>446</width>
+        <format>1</format>
+        <show_units>false</show_units>
+        <vertical_alignment>1</vertical_alignment>
+        <wrap_words>false</wrap_words>
+        <actions>
+        </actions>
+        <border_color>
+          <color red="0" green="128" blue="255">
+          </color>
+        </border_color>
+      </widget>
+      <widget type="textupdate" version="2.0.0">
+        <name>Text Update_40</name>
+        <pv_name>$(IOCNAME):KERNEL_VERS</pv_name>
+        <x>162</x>
+        <y>40</y>
+        <width>446</width>
+        <format>1</format>
+        <show_units>false</show_units>
+        <vertical_alignment>1</vertical_alignment>
+        <wrap_words>false</wrap_words>
+        <actions>
+        </actions>
+        <border_color>
+          <color red="0" green="128" blue="255">
+          </color>
+        </border_color>
+      </widget>
+      <widget type="label" version="2.0.0">
+        <name>Label_44</name>
+        <text>Application Directory</text>
+        <x>10</x>
+        <y>79</y>
+        <width>150</width>
+        <background_color>
+          <color red="255" green="255" blue="255">
+          </color>
+        </background_color>
+        <vertical_alignment>1</vertical_alignment>
+        <actions>
+        </actions>
+        <border_color>
+          <color red="0" green="128" blue="255">
+          </color>
+        </border_color>
+      </widget>
+      <widget type="textupdate" version="2.0.0">
+        <name>Text Update_42</name>
+        <pv_name>$(IOCNAME):APP_DIR1</pv_name>
+        <x>10</x>
+        <y>104</y>
+        <width>290</width>
+        <format>1</format>
+        <show_units>false</show_units>
+        <horizontal_alignment>2</horizontal_alignment>
+        <vertical_alignment>1</vertical_alignment>
+        <wrap_words>false</wrap_words>
+        <actions>
+        </actions>
+        <border_color>
+          <color red="0" green="128" blue="255">
+          </color>
+        </border_color>
+      </widget>
+      <widget type="textupdate" version="2.0.0">
+        <name>Text Update_43</name>
+        <pv_name>$(IOCNAME):ST_SCRIPT1</pv_name>
+        <x>10</x>
+        <y>164</y>
+        <width>290</width>
+        <format>1</format>
+        <show_units>false</show_units>
+        <horizontal_alignment>2</horizontal_alignment>
+        <vertical_alignment>1</vertical_alignment>
+        <wrap_words>false</wrap_words>
+        <actions>
+        </actions>
+        <border_color>
+          <color red="0" green="128" blue="255">
+          </color>
+        </border_color>
+      </widget>
+      <widget type="textupdate" version="2.0.0">
+        <name>Text Update_44</name>
+        <pv_name>$(IOCNAME):APP_DIR2</pv_name>
+        <x>300</x>
+        <y>104</y>
+        <width>308</width>
+        <format>1</format>
+        <show_units>false</show_units>
+        <vertical_alignment>1</vertical_alignment>
+        <wrap_words>false</wrap_words>
+        <actions>
+        </actions>
+        <border_color>
+          <color red="0" green="128" blue="255">
+          </color>
+        </border_color>
+      </widget>
+      <widget type="textupdate" version="2.0.0">
+        <name>Text Update_45</name>
+        <pv_name>$(IOCNAME):ST_SCRIPT2</pv_name>
+        <x>300</x>
+        <y>164</y>
+        <width>308</width>
+        <format>1</format>
+        <show_units>false</show_units>
+        <vertical_alignment>1</vertical_alignment>
+        <wrap_words>false</wrap_words>
+        <actions>
+        </actions>
+        <border_color>
+          <color red="0" green="128" blue="255">
+          </color>
+        </border_color>
+      </widget>
+      <widget type="label" version="2.0.0">
+        <name>Label_45</name>
+        <text>Startup Script</text>
+        <x>10</x>
+        <y>139</y>
+        <width>150</width>
+        <height>15</height>
+        <background_color>
+          <color red="255" green="255" blue="255">
+          </color>
+        </background_color>
+        <vertical_alignment>1</vertical_alignment>
+        <actions>
+        </actions>
+        <border_color>
+          <color red="0" green="128" blue="255">
+          </color>
+        </border_color>
+      </widget>
+    </widget>
+    <widget type="group" version="2.0.0">
+      <name>Group_8</name>
+      <width>310</width>
+      <height>250</height>
+      <style>2</style>
+      <widget type="label" version="2.0.0">
+        <name>Label_60</name>
+        <text>Startup Time</text>
+        <x>9</x>
+        <y>10</y>
+        <width>110</width>
+        <background_color>
+          <color red="255" green="255" blue="255">
+          </color>
+        </background_color>
+        <vertical_alignment>1</vertical_alignment>
+        <actions>
+        </actions>
+        <border_color>
+          <color red="0" green="128" blue="255">
+          </color>
+        </border_color>
+      </widget>
+      <widget type="label" version="2.0.0">
+        <name>Label_61</name>
+        <text>Current Time</text>
+        <x>9</x>
+        <y>40</y>
+        <width>110</width>
+        <background_color>
+          <color red="255" green="255" blue="255">
+          </color>
+        </background_color>
+        <vertical_alignment>1</vertical_alignment>
+        <actions>
+        </actions>
+        <border_color>
+          <color red="0" green="128" blue="255">
+          </color>
+        </border_color>
+      </widget>
+      <widget type="label" version="2.0.0">
+        <name>Label_62</name>
+        <text>Up Time</text>
+        <x>9</x>
+        <y>70</y>
+        <width>110</width>
+        <background_color>
+          <color red="255" green="255" blue="255">
+          </color>
+        </background_color>
+        <vertical_alignment>1</vertical_alignment>
+        <actions>
+        </actions>
+        <border_color>
+          <color red="0" green="128" blue="255">
+          </color>
+        </border_color>
+      </widget>
+      <widget type="label" version="2.0.0">
+        <name>Label_63</name>
+        <text>Heartbeat</text>
+        <x>9</x>
+        <y>100</y>
+        <width>110</width>
+        <background_color>
+          <color red="255" green="255" blue="255">
+          </color>
+        </background_color>
+        <vertical_alignment>1</vertical_alignment>
+        <actions>
+        </actions>
+        <border_color>
+          <color red="0" green="128" blue="255">
+          </color>
+        </border_color>
+      </widget>
+      <widget type="label" version="2.0.0">
+        <name>Label_64</name>
+        <text># Records</text>
+        <x>9</x>
+        <y>130</y>
+        <width>110</width>
+        <background_color>
+          <color red="255" green="255" blue="255">
+          </color>
+        </background_color>
+        <vertical_alignment>1</vertical_alignment>
+        <actions>
+        </actions>
+        <border_color>
+          <color red="0" green="128" blue="255">
+          </color>
+        </border_color>
+      </widget>
+      <widget type="label" version="2.0.0">
+        <name>Label_65</name>
+        <text>Host Name</text>
+        <x>9</x>
+        <y>160</y>
+        <width>110</width>
+        <background_color>
+          <color red="255" green="255" blue="255">
+          </color>
+        </background_color>
+        <vertical_alignment>1</vertical_alignment>
+        <actions>
+        </actions>
+        <border_color>
+          <color red="0" green="128" blue="255">
+          </color>
+        </border_color>
+      </widget>
+      <widget type="label" version="2.0.0">
+        <name>Label_66</name>
+        <text>User Name</text>
+        <x>9</x>
+        <y>190</y>
+        <width>110</width>
+        <background_color>
+          <color red="255" green="255" blue="255">
+          </color>
+        </background_color>
+        <vertical_alignment>1</vertical_alignment>
+        <actions>
+        </actions>
+        <border_color>
+          <color red="0" green="128" blue="255">
+          </color>
+        </border_color>
+      </widget>
+      <widget type="label" version="2.0.0">
+        <name>Label_67</name>
+        <text>Location</text>
+        <x>9</x>
+        <y>220</y>
+        <width>110</width>
+        <background_color>
+          <color red="255" green="255" blue="255">
+          </color>
+        </background_color>
+        <vertical_alignment>1</vertical_alignment>
+        <actions>
+        </actions>
+        <border_color>
+          <color red="0" green="128" blue="255">
+          </color>
+        </border_color>
+      </widget>
+      <widget type="textupdate" version="2.0.0">
+        <name>Text Update_61</name>
+        <pv_name>$(IOCNAME):STARTTOD</pv_name>
+        <x>109</x>
+        <y>10</y>
+        <width>190</width>
+        <format>1</format>
+        <show_units>false</show_units>
+        <vertical_alignment>1</vertical_alignment>
+        <wrap_words>false</wrap_words>
+        <actions>
+        </actions>
+        <border_color>
+          <color red="0" green="128" blue="255">
+          </color>
+        </border_color>
+      </widget>
+      <widget type="textupdate" version="2.0.0">
+        <name>Text Update_62</name>
+        <pv_name>$(IOCNAME):TOD</pv_name>
+        <x>109</x>
+        <y>40</y>
+        <width>190</width>
+        <format>1</format>
+        <show_units>false</show_units>
+        <vertical_alignment>1</vertical_alignment>
+        <wrap_words>false</wrap_words>
+        <actions>
+        </actions>
+        <border_color>
+          <color red="0" green="128" blue="255">
+          </color>
+        </border_color>
+      </widget>
+      <widget type="textupdate" version="2.0.0">
+        <name>Text Update_63</name>
+        <pv_name>$(IOCNAME):UPTIME</pv_name>
+        <x>109</x>
+        <y>70</y>
+        <width>190</width>
+        <format>1</format>
+        <show_units>false</show_units>
+        <vertical_alignment>1</vertical_alignment>
+        <wrap_words>false</wrap_words>
+        <actions>
+        </actions>
+        <border_color>
+          <color red="0" green="128" blue="255">
+          </color>
+        </border_color>
+      </widget>
+      <widget type="textupdate" version="2.0.0">
+        <name>Text Update_64</name>
+        <pv_name>$(IOCNAME):HEARTBEAT</pv_name>
+        <x>109</x>
+        <y>100</y>
+        <width>190</width>
+        <format>1</format>
+        <show_units>false</show_units>
+        <vertical_alignment>1</vertical_alignment>
+        <wrap_words>false</wrap_words>
+        <actions>
+        </actions>
+        <border_color>
+          <color red="0" green="128" blue="255">
+          </color>
+        </border_color>
+      </widget>
+      <widget type="textupdate" version="2.0.0">
+        <name>Text Update_65</name>
+        <pv_name>$(IOCNAME):RECORD_CNT</pv_name>
+        <x>109</x>
+        <y>130</y>
+        <width>190</width>
+        <format>1</format>
+        <show_units>false</show_units>
+        <vertical_alignment>1</vertical_alignment>
+        <wrap_words>false</wrap_words>
+        <actions>
+        </actions>
+        <border_color>
+          <color red="0" green="128" blue="255">
+          </color>
+        </border_color>
+      </widget>
+      <widget type="textupdate" version="2.0.0">
+        <name>Text Update_66</name>
+        <pv_name>$(IOCNAME):HOSTNAME</pv_name>
+        <x>109</x>
+        <y>160</y>
+        <width>190</width>
+        <format>1</format>
+        <show_units>false</show_units>
+        <vertical_alignment>1</vertical_alignment>
+        <wrap_words>false</wrap_words>
+        <actions>
+        </actions>
+        <border_color>
+          <color red="0" green="128" blue="255">
+          </color>
+        </border_color>
+      </widget>
+      <widget type="textupdate" version="2.0.0">
+        <name>Text Update_67</name>
+        <pv_name>$(IOCNAME):ENGINEER</pv_name>
+        <x>109</x>
+        <y>190</y>
+        <width>190</width>
+        <format>1</format>
+        <show_units>false</show_units>
+        <vertical_alignment>1</vertical_alignment>
+        <wrap_words>false</wrap_words>
+        <actions>
+        </actions>
+        <border_color>
+          <color red="0" green="128" blue="255">
+          </color>
+        </border_color>
+      </widget>
+      <widget type="textupdate" version="2.0.0">
+        <name>Text Update_68</name>
+        <pv_name>$(IOCNAME):LOCATION</pv_name>
+        <x>109</x>
+        <y>220</y>
+        <width>190</width>
+        <format>1</format>
+        <show_units>false</show_units>
+        <vertical_alignment>1</vertical_alignment>
+        <wrap_words>false</wrap_words>
+        <actions>
+        </actions>
+        <border_color>
+          <color red="0" green="128" blue="255">
+          </color>
+        </border_color>
+      </widget>
+    </widget>
+    <widget type="group" version="2.0.0">
+      <name>Group_4</name>
+      <x>320</x>
+      <y>140</y>
+      <height>110</height>
+      <style>2</style>
+      <widget type="label" version="2.0.0">
+        <name>Label_40</name>
+        <text>Mode</text>
+        <x>10</x>
+        <y>10</y>
+        <width>30</width>
+        <background_color>
+          <color red="255" green="255" blue="255">
+          </color>
+        </background_color>
+        <vertical_alignment>1</vertical_alignment>
+        <actions>
+        </actions>
+        <border_color>
+          <color red="0" green="128" blue="255">
+          </color>
+        </border_color>
+      </widget>
+      <widget type="combo" version="2.0.0">
+        <name>Menu Button_7</name>
+        <pv_name>$(IOCNAME):ACCESS</pv_name>
+        <x>48</x>
+        <y>10</y>
+        <width>96</width>
+        <height>20</height>
+        <border_alarm_sensitive>false</border_alarm_sensitive>
+      </widget>
+      <widget type="action_button" version="3.0.0">
+        <name>Menu Button_8</name>
+        <actions>
+          <action type="open_display">
+            <file>ioc_stats_reloadacf_confirm.opi</file>
+            <target>window</target>
+            <description>Reload ACF</description>
+          </action>
+        </actions>
+        <text>Reload Access Security Conf File</text>
+        <x>48</x>
+        <y>45</y>
+        <width>229</width>
+        <height>20</height>
+        <tooltip>$(actions)</tooltip>
+        <enabled>false</enabled>
+      </widget>
+      <widget type="action_button" version="3.0.0">
+        <name>Menu Button_9</name>
+        <actions>
+          <action type="open_display">
+            <file>ioc_stats_reboot_confirm.opi</file>
+            <target>window</target>
+            <description>Reboot</description>
+          </action>
+        </actions>
+        <text>Reboot</text>
+        <x>48</x>
+        <y>80</y>
+        <width>168</width>
+        <height>20</height>
+        <tooltip>$(actions)</tooltip>
+      </widget>
+    </widget>
+    <widget type="group" version="2.0.0">
+      <name>Memory (bytes)</name>
+      <y>760</y>
+      <width>310</width>
+      <height>120</height>
+      <widget type="label" version="2.0.0">
+        <name>Label_74</name>
+        <text>Free</text>
+        <y>10</y>
+        <width>40</width>
+        <background_color>
+          <color red="255" green="255" blue="255">
+          </color>
+        </background_color>
+        <horizontal_alignment>2</horizontal_alignment>
+        <vertical_alignment>1</vertical_alignment>
+        <actions>
+        </actions>
+        <border_color>
+          <color red="0" green="128" blue="255">
+          </color>
+        </border_color>
+      </widget>
+      <widget type="label" version="2.0.0">
+        <name>Label_75</name>
+        <text>Used</text>
+        <y>35</y>
+        <width>40</width>
+        <background_color>
+          <color red="255" green="255" blue="255">
+          </color>
+        </background_color>
+        <horizontal_alignment>2</horizontal_alignment>
+        <vertical_alignment>1</vertical_alignment>
+        <actions>
+        </actions>
+        <border_color>
+          <color red="0" green="128" blue="255">
+          </color>
+        </border_color>
+      </widget>
+      <widget type="label" version="2.0.0">
+        <name>Label_76</name>
+        <text>Max</text>
+        <y>60</y>
+        <width>40</width>
+        <background_color>
+          <color red="255" green="255" blue="255">
+          </color>
+        </background_color>
+        <horizontal_alignment>2</horizontal_alignment>
+        <vertical_alignment>1</vertical_alignment>
+        <actions>
+        </actions>
+        <border_color>
+          <color red="0" green="128" blue="255">
+          </color>
+        </border_color>
+      </widget>
+      <widget type="textupdate" version="2.0.0">
+        <name>Text Update_77</name>
+        <pv_name>$(IOCNAME):MEM_FREE</pv_name>
+        <x>45</x>
+        <y>10</y>
+        <font>
+          <font family="Sans" style="REGULAR" size="8.910891089108912">
+          </font>
+        </font>
+        <format>1</format>
+        <show_units>false</show_units>
+        <horizontal_alignment>1</horizontal_alignment>
+        <vertical_alignment>1</vertical_alignment>
+        <wrap_words>false</wrap_words>
+        <actions>
+        </actions>
+        <border_color>
+          <color red="0" green="128" blue="255">
+          </color>
+        </border_color>
+      </widget>
+      <widget type="textupdate" version="2.0.0">
+        <name>Text Update_78</name>
+        <pv_name>$(IOCNAME):MEM_USED</pv_name>
+        <x>45</x>
+        <y>35</y>
+        <font>
+          <font family="Sans" style="REGULAR" size="8.910891089108912">
+          </font>
+        </font>
+        <format>1</format>
+        <show_units>false</show_units>
+        <horizontal_alignment>1</horizontal_alignment>
+        <vertical_alignment>1</vertical_alignment>
+        <wrap_words>false</wrap_words>
+        <actions>
+        </actions>
+        <border_color>
+          <color red="0" green="128" blue="255">
+          </color>
+        </border_color>
+      </widget>
+      <widget type="textupdate" version="2.0.0">
+        <name>Text Update_79</name>
+        <pv_name>$(IOCNAME):MEM_MAX</pv_name>
+        <x>45</x>
+        <y>60</y>
+        <font>
+          <font family="Sans" style="REGULAR" size="8.910891089108912">
+          </font>
+        </font>
+        <format>1</format>
+        <show_units>false</show_units>
+        <horizontal_alignment>1</horizontal_alignment>
+        <vertical_alignment>1</vertical_alignment>
+        <wrap_words>false</wrap_words>
+        <actions>
+        </actions>
+        <border_color>
+          <color red="0" green="128" blue="255">
+          </color>
+        </border_color>
+      </widget>
+      <widget type="label" version="2.0.0">
+        <name>Label_77</name>
+        <text>Largest Free</text>
+        <x>162</x>
+        <y>10</y>
+        <width>101</width>
+        <background_color>
+          <color red="255" green="255" blue="255">
+          </color>
+        </background_color>
+        <vertical_alignment>1</vertical_alignment>
+        <actions>
+        </actions>
+        <border_color>
+          <color red="0" green="128" blue="255">
+          </color>
+        </border_color>
+      </widget>
+      <widget type="label" version="2.0.0">
+        <name>Label_78</name>
+        <text>RAM Block</text>
+        <x>162</x>
+        <y>35</y>
+        <width>101</width>
+        <background_color>
+          <color red="255" green="255" blue="255">
+          </color>
+        </background_color>
+        <vertical_alignment>1</vertical_alignment>
+        <actions>
+        </actions>
+        <border_color>
+          <color red="0" green="128" blue="255">
+          </color>
+        </border_color>
+      </widget>
+      <widget type="textupdate" version="2.0.0">
+        <name>Text Update_80</name>
+        <pv_name>$(IOCNAME):MEM_BLK_FREE</pv_name>
+        <x>162</x>
+        <y>60</y>
+        <font>
+          <font family="Sans" style="REGULAR" size="8.910891089108912">
+          </font>
+        </font>
+        <format>1</format>
+        <show_units>false</show_units>
+        <horizontal_alignment>1</horizontal_alignment>
+        <vertical_alignment>1</vertical_alignment>
+        <wrap_words>false</wrap_words>
+        <actions>
+        </actions>
+        <border_color>
+          <color red="0" green="128" blue="255">
+          </color>
+        </border_color>
+      </widget>
+    </widget>
+  </widget>
+  <widget type="group" version="2.0.0">
+    <name>CPU load</name>
+    <x>331</x>
+    <y>800</y>
+    <height>71</height>
+    <widget type="textupdate" version="2.0.0">
+      <name>Text Update_85</name>
+      <pv_name>$(IOCNAME):IOC_CPU_LOAD</pv_name>
+      <y>10</y>
+      <width>257</width>
+      <font>
+        <font family="Sans" style="REGULAR" size="8.910891089108912">
+        </font>
+      </font>
+      <format>1</format>
+      <show_units>false</show_units>
+      <horizontal_alignment>1</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+      <wrap_words>false</wrap_words>
+      <actions>
+      </actions>
+      <border_color>
+        <color red="0" green="128" blue="255">
+        </color>
+      </border_color>
+    </widget>
+  </widget>
+  <widget type="group" version="2.0.0">
+    <name>File descriptors</name>
+    <x>331</x>
+    <y>871</y>
+    <height>100</height>
+    <widget type="label" version="2.0.0">
+      <name>Label_83</name>
+      <text>Free</text>
+      <y>10</y>
+      <width>40</width>
+      <background_color>
+        <color red="255" green="255" blue="255">
+        </color>
+      </background_color>
+      <horizontal_alignment>2</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+      <actions>
+      </actions>
+      <border_color>
+        <color red="0" green="128" blue="255">
+        </color>
+      </border_color>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_84</name>
+      <text>Max</text>
+      <y>35</y>
+      <width>40</width>
+      <background_color>
+        <color red="255" green="255" blue="255">
+        </color>
+      </background_color>
+      <horizontal_alignment>2</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+      <actions>
+      </actions>
+      <border_color>
+        <color red="0" green="128" blue="255">
+        </color>
+      </border_color>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>Text Update_86</name>
+      <pv_name>$(IOCNAME):FD_FREE</pv_name>
+      <x>60</x>
+      <y>10</y>
+      <width>200</width>
+      <font>
+        <font family="Sans" style="REGULAR" size="8.910891089108912">
+        </font>
+      </font>
+      <format>1</format>
+      <show_units>false</show_units>
+      <horizontal_alignment>1</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+      <wrap_words>false</wrap_words>
+      <actions>
+      </actions>
+      <border_color>
+        <color red="0" green="128" blue="255">
+        </color>
+      </border_color>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>Text Update_87</name>
+      <pv_name>$(IOCNAME):FD_MAX</pv_name>
+      <x>60</x>
+      <y>35</y>
+      <width>200</width>
+      <font>
+        <font family="Sans" style="REGULAR" size="8.910891089108912">
+        </font>
+      </font>
+      <format>1</format>
+      <show_units>false</show_units>
+      <horizontal_alignment>1</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+      <wrap_words>false</wrap_words>
+      <actions>
+      </actions>
+      <border_color>
+        <color red="0" green="128" blue="255">
+        </color>
+      </border_color>
+    </widget>
+  </widget>
+  <widget type="group" version="2.0.0">
+    <name>IF Errors</name>
+    <x>331</x>
+    <y>971</y>
+    <height>100</height>
+    <widget type="textupdate" version="2.0.0">
+      <name>Text Update_88</name>
+      <pv_name>$(IOCNAME):IFO_ERR_CNT</pv_name>
+      <x>60</x>
+      <y>10</y>
+      <width>200</width>
+      <font>
+        <font family="Sans" style="REGULAR" size="8.910891089108912">
+        </font>
+      </font>
+      <format>1</format>
+      <show_units>false</show_units>
+      <horizontal_alignment>1</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+      <wrap_words>false</wrap_words>
+      <actions>
+      </actions>
+      <border_color>
+        <color red="0" green="128" blue="255">
+        </color>
+      </border_color>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>Text Update_89</name>
+      <pv_name>$(IOCNAME):IFI_ERR_CNT</pv_name>
+      <x>60</x>
+      <y>35</y>
+      <width>200</width>
+      <font>
+        <font family="Sans" style="REGULAR" size="8.910891089108912">
+        </font>
+      </font>
+      <format>1</format>
+      <show_units>false</show_units>
+      <horizontal_alignment>1</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+      <wrap_words>false</wrap_words>
+      <actions>
+      </actions>
+      <border_color>
+        <color red="0" green="128" blue="255">
+        </color>
+      </border_color>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_85</name>
+      <text>Output</text>
+      <y>35</y>
+      <width>50</width>
+      <height>15</height>
+      <background_color>
+        <color red="255" green="255" blue="255">
+        </color>
+      </background_color>
+      <horizontal_alignment>2</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+      <actions>
+      </actions>
+      <border_color>
+        <color red="0" green="128" blue="255">
+        </color>
+      </border_color>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_86</name>
+      <text>Input</text>
+      <y>10</y>
+      <width>50</width>
+      <height>15</height>
+      <background_color>
+        <color red="255" green="255" blue="255">
+        </color>
+      </background_color>
+      <horizontal_alignment>2</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+      <actions>
+      </actions>
+      <border_color>
+        <color red="0" green="128" blue="255">
+        </color>
+      </border_color>
+    </widget>
+  </widget>
+</display>
diff --git a/NON-APPROVED/TS2/ts2-010rfc-rflps/support/machineStateControl.bob b/NON-APPROVED/TS2/ts2-010rfc-rflps/support/machineStateControl.bob
index 09df7aaa84b1fad2e245b73ddaf21bd8167966e4..ce548a1cb2d55ff314cf399d86c1293bfebf7e93 100644
--- a/NON-APPROVED/TS2/ts2-010rfc-rflps/support/machineStateControl.bob
+++ b/NON-APPROVED/TS2/ts2-010rfc-rflps/support/machineStateControl.bob
@@ -246,11 +246,6 @@
         <font name="Header 2" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
         </font>
       </font>
-      <background_color use_class="true">
-        <color name="Background" red="220" green="225" blue="221">
-        </color>
-      </background_color>
-      <transparent use_class="true">true</transparent>
       <horizontal_alignment>1</horizontal_alignment>
       <vertical_alignment>1</vertical_alignment>
     </widget>
@@ -294,7 +289,7 @@
           <description>Write PV</description>
         </action>
       </actions>
-      <pv_name>$(PREFIX):CPU-RFON</pv_name>
+      <pv_name>$(PREFIX):RFS-CPU-RFON</pv_name>
       <text>FIM RFON</text>
       <x>39</x>
       <y>165</y>
@@ -305,7 +300,7 @@
           <exp bool_exp="pv0 &gt; 8">
             <value>true</value>
           </exp>
-          <pv_name>$(PREFIX):CPU-ACTSTATE-RB</pv_name>
+          <pv_name>$(PREFIX):RFS-CPU-ACTSTATE-RB</pv_name>
         </rule>
       </rules>
       <tooltip>$(actions)</tooltip>
@@ -327,7 +322,7 @@
     </widget>
     <widget type="textupdate" version="2.0.0">
       <name>Text Update_127</name>
-      <pv_name>$(PREFIX):CPU-STATE-RB</pv_name>
+      <pv_name>$(PREFIX):RFS-CPU-STATE-RB</pv_name>
       <x>130</x>
       <y>72</y>
       <width>130</width>
@@ -393,17 +388,16 @@ Actual Machine State read-back</tooltip>
         <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
         </font>
       </font>
-      <background_color use_class="true">
-        <color name="Background" red="220" green="225" blue="221">
+      <foreground_color use_class="true">
+        <color name="Text" red="25" green="25" blue="25">
         </color>
-      </background_color>
-      <transparent use_class="true">true</transparent>
+      </foreground_color>
       <horizontal_alignment>1</horizontal_alignment>
       <vertical_alignment>1</vertical_alignment>
     </widget>
     <widget type="multi_state_led" version="2.0.0">
       <name>LED (Multi State)_34</name>
-      <pv_name>$(PREFIX):CPU-STBYMISUCND-RB</pv_name>
+      <pv_name>$(PREFIX):RFS-CPU-STBYMISUCND-RB</pv_name>
       <x>59</x>
       <y>600</y>
       <width>180</width>
@@ -434,7 +428,7 @@ Actual Machine State read-back</tooltip>
     </widget>
     <widget type="multi_state_led" version="2.0.0">
       <name>LED (Multi State)_35</name>
-      <pv_name>$(PREFIX):CPU-STBYMIPRCND-RB</pv_name>
+      <pv_name>$(PREFIX):RFS-CPU-STBYMIPRCND-RB</pv_name>
       <x>59</x>
       <y>654</y>
       <width>180</width>
@@ -472,7 +466,7 @@ Actual Machine State read-back</tooltip>
           <description>Set Solenoids ON</description>
         </action>
       </actions>
-      <pv_name>$(PREFIX):CPU-STDBY</pv_name>
+      <pv_name>$(PREFIX):RFS-CPU-STDBY</pv_name>
       <text>STDBY</text>
       <x>39</x>
       <y>625</y>
@@ -481,7 +475,7 @@ Actual Machine State read-back</tooltip>
     </widget>
     <widget type="multi_state_led" version="2.0.0">
       <name>LED (Multi State)_23</name>
-      <pv_name>$(PREFIX):CPU-ACTSTATE-RB</pv_name>
+      <pv_name>$(PREFIX):RFS-CPU-ACTSTATE-RB</pv_name>
       <x>71</x>
       <y>630</y>
       <states>
@@ -657,17 +651,16 @@ Actual Machine State read-back</tooltip>
         <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
         </font>
       </font>
-      <background_color use_class="true">
-        <color name="Background" red="220" green="225" blue="221">
+      <foreground_color use_class="true">
+        <color name="Text" red="25" green="25" blue="25">
         </color>
-      </background_color>
-      <transparent use_class="true">true</transparent>
+      </foreground_color>
       <horizontal_alignment>1</horizontal_alignment>
       <vertical_alignment>1</vertical_alignment>
     </widget>
     <widget type="multi_state_led" version="2.0.0">
       <name>LED (Multi State)_36</name>
-      <pv_name>$(PREFIX):CPU-FILMISUCND-RB</pv_name>
+      <pv_name>$(PREFIX):RFS-CPU-FILMISUCND-RB</pv_name>
       <x>59</x>
       <y>766</y>
       <width>180</width>
@@ -698,7 +691,7 @@ Actual Machine State read-back</tooltip>
     </widget>
     <widget type="multi_state_led" version="2.0.0">
       <name>LED (Multi State)_37</name>
-      <pv_name>$(PREFIX):CPU-FILMIPRCND-RB</pv_name>
+      <pv_name>$(PREFIX):RFS-CPU-FILMIPRCND-RB</pv_name>
       <x>59</x>
       <y>820</y>
       <width>180</width>
@@ -736,7 +729,7 @@ Actual Machine State read-back</tooltip>
           <description>Set Filament ON</description>
         </action>
       </actions>
-      <pv_name>$(PREFIX):CPU-FIL</pv_name>
+      <pv_name>$(PREFIX):RFS-CPU-FIL</pv_name>
       <text>FIL</text>
       <x>39</x>
       <y>790</y>
@@ -745,7 +738,7 @@ Actual Machine State read-back</tooltip>
     </widget>
     <widget type="multi_state_led" version="2.0.0">
       <name>LED (Multi State)_24</name>
-      <pv_name>$(PREFIX):CPU-ACTSTATE-RB</pv_name>
+      <pv_name>$(PREFIX):RFS-CPU-ACTSTATE-RB</pv_name>
       <x>71</x>
       <y>796</y>
       <states>
@@ -917,17 +910,16 @@ Actual Machine State read-back</tooltip>
         <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
         </font>
       </font>
-      <background_color use_class="true">
-        <color name="Background" red="220" green="225" blue="221">
+      <foreground_color use_class="true">
+        <color name="Text" red="25" green="25" blue="25">
         </color>
-      </background_color>
-      <transparent use_class="true">true</transparent>
+      </foreground_color>
       <horizontal_alignment>1</horizontal_alignment>
       <vertical_alignment>1</vertical_alignment>
     </widget>
     <widget type="multi_state_led" version="2.0.0">
       <name>LED (Multi State)_30</name>
-      <pv_name>$(PREFIX):CPU-RFENMISUCND-RB</pv_name>
+      <pv_name>$(PREFIX):RFS-CPU-RFENMISUCND-RB</pv_name>
       <x>59</x>
       <y>236</y>
       <width>180</width>
@@ -958,7 +950,7 @@ Actual Machine State read-back</tooltip>
     </widget>
     <widget type="multi_state_led" version="2.0.0">
       <name>LED (Multi State)_31</name>
-      <pv_name>$(PREFIX):CPU-RFENMIPRCND-RB</pv_name>
+      <pv_name>$(PREFIX):RFS-CPU-RFENMIPRCND-RB</pv_name>
       <x>59</x>
       <y>290</y>
       <width>180</width>
@@ -996,7 +988,7 @@ Actual Machine State read-back</tooltip>
           <description>Set amplifier to RFON</description>
         </action>
       </actions>
-      <pv_name>$(PREFIX):CPU-RFON</pv_name>
+      <pv_name>$(PREFIX):RFS-CPU-RFON</pv_name>
       <text>SIM Pre-RF ON</text>
       <x>39</x>
       <y>260</y>
@@ -1015,17 +1007,16 @@ Actual Machine State read-back</tooltip>
         <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
         </font>
       </font>
-      <background_color use_class="true">
-        <color name="Background" red="220" green="225" blue="221">
+      <foreground_color use_class="true">
+        <color name="Text" red="25" green="25" blue="25">
         </color>
-      </background_color>
-      <transparent use_class="true">true</transparent>
+      </foreground_color>
       <horizontal_alignment>1</horizontal_alignment>
       <vertical_alignment>1</vertical_alignment>
     </widget>
     <widget type="multi_state_led" version="2.0.0">
       <name>LED (Multi State)_38</name>
-      <pv_name>$(PREFIX):CPU-AUXMIPRCND-RB</pv_name>
+      <pv_name>$(PREFIX):RFS-CPU-AUXMIPRCND-RB</pv_name>
       <x>59</x>
       <y>985</y>
       <width>180</width>
@@ -1056,7 +1047,7 @@ Actual Machine State read-back</tooltip>
     </widget>
     <widget type="multi_state_led" version="2.0.0">
       <name>LED (Multi State)_39</name>
-      <pv_name>$(PREFIX):CPU-AUXMISUCND-RB</pv_name>
+      <pv_name>$(PREFIX):RFS-CPU-AUXMISUCND-RB</pv_name>
       <x>59</x>
       <y>931</y>
       <width>180</width>
@@ -1094,7 +1085,7 @@ Actual Machine State read-back</tooltip>
           <description>Set amplifier to AUX</description>
         </action>
       </actions>
-      <pv_name>$(PREFIX):CPU-AUX</pv_name>
+      <pv_name>$(PREFIX):RFS-CPU-AUX</pv_name>
       <text>AUX</text>
       <x>39</x>
       <y>956</y>
@@ -1103,7 +1094,7 @@ Actual Machine State read-back</tooltip>
     </widget>
     <widget type="multi_state_led" version="2.0.0">
       <name>LED (Multi State)_25</name>
-      <pv_name>$(PREFIX):CPU-ACTSTATE-RB</pv_name>
+      <pv_name>$(PREFIX):RFS-CPU-ACTSTATE-RB</pv_name>
       <x>71</x>
       <y>963</y>
       <states>
@@ -1199,7 +1190,7 @@ Actual Machine State read-back</tooltip>
     </widget>
     <widget type="multi_state_led" version="2.0.0">
       <name>LED (Multi State)_32</name>
-      <pv_name>$(PREFIX):CPU-HVENMISUCND-RB</pv_name>
+      <pv_name>$(PREFIX):RFS-CPU-HVENMISUCND-RB</pv_name>
       <x>59</x>
       <y>443</y>
       <width>180</width>
@@ -1230,7 +1221,7 @@ Actual Machine State read-back</tooltip>
     </widget>
     <widget type="multi_state_led" version="2.0.0">
       <name>LED (Multi State)_33</name>
-      <pv_name>$(PREFIX):CPU-HVENMIPRCND-RB</pv_name>
+      <pv_name>$(PREFIX):RFS-CPU-HVENMIPRCND-RB</pv_name>
       <x>59</x>
       <y>497</y>
       <width>180</width>
@@ -1268,7 +1259,7 @@ Actual Machine State read-back</tooltip>
           <description>Set amplifier to HVON</description>
         </action>
       </actions>
-      <pv_name>$(PREFIX):CPU-HVON</pv_name>
+      <pv_name>$(PREFIX):RFS-CPU-HVON</pv_name>
       <text>SIM Pre-HV ON</text>
       <x>39</x>
       <y>467</y>
@@ -1277,7 +1268,7 @@ Actual Machine State read-back</tooltip>
     </widget>
     <widget type="multi_state_led" version="2.0.0">
       <name>LED (Multi State)_26</name>
-      <pv_name>$(PREFIX):CPU-ACTSTATE-RB</pv_name>
+      <pv_name>$(PREFIX):RFS-CPU-ACTSTATE-RB</pv_name>
       <x>71</x>
       <y>473</y>
       <states>
@@ -1383,11 +1374,10 @@ Actual Machine State read-back</tooltip>
         <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
         </font>
       </font>
-      <background_color use_class="true">
-        <color name="Background" red="220" green="225" blue="221">
+      <foreground_color use_class="true">
+        <color name="Text" red="25" green="25" blue="25">
         </color>
-      </background_color>
-      <transparent use_class="true">true</transparent>
+      </foreground_color>
       <horizontal_alignment>1</horizontal_alignment>
       <vertical_alignment>1</vertical_alignment>
     </widget>
@@ -1431,7 +1421,7 @@ Actual Machine State read-back</tooltip>
           <description>Write PV</description>
         </action>
       </actions>
-      <pv_name>$(PREFIX):CPU-HVON</pv_name>
+      <pv_name>$(PREFIX):RFS-CPU-HVON</pv_name>
       <text>FIM HVON</text>
       <x>39</x>
       <y>375</y>
@@ -1441,7 +1431,7 @@ Actual Machine State read-back</tooltip>
           <exp bool_exp="pv0 &gt; 6">
             <value>true</value>
           </exp>
-          <pv_name>$(PREFIX):CPU-ACTSTATE-RB</pv_name>
+          <pv_name>$(PREFIX):RFS-CPU-ACTSTATE-RB</pv_name>
         </rule>
       </rules>
       <tooltip>$(actions)</tooltip>
@@ -1472,7 +1462,7 @@ Actual Machine State read-back</tooltip>
           <description>Set amplifier to OFF</description>
         </action>
       </actions>
-      <pv_name>$(PREFIX):CPU-OFF</pv_name>
+      <pv_name>$(PREFIX):RFS-CPU-OFF</pv_name>
       <text>Amplifier OFF</text>
       <x>39</x>
       <y>1097</y>
@@ -1481,7 +1471,7 @@ Actual Machine State read-back</tooltip>
     </widget>
     <widget type="multi_state_led" version="2.0.0">
       <name>LED (Multi State)_28</name>
-      <pv_name>$(PREFIX):CPU-ACTSTATE-RB</pv_name>
+      <pv_name>$(PREFIX):RFS-CPU-ACTSTATE-RB</pv_name>
       <x>71</x>
       <y>266</y>
       <states>
diff --git a/NON-APPROVED/TS2/ts2-010rfc-rflps/support/machineStateControlTS2.bob b/NON-APPROVED/TS2/ts2-010rfc-rflps/support/machineStateControlTS2.bob
new file mode 100644
index 0000000000000000000000000000000000000000..4d87ccccbc42bb428ebcee8e6b4497f8b3e56c7c
--- /dev/null
+++ b/NON-APPROVED/TS2/ts2-010rfc-rflps/support/machineStateControlTS2.bob
@@ -0,0 +1,1579 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<display version="2.0.0">
+  <name>MachineStateControl TS2</name>
+  <width>300</width>
+  <height>1180</height>
+  <widget type="group" version="2.0.0">
+    <name>Machine State_1</name>
+    <height>1180</height>
+    <style>3</style>
+    <background_color>
+      <color name="BACKGROUND" red="220" green="225" blue="221">
+      </color>
+    </background_color>
+    <widget type="rectangle" version="2.0.0">
+      <name>MGGrey03-background_1</name>
+      <width>300</width>
+      <height>1180</height>
+      <line_width>2</line_width>
+      <line_color>
+        <color name="GROUP-BORDER" red="150" green="155" blue="151">
+        </color>
+      </line_color>
+      <background_color>
+        <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+        </color>
+      </background_color>
+      <corner_width>10</corner_width>
+      <corner_height>10</corner_height>
+    </widget>
+    <widget type="rectangle" version="2.0.0">
+      <name>connect</name>
+      <x>129</x>
+      <y>269</y>
+      <width>40</width>
+      <height>881</height>
+      <line_width>2</line_width>
+      <line_color>
+        <color name="GROUP-BORDER" red="150" green="155" blue="151">
+        </color>
+      </line_color>
+      <background_color>
+        <color name="Background" red="220" green="225" blue="221">
+        </color>
+      </background_color>
+    </widget>
+    <widget type="rectangle" version="2.0.0">
+      <name>connect 2</name>
+      <x>131</x>
+      <y>216</y>
+      <width>36</width>
+      <height>881</height>
+      <line_width>0</line_width>
+      <line_color>
+        <color name="GROUP-BORDER" red="150" green="155" blue="151">
+        </color>
+      </line_color>
+      <background_color>
+        <color name="Background" red="220" green="225" blue="221">
+        </color>
+      </background_color>
+    </widget>
+    <widget type="rectangle" version="2.0.0">
+      <name>Amp</name>
+      <x>19</x>
+      <y>1055</y>
+      <width>260</width>
+      <height>105</height>
+      <line_width>2</line_width>
+      <line_color>
+        <color name="GROUP-BORDER" red="150" green="155" blue="151">
+        </color>
+      </line_color>
+      <background_color>
+        <color name="Background" red="220" green="225" blue="221">
+        </color>
+      </background_color>
+    </widget>
+    <widget type="rectangle" version="2.0.0">
+      <name>Aux</name>
+      <x>19</x>
+      <y>890</y>
+      <width>260</width>
+      <height>145</height>
+      <line_width>2</line_width>
+      <line_color>
+        <color name="GROUP-BORDER" red="150" green="155" blue="151">
+        </color>
+      </line_color>
+      <background_color>
+        <color name="Background" red="220" green="225" blue="221">
+        </color>
+      </background_color>
+    </widget>
+    <widget type="rectangle" version="2.0.0">
+      <name>Fil</name>
+      <x>19</x>
+      <y>725</y>
+      <width>260</width>
+      <height>145</height>
+      <line_width>2</line_width>
+      <line_color>
+        <color name="GROUP-BORDER" red="150" green="155" blue="151">
+        </color>
+      </line_color>
+      <background_color>
+        <color name="Background" red="220" green="225" blue="221">
+        </color>
+      </background_color>
+    </widget>
+    <widget type="rectangle" version="2.0.0">
+      <name>Standby</name>
+      <x>19</x>
+      <y>560</y>
+      <width>260</width>
+      <height>145</height>
+      <line_width>2</line_width>
+      <line_color>
+        <color name="GROUP-BORDER" red="150" green="155" blue="151">
+        </color>
+      </line_color>
+      <background_color>
+        <color name="Background" red="220" green="225" blue="221">
+        </color>
+      </background_color>
+    </widget>
+    <widget type="rectangle" version="2.0.0">
+      <name>HV</name>
+      <x>19</x>
+      <y>345</y>
+      <width>260</width>
+      <height>195</height>
+      <line_width>2</line_width>
+      <line_color>
+        <color name="GROUP-BORDER" red="150" green="155" blue="151">
+        </color>
+      </line_color>
+      <background_color>
+        <color name="Background" red="220" green="225" blue="221">
+        </color>
+      </background_color>
+    </widget>
+    <widget type="rectangle" version="2.0.0">
+      <name>RF</name>
+      <x>19</x>
+      <y>130</y>
+      <width>260</width>
+      <height>195</height>
+      <line_width>2</line_width>
+      <line_color>
+        <color name="GROUP-BORDER" red="150" green="155" blue="151">
+        </color>
+      </line_color>
+      <background_color>
+        <color name="Background" red="220" green="225" blue="221">
+        </color>
+      </background_color>
+    </widget>
+    <widget type="rectangle" version="2.0.0">
+      <name>connect 2_1</name>
+      <x>131</x>
+      <y>308</y>
+      <width>36</width>
+      <height>24</height>
+      <line_width>0</line_width>
+      <line_color>
+        <color name="GROUP-BORDER" red="150" green="155" blue="151">
+        </color>
+      </line_color>
+      <background_color>
+        <color name="Background" red="220" green="225" blue="221">
+        </color>
+      </background_color>
+    </widget>
+    <widget type="rectangle" version="2.0.0">
+      <name>connect 2_2</name>
+      <x>131</x>
+      <y>525</y>
+      <width>36</width>
+      <height>24</height>
+      <line_width>0</line_width>
+      <line_color>
+        <color name="GROUP-BORDER" red="150" green="155" blue="151">
+        </color>
+      </line_color>
+      <background_color>
+        <color name="Background" red="220" green="225" blue="221">
+        </color>
+      </background_color>
+    </widget>
+    <widget type="rectangle" version="2.0.0">
+      <name>connect 2_3</name>
+      <x>131</x>
+      <y>1023</y>
+      <width>36</width>
+      <height>24</height>
+      <line_width>0</line_width>
+      <line_color>
+        <color name="GROUP-BORDER" red="150" green="155" blue="151">
+        </color>
+      </line_color>
+      <background_color>
+        <color name="Background" red="220" green="225" blue="221">
+        </color>
+      </background_color>
+    </widget>
+    <widget type="rectangle" version="2.0.0">
+      <name>connect 2_4</name>
+      <x>131</x>
+      <y>855</y>
+      <width>36</width>
+      <height>24</height>
+      <line_width>0</line_width>
+      <line_color>
+        <color name="GROUP-BORDER" red="150" green="155" blue="151">
+        </color>
+      </line_color>
+      <background_color>
+        <color name="Background" red="220" green="225" blue="221">
+        </color>
+      </background_color>
+    </widget>
+    <widget type="rectangle" version="2.0.0">
+      <name>connect 2_5</name>
+      <x>131</x>
+      <y>690</y>
+      <width>36</width>
+      <height>24</height>
+      <line_width>0</line_width>
+      <line_color>
+        <color name="GROUP-BORDER" red="150" green="155" blue="151">
+        </color>
+      </line_color>
+      <background_color>
+        <color name="Background" red="220" green="225" blue="221">
+        </color>
+      </background_color>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>MGGrey03-title_1</name>
+      <class>HEADER2</class>
+      <text>Machine State</text>
+      <x>10</x>
+      <width>290</width>
+      <height>40</height>
+      <font use_class="true">
+        <font name="Header 2" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
+        </font>
+      </font>
+      <background_color use_class="true">
+        <color name="Background" red="220" green="225" blue="221">
+        </color>
+      </background_color>
+      <transparent use_class="true">true</transparent>
+      <horizontal_alignment>1</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+    </widget>
+    <widget type="multi_state_led" version="2.0.0">
+      <name>LED (Multi State)_22</name>
+      <pv_name>$(PREFIX):$(DEVICE):HVToRFPreCond</pv_name>
+      <x>59</x>
+      <y>204</y>
+      <width>180</width>
+      <height>25</height>
+      <line_color>
+        <color name="Background" red="220" green="225" blue="221">
+        </color>
+      </line_color>
+      <square>true</square>
+      <states>
+        <state>
+          <value>0</value>
+          <label>RFON-FIM-PRE-MISS</label>
+          <color>
+            <color name="Off" red="90" green="110" blue="90">
+            </color>
+          </color>
+        </state>
+        <state>
+          <value>1</value>
+          <label>RFON-FIM-PRE-OK</label>
+          <color>
+            <color name="OK" red="61" green="216" blue="61">
+            </color>
+          </color>
+        </state>
+      </states>
+    </widget>
+    <widget type="action_button" version="3.0.0">
+      <name>Action Button_38</name>
+      <actions execute_as_one="true">
+        <action type="write_pv">
+          <pv_name>$(PREFIX):$(DEVICE):INTS</pv_name>
+          <value>3</value>
+          <description>Write PV</description>
+        </action>
+      </actions>
+      <pv_name>$(PREFIX):CPU-RFON</pv_name>
+      <text>FIM RFON</text>
+      <x>39</x>
+      <y>165</y>
+      <width>220</width>
+      <height>40</height>
+      <rules>
+        <rule name="enableRule" prop_id="enabled" out_exp="false">
+          <exp bool_exp="pv0 &gt; 8">
+            <value>true</value>
+          </exp>
+          <pv_name>$(PREFIX):CPU-ACTSTATE-RB</pv_name>
+        </rule>
+      </rules>
+      <tooltip>$(actions)</tooltip>
+      <enabled>false</enabled>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_284</name>
+      <text>RF</text>
+      <x>19</x>
+      <y>130</y>
+      <width>260</width>
+      <height>35</height>
+      <font>
+        <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
+        </font>
+      </font>
+      <horizontal_alignment>1</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>Text Update_127</name>
+      <pv_name>$(PREFIX):CPU-STATE-RB</pv_name>
+      <x>130</x>
+      <y>72</y>
+      <width>130</width>
+      <height>30</height>
+      <font>
+        <font family="Source Sans Pro" style="BOLD" size="18.0">
+        </font>
+      </font>
+      <horizontal_alignment>1</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+      <wrap_words>false</wrap_words>
+      <actions>
+      </actions>
+      <tooltip>$(pv_name)
+$(pv_value)
+Actual Machine State read-back</tooltip>
+    </widget>
+    <widget type="polyline" version="2.0.0">
+      <name>Polyline_31</name>
+      <x>149</x>
+      <y>312</y>
+      <width>130</width>
+      <line_width>2</line_width>
+      <line_color>
+        <color name="GROUP-BORDER" red="150" green="155" blue="151">
+        </color>
+      </line_color>
+      <arrows>2</arrows>
+      <points>
+        <point x="0.0" y="20.0">
+        </point>
+        <point x="0.0" y="0.0">
+        </point>
+      </points>
+    </widget>
+    <widget type="polyline" version="2.0.0">
+      <name>Polyline_33</name>
+      <x>149</x>
+      <y>1020</y>
+      <width>130</width>
+      <line_width>2</line_width>
+      <line_color>
+        <color name="GROUP-BORDER" red="150" green="155" blue="151">
+        </color>
+      </line_color>
+      <arrows>2</arrows>
+      <points>
+        <point x="0.0" y="20.0">
+        </point>
+        <point x="0.0" y="0.0">
+        </point>
+      </points>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_314</name>
+      <class>HEADER3</class>
+      <text>Standby</text>
+      <x>19</x>
+      <y>560</y>
+      <width>260</width>
+      <height>35</height>
+      <font use_class="true">
+        <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
+        </font>
+      </font>
+      <background_color use_class="true">
+        <color name="Background" red="220" green="225" blue="221">
+        </color>
+      </background_color>
+      <transparent use_class="true">true</transparent>
+      <horizontal_alignment>1</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+    </widget>
+    <widget type="multi_state_led" version="2.0.0">
+      <name>LED (Multi State)_34</name>
+      <pv_name>$(PREFIX):CPU-STBYMISUCND-RB</pv_name>
+      <x>59</x>
+      <y>600</y>
+      <width>180</width>
+      <height>25</height>
+      <line_color>
+        <color name="Background" red="220" green="225" blue="221">
+        </color>
+      </line_color>
+      <square>true</square>
+      <states>
+        <state>
+          <value>0</value>
+          <label>STDBY-SUP-MISS</label>
+          <color>
+            <color name="Off" red="90" green="110" blue="90">
+            </color>
+          </color>
+        </state>
+        <state>
+          <value>1</value>
+          <label>STDBY-SUP-OK</label>
+          <color>
+            <color name="OK" red="61" green="216" blue="61">
+            </color>
+          </color>
+        </state>
+      </states>
+    </widget>
+    <widget type="multi_state_led" version="2.0.0">
+      <name>LED (Multi State)_35</name>
+      <pv_name>$(PREFIX):CPU-STBYMIPRCND-RB</pv_name>
+      <x>59</x>
+      <y>654</y>
+      <width>180</width>
+      <height>25</height>
+      <line_color>
+        <color name="Background" red="220" green="225" blue="221">
+        </color>
+      </line_color>
+      <square>true</square>
+      <states>
+        <state>
+          <value>0</value>
+          <label>STDBY-PRE-MISS</label>
+          <color>
+            <color name="Off" red="90" green="110" blue="90">
+            </color>
+          </color>
+        </state>
+        <state>
+          <value>1</value>
+          <label>STDBY-PRE-OK</label>
+          <color>
+            <color name="OK" red="61" green="216" blue="61">
+            </color>
+          </color>
+        </state>
+      </states>
+    </widget>
+    <widget type="action_button" version="3.0.0">
+      <name>Action Button_39</name>
+      <actions execute_as_one="true">
+        <action type="write_pv">
+          <pv_name>$(pv_name)</pv_name>
+          <value>1</value>
+          <description>Set Solenoids ON</description>
+        </action>
+      </actions>
+      <pv_name>$(PREFIX):CPU-STDBY</pv_name>
+      <text>STDBY</text>
+      <x>39</x>
+      <y>625</y>
+      <width>220</width>
+      <tooltip>$(actions)</tooltip>
+    </widget>
+    <widget type="multi_state_led" version="2.0.0">
+      <name>LED (Multi State)_23</name>
+      <pv_name>$(PREFIX):CPU-ACTSTATE-RB</pv_name>
+      <x>71</x>
+      <y>630</y>
+      <states>
+        <state>
+          <value>0</value>
+          <label></label>
+          <color>
+            <color name="LED-GREEN-OFF" red="90" green="110" blue="90">
+            </color>
+          </color>
+        </state>
+        <state>
+          <value>1</value>
+          <label></label>
+          <color>
+            <color name="LED-GREEN-OFF" red="90" green="110" blue="90">
+            </color>
+          </color>
+        </state>
+        <state>
+          <value>2</value>
+          <label></label>
+          <color>
+            <color name="LED-GREEN-OFF" red="90" green="110" blue="90">
+            </color>
+          </color>
+        </state>
+        <state>
+          <value>3</value>
+          <label></label>
+          <color>
+            <color name="LED-GREEN-OFF" red="90" green="110" blue="90">
+            </color>
+          </color>
+        </state>
+        <state>
+          <value>4</value>
+          <label></label>
+          <color>
+            <color name="LED-GREEN-OFF" red="90" green="110" blue="90">
+            </color>
+          </color>
+        </state>
+        <state>
+          <value>5</value>
+          <label></label>
+          <color>
+            <color name="LED-YELLOW-ON" red="255" green="235" blue="17">
+            </color>
+          </color>
+        </state>
+        <state>
+          <value>6</value>
+          <label></label>
+          <color>
+            <color name="LED-GREEN-ON" red="70" green="255" blue="70">
+            </color>
+          </color>
+        </state>
+        <state>
+          <value>7</value>
+          <label></label>
+          <color>
+            <color name="LED-GREEN-ON" red="70" green="255" blue="70">
+            </color>
+          </color>
+        </state>
+        <state>
+          <value>8</value>
+          <label></label>
+          <color>
+            <color name="LED-GREEN-ON" red="70" green="255" blue="70">
+            </color>
+          </color>
+        </state>
+        <state>
+          <value>9</value>
+          <label></label>
+          <color>
+            <color name="LED-GREEN-ON" red="70" green="255" blue="70">
+            </color>
+          </color>
+        </state>
+        <state>
+          <value>10</value>
+          <label></label>
+          <color>
+            <color name="LED-GREEN-ON" red="70" green="255" blue="70">
+            </color>
+          </color>
+        </state>
+      </states>
+    </widget>
+    <widget type="polyline" version="2.0.0">
+      <name>Polyline_34</name>
+      <x>149</x>
+      <y>707</y>
+      <width>120</width>
+      <line_color>
+        <color name="GROUP-BORDER" red="150" green="155" blue="151">
+        </color>
+      </line_color>
+      <points>
+        <point x="0.0" y="20.0">
+        </point>
+        <point x="0.0" y="0.0">
+        </point>
+      </points>
+    </widget>
+    <widget type="polyline" version="2.0.0">
+      <name>Polyline_35</name>
+      <x>149</x>
+      <y>870</y>
+      <width>120</width>
+      <line_color>
+        <color name="GROUP-BORDER" red="150" green="155" blue="151">
+        </color>
+      </line_color>
+      <points>
+        <point x="0.0" y="20.0">
+        </point>
+        <point x="0.0" y="0.0">
+        </point>
+      </points>
+    </widget>
+    <widget type="polyline" version="2.0.0">
+      <name>Polyline_36</name>
+      <x>149</x>
+      <y>690</y>
+      <width>130</width>
+      <line_width>2</line_width>
+      <line_color>
+        <color name="GROUP-BORDER" red="150" green="155" blue="151">
+        </color>
+      </line_color>
+      <arrows>2</arrows>
+      <points>
+        <point x="0.0" y="20.0">
+        </point>
+        <point x="0.0" y="10.0">
+        </point>
+        <point x="0.0" y="0.0">
+        </point>
+      </points>
+    </widget>
+    <widget type="polyline" version="2.0.0">
+      <name>Polyline_37</name>
+      <x>149</x>
+      <y>525</y>
+      <width>130</width>
+      <line_width>2</line_width>
+      <line_color>
+        <color name="GROUP-BORDER" red="150" green="155" blue="151">
+        </color>
+      </line_color>
+      <arrows>2</arrows>
+      <points>
+        <point x="0.0" y="20.0">
+        </point>
+        <point x="0.0" y="0.0">
+        </point>
+      </points>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_315</name>
+      <class>HEADER3</class>
+      <text>Filament</text>
+      <x>19</x>
+      <y>725</y>
+      <width>260</width>
+      <height>35</height>
+      <font use_class="true">
+        <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
+        </font>
+      </font>
+      <background_color use_class="true">
+        <color name="Background" red="220" green="225" blue="221">
+        </color>
+      </background_color>
+      <transparent use_class="true">true</transparent>
+      <horizontal_alignment>1</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+    </widget>
+    <widget type="multi_state_led" version="2.0.0">
+      <name>LED (Multi State)_36</name>
+      <pv_name>$(PREFIX):CPU-FILMISUCND-RB</pv_name>
+      <x>59</x>
+      <y>766</y>
+      <width>180</width>
+      <height>25</height>
+      <line_color>
+        <color name="Background" red="220" green="225" blue="221">
+        </color>
+      </line_color>
+      <square>true</square>
+      <states>
+        <state>
+          <value>0</value>
+          <label>FIL-SUP-MISS</label>
+          <color>
+            <color name="Off" red="90" green="110" blue="90">
+            </color>
+          </color>
+        </state>
+        <state>
+          <value>1</value>
+          <label>FIL-SUP-OK</label>
+          <color>
+            <color name="OK" red="61" green="216" blue="61">
+            </color>
+          </color>
+        </state>
+      </states>
+    </widget>
+    <widget type="multi_state_led" version="2.0.0">
+      <name>LED (Multi State)_37</name>
+      <pv_name>$(PREFIX):CPU-FILMIPRCND-RB</pv_name>
+      <x>59</x>
+      <y>820</y>
+      <width>180</width>
+      <height>25</height>
+      <line_color>
+        <color name="Background" red="220" green="225" blue="221">
+        </color>
+      </line_color>
+      <square>true</square>
+      <states>
+        <state>
+          <value>0</value>
+          <label>FIL-PRE-MISS</label>
+          <color>
+            <color name="Off" red="90" green="110" blue="90">
+            </color>
+          </color>
+        </state>
+        <state>
+          <value>1</value>
+          <label>FIL-PRE-OK</label>
+          <color>
+            <color name="OK" red="61" green="216" blue="61">
+            </color>
+          </color>
+        </state>
+      </states>
+    </widget>
+    <widget type="action_button" version="3.0.0">
+      <name>Action Button_40</name>
+      <actions>
+        <action type="write_pv">
+          <pv_name>$(pv_name)</pv_name>
+          <value>1</value>
+          <description>Set Filament ON</description>
+        </action>
+      </actions>
+      <pv_name>$(PREFIX):CPU-FIL</pv_name>
+      <text>FIL</text>
+      <x>39</x>
+      <y>790</y>
+      <width>220</width>
+      <tooltip>$(actions)</tooltip>
+    </widget>
+    <widget type="multi_state_led" version="2.0.0">
+      <name>LED (Multi State)_24</name>
+      <pv_name>$(PREFIX):CPU-ACTSTATE-RB</pv_name>
+      <x>71</x>
+      <y>796</y>
+      <states>
+        <state>
+          <value>0</value>
+          <label></label>
+          <color>
+            <color name="LED-GREEN-OFF" red="90" green="110" blue="90">
+            </color>
+          </color>
+        </state>
+        <state>
+          <value>1</value>
+          <label></label>
+          <color>
+            <color name="LED-GREEN-OFF" red="90" green="110" blue="90">
+            </color>
+          </color>
+        </state>
+        <state>
+          <value>2</value>
+          <label></label>
+          <color>
+            <color name="LED-GREEN-OFF" red="90" green="110" blue="90">
+            </color>
+          </color>
+        </state>
+        <state>
+          <value>3</value>
+          <label></label>
+          <color>
+            <color name="LED-YELLOW-ON" red="255" green="235" blue="17">
+            </color>
+          </color>
+        </state>
+        <state>
+          <value>4</value>
+          <label></label>
+          <color>
+            <color name="LED-GREEN-ON" red="70" green="255" blue="70">
+            </color>
+          </color>
+        </state>
+        <state>
+          <value>5</value>
+          <label></label>
+          <color>
+            <color name="LED-GREEN-ON" red="70" green="255" blue="70">
+            </color>
+          </color>
+        </state>
+        <state>
+          <value>6</value>
+          <label></label>
+          <color>
+            <color name="LED-GREEN-ON" red="70" green="255" blue="70">
+            </color>
+          </color>
+        </state>
+        <state>
+          <value>7</value>
+          <label></label>
+          <color>
+            <color name="LED-GREEN-ON" red="70" green="255" blue="70">
+            </color>
+          </color>
+        </state>
+        <state>
+          <value>8</value>
+          <label></label>
+          <color>
+            <color name="LED-GREEN-ON" red="70" green="255" blue="70">
+            </color>
+          </color>
+        </state>
+        <state>
+          <value>9</value>
+          <label></label>
+          <color>
+            <color name="LED-GREEN-ON" red="70" green="255" blue="70">
+            </color>
+          </color>
+        </state>
+        <state>
+          <value>10</value>
+          <label></label>
+          <color>
+            <color name="LED-GREEN-ON" red="70" green="255" blue="70">
+            </color>
+          </color>
+        </state>
+      </states>
+    </widget>
+    <widget type="polyline" version="2.0.0">
+      <name>Polyline_38</name>
+      <x>149</x>
+      <y>855</y>
+      <width>130</width>
+      <line_width>2</line_width>
+      <line_color>
+        <color name="GROUP-BORDER" red="150" green="155" blue="151">
+        </color>
+      </line_color>
+      <arrows>2</arrows>
+      <points>
+        <point x="0.0" y="20.0">
+        </point>
+        <point x="0.0" y="0.0">
+        </point>
+      </points>
+    </widget>
+    <widget type="polyline" version="2.0.0">
+      <name>Polyline_39</name>
+      <x>149</x>
+      <y>1037</y>
+      <width>120</width>
+      <line_color>
+        <color name="GROUP-BORDER" red="150" green="155" blue="151">
+        </color>
+      </line_color>
+      <points>
+        <point x="0.0" y="20.0">
+        </point>
+        <point x="0.0" y="0.0">
+        </point>
+      </points>
+    </widget>
+    <widget type="polyline" version="2.0.0">
+      <name>Polyline_40</name>
+      <x>149</x>
+      <y>327</y>
+      <width>130</width>
+      <line_color>
+        <color name="GROUP-BORDER" red="150" green="155" blue="151">
+        </color>
+      </line_color>
+      <points>
+        <point x="0.0" y="20.0">
+        </point>
+        <point x="0.0" y="0.0">
+        </point>
+      </points>
+    </widget>
+    <widget type="polyline" version="2.0.0">
+      <name>Polyline_41</name>
+      <x>149</x>
+      <y>542</y>
+      <width>130</width>
+      <line_color>
+        <color name="GROUP-BORDER" red="150" green="155" blue="151">
+        </color>
+      </line_color>
+      <points>
+        <point x="0.0" y="20.0">
+        </point>
+        <point x="0.0" y="0.0">
+        </point>
+      </points>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_316</name>
+      <class>HEADER3</class>
+      <text>Auxiliary</text>
+      <x>19</x>
+      <y>891</y>
+      <width>260</width>
+      <height>35</height>
+      <font use_class="true">
+        <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
+        </font>
+      </font>
+      <background_color use_class="true">
+        <color name="Background" red="220" green="225" blue="221">
+        </color>
+      </background_color>
+      <transparent use_class="true">true</transparent>
+      <horizontal_alignment>1</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+    </widget>
+    <widget type="multi_state_led" version="2.0.0">
+      <name>LED (Multi State)_30</name>
+      <pv_name>$(PREFIX):CPU-RFENMISUCND-RB</pv_name>
+      <x>59</x>
+      <y>236</y>
+      <width>180</width>
+      <height>25</height>
+      <line_color>
+        <color name="Background" red="220" green="225" blue="221">
+        </color>
+      </line_color>
+      <square>true</square>
+      <states>
+        <state>
+          <value>0</value>
+          <label>PRE-RFON-SUP-MISS</label>
+          <color>
+            <color name="Off" red="90" green="110" blue="90">
+            </color>
+          </color>
+        </state>
+        <state>
+          <value>1</value>
+          <label>PRE-RFON-SUP-OK</label>
+          <color>
+            <color name="OK" red="61" green="216" blue="61">
+            </color>
+          </color>
+        </state>
+      </states>
+    </widget>
+    <widget type="multi_state_led" version="2.0.0">
+      <name>LED (Multi State)_31</name>
+      <pv_name>$(PREFIX):CPU-RFENMIPRCND-RB</pv_name>
+      <x>59</x>
+      <y>290</y>
+      <width>180</width>
+      <height>25</height>
+      <line_color>
+        <color name="Background" red="220" green="225" blue="221">
+        </color>
+      </line_color>
+      <square>true</square>
+      <states>
+        <state>
+          <value>0</value>
+          <label>PRE-RFON-PRE-MISS</label>
+          <color>
+            <color name="Off" red="90" green="110" blue="90">
+            </color>
+          </color>
+        </state>
+        <state>
+          <value>1</value>
+          <label>PRE-RFON-PRE-OK</label>
+          <color>
+            <color name="OK" red="61" green="216" blue="61">
+            </color>
+          </color>
+        </state>
+      </states>
+    </widget>
+    <widget type="action_button" version="3.0.0">
+      <name>Action Button_41</name>
+      <actions execute_as_one="true">
+        <action type="write_pv">
+          <pv_name>$(pv_name)</pv_name>
+          <value>1</value>
+          <description>Set amplifier to RFON</description>
+        </action>
+      </actions>
+      <pv_name>$(PREFIX):CPU-RFON</pv_name>
+      <text>SIM Pre-RF ON</text>
+      <x>39</x>
+      <y>260</y>
+      <width>220</width>
+      <tooltip>$(actions)</tooltip>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_317</name>
+      <class>HEADER3</class>
+      <text>Amplifier</text>
+      <x>19</x>
+      <y>1055</y>
+      <width>260</width>
+      <height>35</height>
+      <font use_class="true">
+        <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
+        </font>
+      </font>
+      <background_color use_class="true">
+        <color name="Background" red="220" green="225" blue="221">
+        </color>
+      </background_color>
+      <transparent use_class="true">true</transparent>
+      <horizontal_alignment>1</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+    </widget>
+    <widget type="multi_state_led" version="2.0.0">
+      <name>LED (Multi State)_38</name>
+      <pv_name>$(PREFIX):CPU-AUXMIPRCND-RB</pv_name>
+      <x>59</x>
+      <y>985</y>
+      <width>180</width>
+      <height>25</height>
+      <line_color>
+        <color name="Background" red="220" green="225" blue="221">
+        </color>
+      </line_color>
+      <square>true</square>
+      <states>
+        <state>
+          <value>0</value>
+          <label>AUX-PRE-MISS</label>
+          <color>
+            <color name="Off" red="90" green="110" blue="90">
+            </color>
+          </color>
+        </state>
+        <state>
+          <value>1</value>
+          <label>AUX-PRE-OK</label>
+          <color>
+            <color name="OK" red="61" green="216" blue="61">
+            </color>
+          </color>
+        </state>
+      </states>
+    </widget>
+    <widget type="multi_state_led" version="2.0.0">
+      <name>LED (Multi State)_39</name>
+      <pv_name>$(PREFIX):CPU-AUXMISUCND-RB</pv_name>
+      <x>59</x>
+      <y>931</y>
+      <width>180</width>
+      <height>25</height>
+      <line_color>
+        <color name="Background" red="220" green="225" blue="221">
+        </color>
+      </line_color>
+      <square>true</square>
+      <states>
+        <state>
+          <value>0</value>
+          <label>AUX-SUP-MISS</label>
+          <color>
+            <color name="Off" red="90" green="110" blue="90">
+            </color>
+          </color>
+        </state>
+        <state>
+          <value>1</value>
+          <label>AUX-SUP-OK</label>
+          <color>
+            <color name="OK" red="61" green="216" blue="61">
+            </color>
+          </color>
+        </state>
+      </states>
+    </widget>
+    <widget type="action_button" version="3.0.0">
+      <name>Action Button_42</name>
+      <actions>
+        <action type="write_pv">
+          <pv_name>$(pv_name)</pv_name>
+          <value>1</value>
+          <description>Set amplifier to AUX</description>
+        </action>
+      </actions>
+      <pv_name>$(PREFIX):CPU-AUX</pv_name>
+      <text>AUX</text>
+      <x>39</x>
+      <y>956</y>
+      <width>220</width>
+      <tooltip>$(actions)</tooltip>
+    </widget>
+    <widget type="multi_state_led" version="2.0.0">
+      <name>LED (Multi State)_25</name>
+      <pv_name>$(PREFIX):CPU-ACTSTATE-RB</pv_name>
+      <x>71</x>
+      <y>963</y>
+      <states>
+        <state>
+          <value>0</value>
+          <label></label>
+          <color>
+            <color name="Off" red="90" green="110" blue="90">
+            </color>
+          </color>
+        </state>
+        <state>
+          <value>1</value>
+          <label></label>
+          <color>
+            <color name="On" red="70" green="255" blue="70">
+            </color>
+          </color>
+        </state>
+        <state>
+          <value>2</value>
+          <label></label>
+          <color>
+            <color name="LED-GREEN-ON" red="70" green="255" blue="70">
+            </color>
+          </color>
+        </state>
+        <state>
+          <value>3</value>
+          <label></label>
+          <color>
+            <color name="LED-GREEN-ON" red="70" green="255" blue="70">
+            </color>
+          </color>
+        </state>
+        <state>
+          <value>4</value>
+          <label></label>
+          <color>
+            <color name="LED-GREEN-ON" red="70" green="255" blue="70">
+            </color>
+          </color>
+        </state>
+        <state>
+          <value>5</value>
+          <label></label>
+          <color>
+            <color name="LED-GREEN-ON" red="70" green="255" blue="70">
+            </color>
+          </color>
+        </state>
+        <state>
+          <value>6</value>
+          <label></label>
+          <color>
+            <color name="LED-GREEN-ON" red="70" green="255" blue="70">
+            </color>
+          </color>
+        </state>
+        <state>
+          <value>7</value>
+          <label></label>
+          <color>
+            <color name="LED-GREEN-ON" red="70" green="255" blue="70">
+            </color>
+          </color>
+        </state>
+        <state>
+          <value>8</value>
+          <label></label>
+          <color>
+            <color name="LED-GREEN-ON" red="70" green="255" blue="70">
+            </color>
+          </color>
+        </state>
+        <state>
+          <value>9</value>
+          <label></label>
+          <color>
+            <color name="LED-GREEN-ON" red="70" green="255" blue="70">
+            </color>
+          </color>
+        </state>
+        <state>
+          <value>10</value>
+          <label></label>
+          <color>
+            <color name="LED-GREEN-ON" red="70" green="255" blue="70">
+            </color>
+          </color>
+        </state>
+      </states>
+    </widget>
+    <widget type="multi_state_led" version="2.0.0">
+      <name>LED (Multi State)_32</name>
+      <pv_name>$(PREFIX):CPU-HVENMISUCND-RB</pv_name>
+      <x>59</x>
+      <y>443</y>
+      <width>180</width>
+      <height>25</height>
+      <line_color>
+        <color name="Background" red="220" green="225" blue="221">
+        </color>
+      </line_color>
+      <square>true</square>
+      <states>
+        <state>
+          <value>0</value>
+          <label>PRE-HVON-SUP-MISS</label>
+          <color>
+            <color name="Off" red="90" green="110" blue="90">
+            </color>
+          </color>
+        </state>
+        <state>
+          <value>1</value>
+          <label>PRE-HVON-SUP-OK</label>
+          <color>
+            <color name="OK" red="61" green="216" blue="61">
+            </color>
+          </color>
+        </state>
+      </states>
+    </widget>
+    <widget type="multi_state_led" version="2.0.0">
+      <name>LED (Multi State)_33</name>
+      <pv_name>$(PREFIX):CPU-HVENMIPRCND-RB</pv_name>
+      <x>59</x>
+      <y>497</y>
+      <width>180</width>
+      <height>25</height>
+      <line_color>
+        <color name="Background" red="220" green="225" blue="221">
+        </color>
+      </line_color>
+      <square>true</square>
+      <states>
+        <state>
+          <value>0</value>
+          <label>PRE-HVON-PRE-MISS</label>
+          <color>
+            <color name="Off" red="90" green="110" blue="90">
+            </color>
+          </color>
+        </state>
+        <state>
+          <value>1</value>
+          <label>PRE-HVON-PRE-OK</label>
+          <color>
+            <color name="OK" red="61" green="216" blue="61">
+            </color>
+          </color>
+        </state>
+      </states>
+    </widget>
+    <widget type="action_button" version="3.0.0">
+      <name>Action Button_43</name>
+      <actions execute_as_one="true">
+        <action type="write_pv">
+          <pv_name>$(pv_name)</pv_name>
+          <value>1</value>
+          <description>Set amplifier to HVON</description>
+        </action>
+      </actions>
+      <pv_name>$(PREFIX):CPU-HVON</pv_name>
+      <text>SIM Pre-HV ON</text>
+      <x>39</x>
+      <y>467</y>
+      <width>220</width>
+      <tooltip>$(actions)</tooltip>
+    </widget>
+    <widget type="multi_state_led" version="2.0.0">
+      <name>LED (Multi State)_26</name>
+      <pv_name>$(PREFIX):CPU-ACTSTATE-RB</pv_name>
+      <x>71</x>
+      <y>473</y>
+      <states>
+        <state>
+          <value>0</value>
+          <label></label>
+          <color>
+            <color name="LED-GREEN-OFF" red="90" green="110" blue="90">
+            </color>
+          </color>
+        </state>
+        <state>
+          <value>1</value>
+          <label></label>
+          <color>
+            <color name="LED-GREEN-OFF" red="90" green="110" blue="90">
+            </color>
+          </color>
+        </state>
+        <state>
+          <value>2</value>
+          <label></label>
+          <color>
+            <color name="LED-GREEN-OFF" red="90" green="110" blue="90">
+            </color>
+          </color>
+        </state>
+        <state>
+          <value>3</value>
+          <label></label>
+          <color>
+            <color name="LED-GREEN-OFF" red="90" green="110" blue="90">
+            </color>
+          </color>
+        </state>
+        <state>
+          <value>4</value>
+          <label></label>
+          <color>
+            <color name="LED-GREEN-OFF" red="90" green="110" blue="90">
+            </color>
+          </color>
+        </state>
+        <state>
+          <value>5</value>
+          <label></label>
+          <color>
+            <color name="LED-GREEN-OFF" red="90" green="110" blue="90">
+            </color>
+          </color>
+        </state>
+        <state>
+          <value>6</value>
+          <label></label>
+          <color>
+            <color name="LED-GREEN-OFF" red="90" green="110" blue="90">
+            </color>
+          </color>
+        </state>
+        <state>
+          <value>7</value>
+          <label></label>
+          <color>
+            <color name="LED-YELLOW-ON" red="255" green="235" blue="17">
+            </color>
+          </color>
+        </state>
+        <state>
+          <value>8</value>
+          <label></label>
+          <color>
+            <color name="LED-GREEN-ON" red="70" green="255" blue="70">
+            </color>
+          </color>
+        </state>
+        <state>
+          <value>9</value>
+          <label></label>
+          <color>
+            <color name="LED-GREEN-ON" red="70" green="255" blue="70">
+            </color>
+          </color>
+        </state>
+        <state>
+          <value>10</value>
+          <label></label>
+          <color>
+            <color name="LED-GREEN-ON" red="70" green="255" blue="70">
+            </color>
+          </color>
+        </state>
+      </states>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_318</name>
+      <class>HEADER3</class>
+      <text>HV</text>
+      <x>19</x>
+      <y>345</y>
+      <width>260</width>
+      <height>30</height>
+      <font use_class="true">
+        <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
+        </font>
+      </font>
+      <background_color use_class="true">
+        <color name="Background" red="220" green="225" blue="221">
+        </color>
+      </background_color>
+      <transparent use_class="true">true</transparent>
+      <horizontal_alignment>1</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+    </widget>
+    <widget type="multi_state_led" version="2.0.0">
+      <name>LED (Multi State)_27</name>
+      <pv_name>$(PREFIX):$(DEVICE):IdleToHVPreCond</pv_name>
+      <x>59</x>
+      <y>404</y>
+      <width>180</width>
+      <height>25</height>
+      <line_color>
+        <color name="Background" red="220" green="225" blue="221">
+        </color>
+      </line_color>
+      <square>true</square>
+      <states>
+        <state>
+          <value>0</value>
+          <label>HVON-FIM-PRE-MISS</label>
+          <color>
+            <color name="Off" red="90" green="110" blue="90">
+            </color>
+          </color>
+        </state>
+        <state>
+          <value>1</value>
+          <label>HVON-FIM-PRE-OK</label>
+          <color>
+            <color name="OK" red="61" green="216" blue="61">
+            </color>
+          </color>
+        </state>
+      </states>
+    </widget>
+    <widget type="action_button" version="3.0.0">
+      <name>Action Button_44</name>
+      <actions execute_as_one="true">
+        <action type="write_pv">
+          <pv_name>$(PREFIX):$(DEVICE):INTS</pv_name>
+          <value>2</value>
+          <description>Write PV</description>
+        </action>
+      </actions>
+      <pv_name>$(PREFIX):CPU-HVON</pv_name>
+      <text>FIM HVON</text>
+      <x>39</x>
+      <y>375</y>
+      <width>220</width>
+      <rules>
+        <rule name="enableRule" prop_id="enabled" out_exp="false">
+          <exp bool_exp="pv0 &gt; 6">
+            <value>true</value>
+          </exp>
+          <pv_name>$(PREFIX):CPU-ACTSTATE-RB</pv_name>
+        </rule>
+      </rules>
+      <tooltip>$(actions)</tooltip>
+      <enabled>false</enabled>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_319</name>
+      <class>SECTION</class>
+      <text>Set State SIM:</text>
+      <y>72</y>
+      <width>120</width>
+      <height>30</height>
+      <font>
+        <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+        </font>
+      </font>
+      <horizontal_alignment>2</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+      <actions>
+      </actions>
+    </widget>
+    <widget type="action_button" version="3.0.0">
+      <name>Action Button_45</name>
+      <actions>
+        <action type="write_pv">
+          <pv_name>$(pv_name)</pv_name>
+          <value>1</value>
+          <description>Set amplifier to OFF</description>
+        </action>
+      </actions>
+      <pv_name>$(PREFIX):CPU-OFF</pv_name>
+      <text>Amplifier OFF</text>
+      <x>39</x>
+      <y>1097</y>
+      <width>220</width>
+      <tooltip>$(actions)</tooltip>
+    </widget>
+    <widget type="multi_state_led" version="2.0.0">
+      <name>LED (Multi State)_28</name>
+      <pv_name>$(PREFIX):CPU-ACTSTATE-RB</pv_name>
+      <x>71</x>
+      <y>266</y>
+      <states>
+        <state>
+          <value>0</value>
+          <label></label>
+          <color>
+            <color name="LED-GREEN-OFF" red="90" green="110" blue="90">
+            </color>
+          </color>
+        </state>
+        <state>
+          <value>1</value>
+          <label></label>
+          <color>
+            <color name="LED-GREEN-OFF" red="90" green="110" blue="90">
+            </color>
+          </color>
+        </state>
+        <state>
+          <value>2</value>
+          <label></label>
+          <color>
+            <color name="LED-GREEN-OFF" red="90" green="110" blue="90">
+            </color>
+          </color>
+        </state>
+        <state>
+          <value>3</value>
+          <label></label>
+          <color>
+            <color name="LED-GREEN-OFF" red="90" green="110" blue="90">
+            </color>
+          </color>
+        </state>
+        <state>
+          <value>4</value>
+          <label></label>
+          <color>
+            <color name="LED-GREEN-OFF" red="90" green="110" blue="90">
+            </color>
+          </color>
+        </state>
+        <state>
+          <value>5</value>
+          <label></label>
+          <color>
+            <color name="LED-GREEN-OFF" red="90" green="110" blue="90">
+            </color>
+          </color>
+        </state>
+        <state>
+          <value>6</value>
+          <label></label>
+          <color>
+            <color name="LED-GREEN-OFF" red="90" green="110" blue="90">
+            </color>
+          </color>
+        </state>
+        <state>
+          <value>7</value>
+          <label></label>
+          <color>
+            <color name="LED-GREEN-OFF" red="90" green="110" blue="90">
+            </color>
+          </color>
+        </state>
+        <state>
+          <value>8</value>
+          <label></label>
+          <color>
+            <color name="LED-GREEN-OFF" red="90" green="110" blue="90">
+            </color>
+          </color>
+        </state>
+        <state>
+          <value>9</value>
+          <label></label>
+          <color>
+            <color name="LED-YELLOW-ON" red="255" green="235" blue="17">
+            </color>
+          </color>
+        </state>
+        <state>
+          <value>10</value>
+          <label></label>
+          <color>
+            <color name="LED-GREEN-ON" red="70" green="255" blue="70">
+            </color>
+          </color>
+        </state>
+      </states>
+    </widget>
+  </widget>
+</display>
diff --git a/NON-APPROVED/TS2/ts2-010rfc-rflps/support/overviewRFQ.bob b/NON-APPROVED/TS2/ts2-010rfc-rflps/support/overviewRFQ.bob
index 4e7499daa6ff34ff74a8c2a4524755ad45b71ee5..52ebe6efaafd0232b6f1704f574f7b6ab83f1d13 100644
--- a/NON-APPROVED/TS2/ts2-010rfc-rflps/support/overviewRFQ.bob
+++ b/NON-APPROVED/TS2/ts2-010rfc-rflps/support/overviewRFQ.bob
@@ -153,43 +153,6 @@
     <corner_width>10</corner_width>
     <corner_height>10</corner_height>
   </widget>
-  <widget type="label" version="2.0.0">
-    <name>Header</name>
-    <text>NULL</text>
-    <x>20</x>
-    <y>10</y>
-    <width>412</width>
-    <height>43</height>
-    <font>
-      <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
-      </font>
-    </font>
-    <foreground_color>
-      <color name="IO Label" red="0" green="0" blue="0">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color name="Read_Background" red="230" green="235" blue="232">
-      </color>
-    </background_color>
-    <vertical_alignment>1</vertical_alignment>
-    <actions>
-    </actions>
-    <scripts>
-      <script file="EmbeddedPy">
-        <text><![CDATA[# Embedded python script
-from org.csstudio.display.builder.runtime.script import PVUtil, ScriptUtil
-
-if PVUtil.getString(pvs[0]) == 'TS2-010RFC:RFS02':
-	widget.setPropertyValue('text', "System 01 TS2")
-elif PVUtil.getString(pvs[0]) == 'TS2-010RFC:RFS01':
-	widget.setPropertyValue('text', "System 02 TS2")
-else:
-	widget.setPropertyValue('text', "TEST")]]></text>
-        <pv_name>loc://rflpsPrefix</pv_name>
-      </script>
-    </scripts>
-  </widget>
   <widget type="rectangle" version="2.0.0">
     <name>Solenoids</name>
     <x>555</x>
@@ -233,7 +196,7 @@ else:
   </widget>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_169</name>
-    <pv_name>$(PREFIX):SOLENOID01-INT-RB</pv_name>
+    <pv_name>$(PREFIX):RFS-SOLENOID01-INT-RB</pv_name>
     <x>623</x>
     <y>626</y>
     <width>90</width>
@@ -275,7 +238,7 @@ else:
   </widget>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_170</name>
-    <pv_name>$(PREFIX):SolPS-110:Cur</pv_name>
+    <pv_name>$(PREFIX):RFS-SolPS-110:Cur</pv_name>
     <x>623</x>
     <y>656</y>
     <width>90</width>
@@ -288,7 +251,7 @@ else:
   </widget>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_171</name>
-    <pv_name>$(PREFIX):SOLENOID01-VMON-RB</pv_name>
+    <pv_name>$(PREFIX):RFS-SOLENOID01-VMON-RB</pv_name>
     <x>801</x>
     <y>626</y>
     <width>80</width>
@@ -302,7 +265,7 @@ else:
   </widget>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_172</name>
-    <pv_name>$(PREFIX):SOLENOID01-IMON-RB</pv_name>
+    <pv_name>$(PREFIX):RFS-SOLENOID01-IMON-RB</pv_name>
     <x>801</x>
     <y>656</y>
     <width>80</width>
@@ -336,7 +299,7 @@ else:
       <action type="open_display">
         <file>rflpsSOLsignal.bob</file>
         <macros>
-          <SGNL>SOLENOID01</SGNL>
+          <SGNL>RFS-SOLENOID01</SGNL>
         </macros>
         <target>window</target>
         <description>Change PV settings</description>
@@ -406,7 +369,7 @@ else:
   </widget>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_173</name>
-    <pv_name>$(PREFIX):SOLENOID02-INT-RB</pv_name>
+    <pv_name>$(PREFIX):RFS-SOLENOID02-INT-RB</pv_name>
     <x>623</x>
     <y>710</y>
     <width>90</width>
@@ -432,7 +395,7 @@ else:
   </widget>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_174</name>
-    <pv_name>$(PREFIX):SOLENOID02-VMON-RB</pv_name>
+    <pv_name>$(PREFIX):RFS-SOLENOID02-VMON-RB</pv_name>
     <x>801</x>
     <y>710</y>
     <width>80</width>
@@ -446,7 +409,7 @@ else:
   </widget>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_175</name>
-    <pv_name>$(PREFIX):SOLENOID02-IMON-RB</pv_name>
+    <pv_name>$(PREFIX):RFS-SOLENOID02-IMON-RB</pv_name>
     <x>801</x>
     <y>740</y>
     <width>80</width>
@@ -460,7 +423,7 @@ else:
   </widget>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_176</name>
-    <pv_name>$(PREFIX):SolPS-120:Cur</pv_name>
+    <pv_name>$(PREFIX):RFS-SolPS-120:Cur</pv_name>
     <x>623</x>
     <y>740</y>
     <width>90</width>
@@ -477,7 +440,7 @@ else:
       <action type="open_display">
         <file>rflpsSOLsignal.bob</file>
         <macros>
-          <SGNL>SOLENOID02</SGNL>
+          <SGNL>RFS-SOLENOID02</SGNL>
         </macros>
         <target>window</target>
         <description>Change PV settings</description>
@@ -547,7 +510,7 @@ else:
   </widget>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_177</name>
-    <pv_name>$(PREFIX):SOLENOID03-INT-RB</pv_name>
+    <pv_name>$(PREFIX):RFS-SOLENOID03-INT-RB</pv_name>
     <x>623</x>
     <y>793</y>
     <width>90</width>
@@ -573,7 +536,7 @@ else:
   </widget>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_178</name>
-    <pv_name>$(PREFIX):SolPS-130:Cur</pv_name>
+    <pv_name>$(PREFIX):RFS-SolPS-130:Cur</pv_name>
     <x>623</x>
     <y>823</y>
     <width>90</width>
@@ -586,7 +549,7 @@ else:
   </widget>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_179</name>
-    <pv_name>$(PREFIX):SOLENOID03-VMON-RB</pv_name>
+    <pv_name>$(PREFIX):RFS-SOLENOID03-VMON-RB</pv_name>
     <x>801</x>
     <y>793</y>
     <width>80</width>
@@ -600,7 +563,7 @@ else:
   </widget>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_180</name>
-    <pv_name>$(PREFIX):SOLENOID03-IMON-RB</pv_name>
+    <pv_name>$(PREFIX):RFS-SOLENOID03-IMON-RB</pv_name>
     <x>801</x>
     <y>823</y>
     <width>80</width>
@@ -618,7 +581,7 @@ else:
       <action type="open_display">
         <file>rflpsSOLsignal.bob</file>
         <macros>
-          <SGNL>SOLENOID03</SGNL>
+          <SGNL>RFS-SOLENOID03</SGNL>
         </macros>
         <target>window</target>
         <description>Change PV settings</description>
@@ -708,7 +671,7 @@ else:
   </widget>
   <widget type="led" version="2.0.0">
     <name>LED_64</name>
-    <pv_name>$(PREFIX):Oil-001:Leak</pv_name>
+    <pv_name>$(PREFIX):RFS-Kly-110:Oil-Leak</pv_name>
     <x>621</x>
     <y>935</y>
     <off_color>
@@ -728,7 +691,7 @@ else:
   </widget>
   <widget type="led" version="2.0.0">
     <name>LED_65</name>
-    <pv_name>$(PREFIX):Oil-001:LS</pv_name>
+    <pv_name>$(PREFIX):RFS-Kly-110:Oil-LS</pv_name>
     <x>621</x>
     <y>965</y>
     <off_color>
@@ -784,7 +747,7 @@ else:
   </widget>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_219</name>
-    <pv_name>$(PREFIX):Mod-110:Cur:WaveHigh</pv_name>
+    <pv_name>$(PREFIX):RFS-Mod-110:Cur:WaveHigh</pv_name>
     <x>1849</x>
     <y>274</y>
     <width>80</width>
@@ -797,7 +760,7 @@ else:
   </widget>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_220</name>
-    <pv_name>$(PREFIX):Mod-110:Vol:WaveHigh</pv_name>
+    <pv_name>$(PREFIX):RFS-Mod-110:Vol:WaveHigh</pv_name>
     <x>1849</x>
     <y>306</y>
     <width>80</width>
@@ -828,7 +791,7 @@ else:
   </widget>
   <widget type="led" version="2.0.0">
     <name>LED_59</name>
-    <pv_name>$(PREFIX):Mod-110:Fault:FastIntStat</pv_name>
+    <pv_name>$(PREFIX):RFS-Mod-110:Fault:FastIntStat</pv_name>
     <x>1704</x>
     <y>236</y>
     <off_color>
@@ -916,7 +879,7 @@ else:
   </widget>
   <widget type="led" version="2.0.0">
     <name>LED_61</name>
-    <pv_name>$(PREFIX):VacPS-002:HVON</pv_name>
+    <pv_name>$(PREFIX):RFS-VacPS-120:HVON</pv_name>
     <x>34</x>
     <y>866</y>
     <off_color>
@@ -939,7 +902,7 @@ HV Output Enable</tooltip>
   </widget>
   <widget type="led" version="2.0.0">
     <name>LED_62</name>
-    <pv_name>$(PREFIX):VacPS-120:I-SP:FastIntStat</pv_name>
+    <pv_name>$(PREFIX):RFS-VacPS-120:I-SP:FastIntStat</pv_name>
     <x>34</x>
     <y>896</y>
     <off_color>
@@ -962,7 +925,7 @@ FIM Interlock</tooltip>
   </widget>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_208</name>
-    <pv_name>$(PREFIX):VacPS-002:I</pv_name>
+    <pv_name>$(PREFIX):RFS-VacPS-120:I</pv_name>
     <x>144</x>
     <y>930</y>
     <width>70</width>
@@ -1096,7 +1059,7 @@ widget.setPropertyValue('tooltip', pvs[0].getName() +
   </widget>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_206</name>
-    <pv_name>$(PREFIX):VacPS-001:I</pv_name>
+    <pv_name>$(PREFIX):RFS-VacPS-110:I</pv_name>
     <x>144</x>
     <y>658</y>
     <width>70</width>
@@ -1168,7 +1131,7 @@ widget.setPropertyValue('tooltip', pvs[0].getName() +
   </widget>
   <widget type="led" version="2.0.0">
     <name>LED_57</name>
-    <pv_name>$(PREFIX):VacPS-110:I-SP:FastIntStat</pv_name>
+    <pv_name>$(PREFIX):RFS-VacPS-110:I-SP:FastIntStat</pv_name>
     <x>32</x>
     <y>624</y>
     <off_color>
@@ -1237,7 +1200,7 @@ FIM Interlock</tooltip>
   </widget>
   <widget type="led" version="2.0.0">
     <name>LED_56</name>
-    <pv_name>$(PREFIX):VacPS-001:HVON</pv_name>
+    <pv_name>$(PREFIX):RFS-VacPS-110:HVON</pv_name>
     <x>32</x>
     <y>594</y>
     <off_color>
@@ -1260,7 +1223,7 @@ HV Output Enable</tooltip>
   </widget>
   <widget type="led" version="2.0.0">
     <name>LED_28</name>
-    <pv_name>$(PREFIX):ADR-201001:ItckStat:FastIntStat</pv_name>
+    <pv_name>$(PREFIX):RFS-ADR-201001:ItckStat:FastIntStat</pv_name>
     <x>34</x>
     <y>282</y>
     <off_color>
@@ -1280,7 +1243,7 @@ HV Output Enable</tooltip>
   </widget>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_64</name>
-    <pv_name>$(PREFIX):ADR-201001:ItckStat.DESC</pv_name>
+    <pv_name>$(PREFIX):RFS-ADR-201001:ItckStat.DESC</pv_name>
     <x>63</x>
     <y>282</y>
     <width>240</width>
@@ -1290,7 +1253,7 @@ HV Output Enable</tooltip>
   </widget>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_65</name>
-    <pv_name>$(PREFIX):DirC-110:PwrFwdPA:WaveHigh</pv_name>
+    <pv_name>$(PREFIX):RFS-DirC-110:PwrFwdPA:WaveHigh</pv_name>
     <x>259</x>
     <y>348</y>
     <width>80</width>
@@ -1303,7 +1266,7 @@ HV Output Enable</tooltip>
   </widget>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_66</name>
-    <pv_name>$(PREFIX):DirC-110:PwrRflctPA:WaveHigh</pv_name>
+    <pv_name>$(PREFIX):RFS-DirC-110:PwrRflctPA:WaveHigh</pv_name>
     <x>259</x>
     <y>381</y>
     <width>80</width>
@@ -1316,7 +1279,7 @@ HV Output Enable</tooltip>
   </widget>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_67</name>
-    <pv_name>$(PREFIX):DirC-110:PwrFwdPA.DESC</pv_name>
+    <pv_name>$(PREFIX):RFS-DirC-110:PwrFwdPA.DESC</pv_name>
     <x>34</x>
     <y>348</y>
     <width>214</width>
@@ -1348,7 +1311,7 @@ HV Output Enable</tooltip>
   </widget>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_68</name>
-    <pv_name>$(PREFIX):DirC-110:PwrRflctPA.DESC</pv_name>
+    <pv_name>$(PREFIX):RFS-DirC-110:PwrRflctPA.DESC</pv_name>
     <x>34</x>
     <y>381</y>
     <width>214</width>
@@ -1417,7 +1380,7 @@ HV Output Enable</tooltip>
   </widget>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_209</name>
-    <pv_name>$(PREFIX):ADR-201003:ItckStat.DESC</pv_name>
+    <pv_name>$(PREFIX):RFS-ADR-201003:ItckStat.DESC</pv_name>
     <x>493</x>
     <y>99</y>
     <width>240</width>
@@ -1427,7 +1390,7 @@ HV Output Enable</tooltip>
   </widget>
   <widget type="led" version="2.0.0">
     <name>LED_63</name>
-    <pv_name>$(PREFIX):ADR-201003:ItckStat:FastIntStat</pv_name>
+    <pv_name>$(PREFIX):RFS-ADR-201003:ItckStat:FastIntStat</pv_name>
     <x>464</x>
     <y>99</y>
     <off_color>
@@ -1461,7 +1424,7 @@ HV Output Enable</tooltip>
   </widget>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_115</name>
-    <pv_name>$(PREFIX):VacPS-001:I</pv_name>
+    <pv_name>$(PREFIX):RFS-VacPS-110:I</pv_name>
     <x>335</x>
     <y>589</y>
     <width>70</width>
@@ -1488,7 +1451,7 @@ HV Output Enable</tooltip>
         </exp>
         <exp bool_exp="(pv0==0) &amp;&amp; (pv1==0)">
           <value>
-            <color name="Read_Background" red="230" green="235" blue="232">
+            <color name="OK" red="61" green="216" blue="61">
             </color>
           </value>
         </exp>
@@ -1532,7 +1495,7 @@ widget.setPropertyValue('tooltip', pvs[0].getName() +
   </widget>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_116</name>
-    <pv_name>$(PREFIX):VacPS-002:I</pv_name>
+    <pv_name>$(PREFIX):RFS-VacPS-120:I</pv_name>
     <x>335</x>
     <y>866</y>
     <width>70</width>
@@ -1653,7 +1616,7 @@ widget.setPropertyValue('tooltip', pvs[0].getName() +
   </widget>
   <widget type="led" version="2.0.0">
     <name>LED_3</name>
-    <pv_name>$(PREFIX):SiC-001:GreenLight</pv_name>
+    <pv_name>$(PREFIX):RFS-SiC-110:GreenLight</pv_name>
     <x>1725</x>
     <y>125</y>
     <height>30</height>
@@ -1669,7 +1632,7 @@ widget.setPropertyValue('tooltip', pvs[0].getName() +
   </widget>
   <widget type="led" version="2.0.0">
     <name>LED_2</name>
-    <pv_name>$(PREFIX):SiC-001:YellowLight</pv_name>
+    <pv_name>$(PREFIX):RFS-SiC-110:YellowLight</pv_name>
     <x>1725</x>
     <y>95</y>
     <height>30</height>
@@ -1685,7 +1648,7 @@ widget.setPropertyValue('tooltip', pvs[0].getName() +
   </widget>
   <widget type="led" version="2.0.0">
     <name>LED</name>
-    <pv_name>$(PREFIX):SiC-001:RedLight</pv_name>
+    <pv_name>$(PREFIX):RFS-SiC-110:RedLight</pv_name>
     <x>1725</x>
     <y>65</y>
     <height>30</height>
@@ -1714,7 +1677,7 @@ widget.setPropertyValue('tooltip', pvs[0].getName() +
         <exp bool_exp="pv0==1">
           <value>images/klystron and circulators/Oil_Tank_Level_red_v01.png</value>
         </exp>
-        <pv_name>$(PREFIX):Oil-001:LS</pv_name>
+        <pv_name>$(PREFIX):RFS-Kly-110:Oil-LS</pv_name>
       </rule>
     </rules>
   </widget>
@@ -1736,8 +1699,8 @@ widget.setPropertyValue('tooltip', pvs[0].getName() +
         <exp bool_exp="(pv0==0) &amp;&amp; (pv1==0)">
           <value>images/klystron and circulators/solenoid_2_green_v01.png</value>
         </exp>
-        <pv_name>$(PREFIX):SOLENOID01-INT-RB</pv_name>
-        <pv_name>$(PREFIX):SOLENOID01-WRN-RB</pv_name>
+        <pv_name>$(PREFIX):RFS-SOLENOID01-INT-RB</pv_name>
+        <pv_name>$(PREFIX):RFS-SOLENOID01-WRN-RB</pv_name>
       </rule>
     </rules>
   </widget>
@@ -1759,8 +1722,8 @@ widget.setPropertyValue('tooltip', pvs[0].getName() +
         <exp bool_exp="(pv0==0) &amp;&amp; (pv1==0)">
           <value>images/klystron and circulators/solenoid_3_green_v01.png</value>
         </exp>
-        <pv_name>$(PREFIX):SOLENOID02-INT-RB</pv_name>
-        <pv_name>$(PREFIX):SOLENOID02-WRN-RB</pv_name>
+        <pv_name>$(PREFIX):RFS-SOLENOID02-INT-RB</pv_name>
+        <pv_name>$(PREFIX):RFS-SOLENOID02-WRN-RB</pv_name>
       </rule>
     </rules>
   </widget>
@@ -1782,8 +1745,8 @@ widget.setPropertyValue('tooltip', pvs[0].getName() +
         <exp bool_exp="(pv0==0) &amp;&amp; (pv1==0)">
           <value>images/klystron and circulators/solenoid_3_green_v01.png</value>
         </exp>
-        <pv_name>$(PREFIX):SOLENOID03-INT-RB</pv_name>
-        <pv_name>$(PREFIX):SOLENOID03-WRN-RB</pv_name>
+        <pv_name>$(PREFIX):RFS-SOLENOID03-INT-RB</pv_name>
+        <pv_name>$(PREFIX):RFS-SOLENOID03-WRN-RB</pv_name>
       </rule>
     </rules>
   </widget>
@@ -1829,7 +1792,7 @@ widget.setPropertyValue('tooltip', pvs[0].getName() +
   </widget>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_69</name>
-    <pv_name>$(PREFIX):VacPS-110:I-SP.DESC</pv_name>
+    <pv_name>$(PREFIX):RFS-VacPS-110:I-SP.DESC</pv_name>
     <x>62</x>
     <y>624</y>
     <width>148</width>
@@ -1839,7 +1802,7 @@ widget.setPropertyValue('tooltip', pvs[0].getName() +
   </widget>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_70</name>
-    <pv_name>$(PREFIX):VacPS-001:HVON.DESC</pv_name>
+    <pv_name>$(PREFIX):RFS-VacPS-110:HVON.DESC</pv_name>
     <x>62</x>
     <y>594</y>
     <width>148</width>
@@ -1849,7 +1812,7 @@ widget.setPropertyValue('tooltip', pvs[0].getName() +
   </widget>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_75</name>
-    <pv_name>$(PREFIX):VacPS-002:HVON.DESC</pv_name>
+    <pv_name>$(PREFIX):RFS-VacPS-120:HVON.DESC</pv_name>
     <x>62</x>
     <y>866</y>
     <width>148</width>
@@ -1859,7 +1822,7 @@ widget.setPropertyValue('tooltip', pvs[0].getName() +
   </widget>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_76</name>
-    <pv_name>$(PREFIX):VacPS-120:I-SP.DESC</pv_name>
+    <pv_name>$(PREFIX):RFS-VacPS-120:I-SP.DESC</pv_name>
     <x>62</x>
     <y>896</y>
     <width>148</width>
@@ -1869,7 +1832,7 @@ widget.setPropertyValue('tooltip', pvs[0].getName() +
   </widget>
   <widget type="led" version="2.0.0">
     <name>LED_67</name>
-    <pv_name>$(PREFIX):ADR-201002:ItckStat:FastIntStat</pv_name>
+    <pv_name>$(PREFIX):RFS-ADR-201002:ItckStat:FastIntStat</pv_name>
     <x>464</x>
     <y>66</y>
     <off_color>
@@ -1889,7 +1852,7 @@ widget.setPropertyValue('tooltip', pvs[0].getName() +
   </widget>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_210</name>
-    <pv_name>$(PREFIX):ADR-201002:ItckStat.DESC</pv_name>
+    <pv_name>$(PREFIX):RFS-ADR-201002:ItckStat.DESC</pv_name>
     <x>493</x>
     <y>66</y>
     <width>240</width>
@@ -1899,7 +1862,7 @@ widget.setPropertyValue('tooltip', pvs[0].getName() +
   </widget>
   <widget type="led" version="2.0.0">
     <name>LED_69</name>
-    <pv_name>$(PREFIX):ADR-110:ItlckStat:FastIntStat</pv_name>
+    <pv_name>$(PREFIX):RFS-ADR-110:ItlckStat:FastIntStat</pv_name>
     <x>34</x>
     <y>315</y>
     <off_color>
@@ -1919,7 +1882,7 @@ widget.setPropertyValue('tooltip', pvs[0].getName() +
   </widget>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_222</name>
-    <pv_name>$(PREFIX):ADR-110:ItlckStat.DESC</pv_name>
+    <pv_name>$(PREFIX):RFS-ADR-110:ItlckStat.DESC</pv_name>
     <x>63</x>
     <y>315</y>
     <width>240</width>
@@ -2007,7 +1970,7 @@ widget.setPropertyValue('tooltip', pvs[0].getName() +
   </widget>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_225</name>
-    <pv_name>$(PREFIX):Oil-001:Leak.DESC</pv_name>
+    <pv_name>$(PREFIX):RFS-Kly-110:Oil-Leak.DESC</pv_name>
     <x>651</x>
     <y>935</y>
     <width>165</width>
@@ -2017,7 +1980,7 @@ widget.setPropertyValue('tooltip', pvs[0].getName() +
   </widget>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_226</name>
-    <pv_name>$(PREFIX):Oil-001:LS.DESC</pv_name>
+    <pv_name>$(PREFIX):RFS-Kly-110:Oil-LS.DESC</pv_name>
     <x>651</x>
     <y>965</y>
     <width>165</width>
@@ -2071,7 +2034,7 @@ widget.setPropertyValue('tooltip', pvs[0].getName() +
   </widget>
   <widget type="led" version="2.0.0">
     <name>LED_79</name>
-    <pv_name>$(PREFIX):FILAMENT-ON-RB</pv_name>
+    <pv_name>$(PREFIX):RFS-FILAMENT-ON-RB</pv_name>
     <x>1702</x>
     <y>740</y>
   </widget>
@@ -2085,7 +2048,7 @@ widget.setPropertyValue('tooltip', pvs[0].getName() +
   </widget>
   <widget type="led" version="2.0.0">
     <name>LED_80</name>
-    <pv_name>$(PREFIX):FILAMENT-INT-RB</pv_name>
+    <pv_name>$(PREFIX):RFS-FILAMENT-INT-RB</pv_name>
     <x>1702</x>
     <y>770</y>
     <off_color>
@@ -2107,7 +2070,7 @@ widget.setPropertyValue('tooltip', pvs[0].getName() +
   </widget>
   <widget type="led" version="2.0.0">
     <name>LED_81</name>
-    <pv_name>$(PREFIX):FILAMENT-WRN-RB</pv_name>
+    <pv_name>$(PREFIX):RFS-FILAMENT-WRN-RB</pv_name>
     <x>1702</x>
     <y>800</y>
   </widget>
@@ -2129,7 +2092,7 @@ widget.setPropertyValue('tooltip', pvs[0].getName() +
   </widget>
   <widget type="led" version="2.0.0">
     <name>LED_84</name>
-    <pv_name>$(PREFIX):FILAMENT-OPMODE-RB</pv_name>
+    <pv_name>$(PREFIX):RFS-FILAMENT-OPMODE-RB</pv_name>
     <x>1702</x>
     <y>830</y>
   </widget>
@@ -2173,13 +2136,13 @@ h, m = divmod(minutes, 60)
 #pv = "%02d:%02d" % (minutes, seconds)
 
 widget.setPropertyValue('text', "%d:%02d:%02d" % (h, m, s))]]></text>
-        <pv_name>$(PREFIX):FILAMENT-TWARMTLEFT-RB</pv_name>
+        <pv_name>$(PREFIX):RFS-FILAMENT-TWARMTLEFT-RB</pv_name>
       </script>
     </scripts>
   </widget>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_237</name>
-    <pv_name>$(PREFIX):FILAMENT-WMON-RB</pv_name>
+    <pv_name>$(PREFIX):RFS-FILAMENT-WMON-RB</pv_name>
     <x>1817</x>
     <y>930</y>
     <format>1</format>
@@ -2201,7 +2164,7 @@ widget.setPropertyValue('text', "%d:%02d:%02d" % (h, m, s))]]></text>
   </widget>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_238</name>
-    <pv_name>$(PREFIX):FILAMENT-IMON-RB</pv_name>
+    <pv_name>$(PREFIX):RFS-FILAMENT-IMON-RB</pv_name>
     <x>1817</x>
     <y>870</y>
     <format>1</format>
@@ -2222,7 +2185,7 @@ widget.setPropertyValue('text', "%d:%02d:%02d" % (h, m, s))]]></text>
   </widget>
   <widget type="textupdate" version="2.0.0">
     <name>sp1_current_read_5</name>
-    <pv_name>$(PREFIX):FILAMENT-ISETPOINT-RB</pv_name>
+    <pv_name>$(PREFIX):RFS-FILAMENT-ISETPOINT-RB</pv_name>
     <x>1817</x>
     <y>900</y>
     <format>1</format>
@@ -2239,7 +2202,7 @@ widget.setPropertyValue('text', "%d:%02d:%02d" % (h, m, s))]]></text>
       <action type="open_display">
         <file>rflpsFILsignalv2.bob</file>
         <macros>
-          <SGNL>FILAMENT</SGNL>
+          <SGNL>RFS-FILAMENT</SGNL>
         </macros>
         <target>window</target>
         <description>Open expert display</description>
@@ -2253,7 +2216,7 @@ widget.setPropertyValue('text', "%d:%02d:%02d" % (h, m, s))]]></text>
   </widget>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_231</name>
-    <pv_name>$(PREFIX):SiC-001:RedLight.DESC</pv_name>
+    <pv_name>$(PREFIX):RFS-SiC-110:RedLight.DESC</pv_name>
     <x>1760</x>
     <y>70</y>
     <width>165</width>
@@ -2263,7 +2226,7 @@ widget.setPropertyValue('text', "%d:%02d:%02d" % (h, m, s))]]></text>
   </widget>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_232</name>
-    <pv_name>$(PREFIX):SiC-001:YellowLight.DESC</pv_name>
+    <pv_name>$(PREFIX):RFS-SiC-110:YellowLight.DESC</pv_name>
     <x>1760</x>
     <y>100</y>
     <width>165</width>
@@ -2273,7 +2236,7 @@ widget.setPropertyValue('text', "%d:%02d:%02d" % (h, m, s))]]></text>
   </widget>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_233</name>
-    <pv_name>$(PREFIX):SiC-001:GreenLight.DESC</pv_name>
+    <pv_name>$(PREFIX):RFS-SiC-110:GreenLight.DESC</pv_name>
     <x>1760</x>
     <y>130</y>
     <width>165</width>
@@ -2283,7 +2246,7 @@ widget.setPropertyValue('text', "%d:%02d:%02d" % (h, m, s))]]></text>
   </widget>
   <widget type="led" version="2.0.0">
     <name>LED_66</name>
-    <pv_name>$(PREFIX):DA-001:Ready</pv_name>
+    <pv_name>$(PREFIX):RFS-PAmp-110:Ready</pv_name>
     <x>1691</x>
     <y>433</y>
     <off_color>
@@ -2303,7 +2266,7 @@ widget.setPropertyValue('text', "%d:%02d:%02d" % (h, m, s))]]></text>
   </widget>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_227</name>
-    <pv_name>$(PREFIX):DA-001:Ready.DESC</pv_name>
+    <pv_name>$(PREFIX):RFS-PAmp-110:Ready.DESC</pv_name>
     <x>1721</x>
     <y>433</y>
     <width>165</width>
@@ -2373,7 +2336,7 @@ widget.setPropertyValue('text', "%d:%02d:%02d" % (h, m, s))]]></text>
   </widget>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_183</name>
-    <pv_name>$(PREFIX):SS01-STAT-RB</pv_name>
+    <pv_name>$(PREFIX):RFS-SS01-STAT-RB</pv_name>
     <x>1027</x>
     <y>68</y>
     <width>90</width>
@@ -2411,7 +2374,7 @@ widget.setPropertyValue('text', "%d:%02d:%02d" % (h, m, s))]]></text>
   </widget>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_229</name>
-    <pv_name>$(PREFIX):PSS-001-Shutter.DESC</pv_name>
+    <pv_name>$(PREFIX):RFS-SIM-110:PSS-Shutter.DESC</pv_name>
     <x>945</x>
     <y>155</y>
     <width>165</width>
@@ -2421,7 +2384,7 @@ widget.setPropertyValue('text', "%d:%02d:%02d" % (h, m, s))]]></text>
   </widget>
   <widget type="led" version="2.0.0">
     <name>LED_68</name>
-    <pv_name>$(PREFIX):PSS-001-Shutter</pv_name>
+    <pv_name>$(PREFIX):RFS-SIM-110:PSS-Shutter</pv_name>
     <x>915</x>
     <y>155</y>
     <off_color>
@@ -2451,7 +2414,7 @@ widget.setPropertyValue('text', "%d:%02d:%02d" % (h, m, s))]]></text>
   </widget>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_230</name>
-    <pv_name>$(PREFIX):SS02-STAT-RB</pv_name>
+    <pv_name>$(PREFIX):RFS-SS02-STAT-RB</pv_name>
     <x>1027</x>
     <y>98</y>
     <width>90</width>
@@ -2489,7 +2452,7 @@ widget.setPropertyValue('text', "%d:%02d:%02d" % (h, m, s))]]></text>
   </widget>
   <widget type="led" version="2.0.0">
     <name>LED_4</name>
-    <pv_name>$(PREFIX):FILAMENT-LOCREM-RB</pv_name>
+    <pv_name>$(PREFIX):RFS-FILAMENT-LOCREM-RB</pv_name>
     <x>1815</x>
     <y>690</y>
     <width>100</width>
@@ -2507,7 +2470,7 @@ widget.setPropertyValue('text', "%d:%02d:%02d" % (h, m, s))]]></text>
   </widget>
   <widget type="multi_state_led" version="2.0.0">
     <name>LED (Multi State)</name>
-    <pv_name>$(PREFIX):FILAMENT-CURRENTSTAT-RB</pv_name>
+    <pv_name>$(PREFIX):RFS-FILAMENT-CURRENTSTAT-RB</pv_name>
     <x>1815</x>
     <y>655</y>
     <width>100</width>
@@ -2585,7 +2548,7 @@ widget.setPropertyValue('text', "%d:%02d:%02d" % (h, m, s))]]></text>
   </widget>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_184</name>
-    <pv_name>$(PREFIX):SS01-PIN1-RB</pv_name>
+    <pv_name>$(PREFIX):RFS-SS01-PIN1-RB</pv_name>
     <x>1186</x>
     <y>63</y>
     <width>90</width>
@@ -2623,7 +2586,7 @@ widget.setPropertyValue('text', "%d:%02d:%02d" % (h, m, s))]]></text>
   </widget>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_185</name>
-    <pv_name>$(PREFIX):SS01-PIN3-RB</pv_name>
+    <pv_name>$(PREFIX):RFS-SS01-PIN3-RB</pv_name>
     <x>1186</x>
     <y>93</y>
     <width>90</width>
@@ -2661,7 +2624,7 @@ widget.setPropertyValue('text', "%d:%02d:%02d" % (h, m, s))]]></text>
   </widget>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_186</name>
-    <pv_name>$(PREFIX):SS01-PIN7-RB</pv_name>
+    <pv_name>$(PREFIX):RFS-SS01-PIN7-RB</pv_name>
     <x>1186</x>
     <y>123</y>
     <width>90</width>
@@ -2699,7 +2662,7 @@ widget.setPropertyValue('text', "%d:%02d:%02d" % (h, m, s))]]></text>
   </widget>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_187</name>
-    <pv_name>$(PREFIX):SS01-PIN9-RB</pv_name>
+    <pv_name>$(PREFIX):RFS-SS01-PIN9-RB</pv_name>
     <x>1186</x>
     <y>153</y>
     <width>90</width>
@@ -2737,7 +2700,7 @@ widget.setPropertyValue('text', "%d:%02d:%02d" % (h, m, s))]]></text>
   </widget>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_188</name>
-    <pv_name>$(PREFIX):SS02-PIN1-RB</pv_name>
+    <pv_name>$(PREFIX):RFS-SS02-PIN1-RB</pv_name>
     <x>1304</x>
     <y>63</y>
     <width>90</width>
@@ -2775,7 +2738,7 @@ widget.setPropertyValue('text', "%d:%02d:%02d" % (h, m, s))]]></text>
   </widget>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_189</name>
-    <pv_name>$(PREFIX):SS02-PIN3-RB</pv_name>
+    <pv_name>$(PREFIX):RFS-SS02-PIN3-RB</pv_name>
     <x>1304</x>
     <y>93</y>
     <width>90</width>
@@ -2813,7 +2776,7 @@ widget.setPropertyValue('text', "%d:%02d:%02d" % (h, m, s))]]></text>
   </widget>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_190</name>
-    <pv_name>$(PREFIX):SS02-PIN7-RB</pv_name>
+    <pv_name>$(PREFIX):RFS-SS02-PIN7-RB</pv_name>
     <x>1304</x>
     <y>123</y>
     <width>90</width>
@@ -2851,7 +2814,7 @@ widget.setPropertyValue('text', "%d:%02d:%02d" % (h, m, s))]]></text>
   </widget>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_191</name>
-    <pv_name>$(PREFIX):SS02-PIN9-RB</pv_name>
+    <pv_name>$(PREFIX):RFS-SS02-PIN9-RB</pv_name>
     <x>1304</x>
     <y>153</y>
     <width>90</width>
@@ -2905,14 +2868,14 @@ widget.setPropertyValue('text', "%d:%02d:%02d" % (h, m, s))]]></text>
         <exp bool_exp="(pv0==0) &amp;&amp; (pv1==0)">
           <value>images/klystron and circulators/Oil_Tank_green_v01.png</value>
         </exp>
-        <pv_name>$(PREFIX):Oil-002:TT-INT-RB</pv_name>
-        <pv_name>$(PREFIX):Oil-002:TT-WRN-RB</pv_name>
+        <pv_name>$(PREFIX):RFS-Kly-110:Oil-Tmp-INT-RB</pv_name>
+        <pv_name>$(PREFIX):RFS-Kly-110:Oil-Tmp-WRN-RB</pv_name>
       </rule>
     </rules>
   </widget>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_228</name>
-    <pv_name>$(PREFIX):Oil-002:TT</pv_name>
+    <pv_name>$(PREFIX):RFS-Kly-110:Oil-Tmp</pv_name>
     <x>429</x>
     <y>901</y>
     <width>80</width>
@@ -2930,7 +2893,7 @@ widget.setPropertyValue('text', "%d:%02d:%02d" % (h, m, s))]]></text>
       <action type="open_display">
         <file>rflpsAFsignal.bob</file>
         <macros>
-          <SGNL>$(PREFIX):Oil-120:TT</SGNL>
+          <SGNL>$(PREFIX):RFS-Oil-120:TT</SGNL>
         </macros>
         <target>standalone</target>
         <description>Open Display</description>
@@ -2940,7 +2903,7 @@ widget.setPropertyValue('text', "%d:%02d:%02d" % (h, m, s))]]></text>
   </widget>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_214</name>
-    <pv_name>$(PREFIX):DirC-110:PwrFwdL1.DESC</pv_name>
+    <pv_name>$(PREFIX):RFS-DirC-110:PwrFwdL1.DESC</pv_name>
     <x>463</x>
     <y>136</y>
     <width>225</width>
@@ -2972,7 +2935,7 @@ widget.setPropertyValue('text', "%d:%02d:%02d" % (h, m, s))]]></text>
   </widget>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_215</name>
-    <pv_name>$(PREFIX):DirC-110:PwrFwdL1:WaveHigh</pv_name>
+    <pv_name>$(PREFIX):RFS-DirC-110:PwrFwdL1:WaveHigh</pv_name>
     <x>693</x>
     <y>136</y>
     <width>80</width>
@@ -2985,7 +2948,7 @@ widget.setPropertyValue('text', "%d:%02d:%02d" % (h, m, s))]]></text>
   </widget>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_216</name>
-    <pv_name>$(PREFIX):DirC-110:PwrRflctL2.DESC</pv_name>
+    <pv_name>$(PREFIX):RFS-DirC-110:PwrRflctL2.DESC</pv_name>
     <x>849</x>
     <y>367</y>
     <width>225</width>
@@ -3017,7 +2980,7 @@ widget.setPropertyValue('text', "%d:%02d:%02d" % (h, m, s))]]></text>
   </widget>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_217</name>
-    <pv_name>$(PREFIX):DirC-110:PwrRflctL2:WaveHigh</pv_name>
+    <pv_name>$(PREFIX):RFS-DirC-110:PwrRflctL2:WaveHigh</pv_name>
     <x>1079</x>
     <y>367</y>
     <width>80</width>
@@ -3037,7 +3000,7 @@ widget.setPropertyValue('text', "%d:%02d:%02d" % (h, m, s))]]></text>
   </widget>
   <widget type="led" version="2.0.0">
     <name>LED_75</name>
-    <pv_name>$(PREFIX):ADR-201004:ItckStat:FastIntStat</pv_name>
+    <pv_name>$(PREFIX):RFS-ADR-201004:ItckStat:FastIntStat</pv_name>
     <x>865</x>
     <y>401</y>
     <off_color>
@@ -3057,7 +3020,7 @@ widget.setPropertyValue('text', "%d:%02d:%02d" % (h, m, s))]]></text>
   </widget>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_218</name>
-    <pv_name>$(PREFIX):DirC-110:PwrFwdL2.DESC</pv_name>
+    <pv_name>$(PREFIX):RFS-DirC-110:PwrFwdL2.DESC</pv_name>
     <x>849</x>
     <y>333</y>
     <width>225</width>
@@ -3089,7 +3052,7 @@ widget.setPropertyValue('text', "%d:%02d:%02d" % (h, m, s))]]></text>
   </widget>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_221</name>
-    <pv_name>$(PREFIX):DirC-110:PwrFwdL2:WaveHigh</pv_name>
+    <pv_name>$(PREFIX):RFS-DirC-110:PwrFwdL2:WaveHigh</pv_name>
     <x>1079</x>
     <y>333</y>
     <width>80</width>
@@ -3147,7 +3110,7 @@ widget.setPropertyValue('text', "%d:%02d:%02d" % (h, m, s))]]></text>
   </widget>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_251</name>
-    <pv_name>$(PREFIX):DirC-110:PwrFwdC2:WaveHigh</pv_name>
+    <pv_name>$(PREFIX):RFS-DirC-110:PwrFwdC2:WaveHigh</pv_name>
     <x>1571</x>
     <y>739</y>
     <width>80</width>
@@ -3160,7 +3123,7 @@ widget.setPropertyValue('text', "%d:%02d:%02d" % (h, m, s))]]></text>
   </widget>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_252</name>
-    <pv_name>$(PREFIX):DirC-110:PwrRflctC2.DESC</pv_name>
+    <pv_name>$(PREFIX):RFS-DirC-110:PwrRflctC2.DESC</pv_name>
     <x>1338</x>
     <y>773</y>
     <width>225</width>
@@ -3192,7 +3155,7 @@ widget.setPropertyValue('text', "%d:%02d:%02d" % (h, m, s))]]></text>
   </widget>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_253</name>
-    <pv_name>$(PREFIX):DirC-110:PwrRflctC2:WaveHigh</pv_name>
+    <pv_name>$(PREFIX):RFS-DirC-110:PwrRflctC2:WaveHigh</pv_name>
     <x>1571</x>
     <y>773</y>
     <width>80</width>
@@ -3205,7 +3168,7 @@ widget.setPropertyValue('text', "%d:%02d:%02d" % (h, m, s))]]></text>
   </widget>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_254</name>
-    <pv_name>$(PREFIX):DirC-110:PwrFwdC2.DESC</pv_name>
+    <pv_name>$(PREFIX):RFS-DirC-110:PwrFwdC2.DESC</pv_name>
     <x>1338</x>
     <y>739</y>
     <width>225</width>
@@ -3292,7 +3255,7 @@ widget.setPropertyValue('text', "%d:%02d:%02d" % (h, m, s))]]></text>
   </widget>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_255</name>
-    <pv_name>$(PREFIX):DirC-110:PwrFwdC1:WaveHigh</pv_name>
+    <pv_name>$(PREFIX):RFS-DirC-110:PwrFwdC1:WaveHigh</pv_name>
     <x>1568</x>
     <y>589</y>
     <width>80</width>
@@ -3305,7 +3268,7 @@ widget.setPropertyValue('text', "%d:%02d:%02d" % (h, m, s))]]></text>
   </widget>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_256</name>
-    <pv_name>$(PREFIX):DirC-110:PwrRflctC1.DESC</pv_name>
+    <pv_name>$(PREFIX):RFS-DirC-110:PwrRflctC1.DESC</pv_name>
     <x>1336</x>
     <y>623</y>
     <width>225</width>
@@ -3337,7 +3300,7 @@ widget.setPropertyValue('text', "%d:%02d:%02d" % (h, m, s))]]></text>
   </widget>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_257</name>
-    <pv_name>$(PREFIX):DirC-110:PwrRflctC1:WaveHigh</pv_name>
+    <pv_name>$(PREFIX):RFS-DirC-110:PwrRflctC1:WaveHigh</pv_name>
     <x>1568</x>
     <y>623</y>
     <width>80</width>
@@ -3350,7 +3313,7 @@ widget.setPropertyValue('text', "%d:%02d:%02d" % (h, m, s))]]></text>
   </widget>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_258</name>
-    <pv_name>$(PREFIX):DirC-110:PwrFwdC1.DESC</pv_name>
+    <pv_name>$(PREFIX):RFS-DirC-110:PwrFwdC1.DESC</pv_name>
     <x>1336</x>
     <y>589</y>
     <width>225</width>
@@ -3382,7 +3345,7 @@ widget.setPropertyValue('text', "%d:%02d:%02d" % (h, m, s))]]></text>
   </widget>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_260</name>
-    <pv_name>$(PREFIX):DirC-110:PwrFwdDA.DESC</pv_name>
+    <pv_name>$(PREFIX):RFS-DirC-110:PwrFwdDA.DESC</pv_name>
     <x>1691</x>
     <y>398</y>
     <width>146</width>
@@ -3414,7 +3377,7 @@ widget.setPropertyValue('text', "%d:%02d:%02d" % (h, m, s))]]></text>
   </widget>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_261</name>
-    <pv_name>$(PREFIX):DirC-110:PwrFwdDA:WaveHigh</pv_name>
+    <pv_name>$(PREFIX):RFS-DirC-110:PwrFwdDA:WaveHigh</pv_name>
     <x>1849</x>
     <y>398</y>
     <width>80</width>
diff --git a/NON-APPROVED/TS2/ts2-010rfc-rflps/support/overviewSystem01.bob b/NON-APPROVED/TS2/ts2-010rfc-rflps/support/overviewSystem01.bob
index 67354e0cf37545732302d137ed13b458894d7749..5dd2169265829a18abbe198c2228018544dbf3dd 100644
--- a/NON-APPROVED/TS2/ts2-010rfc-rflps/support/overviewSystem01.bob
+++ b/NON-APPROVED/TS2/ts2-010rfc-rflps/support/overviewSystem01.bob
@@ -117,41 +117,6 @@
     <corner_width>10</corner_width>
     <corner_height>10</corner_height>
   </widget>
-  <widget type="label" version="2.0.0">
-    <name>Header</name>
-    <text>NULL</text>
-    <x>20</x>
-    <y>10</y>
-    <width>412</width>
-    <height>43</height>
-    <font>
-      <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
-      </font>
-    </font>
-    <foreground_color>
-      <color name="IO Label" red="0" green="0" blue="0">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color name="Read_Background" red="230" green="235" blue="232">
-      </color>
-    </background_color>
-    <vertical_alignment>1</vertical_alignment>
-    <actions>
-    </actions>
-    <scripts>
-      <script file="EmbeddedPy">
-        <text><![CDATA[# Embedded python script
-from org.csstudio.display.builder.runtime.script import PVUtil, ScriptUtil
-
-if PVUtil.getString(pvs[0]) == 'TS2-010RFC:RFS01':
-    widget.setPropertyValue('text', "NOT DEFINED")
-else:
-    widget.setPropertyValue('text', "System 01 TS2")]]></text>
-        <pv_name>loc://rflpsPrefix</pv_name>
-      </script>
-    </scripts>
-  </widget>
   <widget type="rectangle" version="2.0.0">
     <name>Solenoids</name>
     <x>555</x>
diff --git a/NON-APPROVED/TS2/ts2-010rfc-rflps/support/overviewSystem02.bob b/NON-APPROVED/TS2/ts2-010rfc-rflps/support/overviewSystem02.bob
index 17bc2515152d581b689b91a384e089c8bba52bde..46a4b7e8b6df5f8642591eadabc3d4b09d737e77 100644
--- a/NON-APPROVED/TS2/ts2-010rfc-rflps/support/overviewSystem02.bob
+++ b/NON-APPROVED/TS2/ts2-010rfc-rflps/support/overviewSystem02.bob
@@ -117,41 +117,6 @@
     <corner_width>10</corner_width>
     <corner_height>10</corner_height>
   </widget>
-  <widget type="label" version="2.0.0">
-    <name>Header</name>
-    <text>NULL</text>
-    <x>20</x>
-    <y>10</y>
-    <width>412</width>
-    <height>43</height>
-    <font>
-      <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
-      </font>
-    </font>
-    <foreground_color>
-      <color name="IO Label" red="0" green="0" blue="0">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color name="Read_Background" red="230" green="235" blue="232">
-      </color>
-    </background_color>
-    <vertical_alignment>1</vertical_alignment>
-    <actions>
-    </actions>
-    <scripts>
-      <script file="EmbeddedPy">
-        <text><![CDATA[# Embedded python script
-from org.csstudio.display.builder.runtime.script import PVUtil, ScriptUtil
-
-if PVUtil.getString(pvs[0]) == 'TS2-010RFC:RFS02':
-    widget.setPropertyValue('text', "NOT DEFINED")
-else:
-    widget.setPropertyValue('text', "System 02 TS2")]]></text>
-        <pv_name>loc://rflpsPrefix</pv_name>
-      </script>
-    </scripts>
-  </widget>
   <widget type="rectangle" version="2.0.0">
     <name>Solenoids</name>
     <x>555</x>
diff --git a/NON-APPROVED/TS2/ts2-010rfc-rflps/support/rflpsAFRFQ.bob b/NON-APPROVED/TS2/ts2-010rfc-rflps/support/rflpsAFRFQ.bob
index d54fac94fd70eadd94df64903d8a5527ba10b307..b8b04a364976d2260d2b2637f336800cb1b77aab 100644
--- a/NON-APPROVED/TS2/ts2-010rfc-rflps/support/rflpsAFRFQ.bob
+++ b/NON-APPROVED/TS2/ts2-010rfc-rflps/support/rflpsAFRFQ.bob
@@ -138,23 +138,48 @@
       </widget>
       <widget type="combo" version="2.0.0">
         <name>Scan Combo</name>
-        <pv_name>loc://rflpsAnalogSignal("Oil-002:TT")</pv_name>
+        <pv_name>loc://rflpsAnalogSignal("RFS-Kly-110:Oil-Tmp")</pv_name>
         <x>20</x>
         <y>20</y>
         <width>261</width>
         <actions>
         </actions>
         <items>
-          <item>Oil-002:TT</item>
-          <item>VacPS-001:I</item>
-          <item>VacPS-002:I</item>
-          <item>Kly-001:OP-Win-Temp</item>
+          <item>RFS-Kly-110:Oil-Tmp</item>
+          <item>RFS-IW202_Spare</item>
+          <item>RFS-IW204_Spare</item>
+          <item>RFS-IW206_Spare</item>
+          <item>RFS-VacPS-110:I</item>
+          <item>RFS-VacPS-120:I</item>
+          <item>RFS-Kly-110:OPWin-Tmp</item>
+          <item>RFS-IW246_Spare</item>
+          <item>RFS-IW248_Spare</item>
+          <item>RFS-IW250_Spare</item>
+          <item>RFS-IW252_Spare</item>
+          <item>RFS-IW254_Spare</item>
+          <item>RFS-Circ-120:WtrC-Tmp</item>
+          <item>RFS-Load-130:WtrC-Tmp</item>
+          <item>RFS-Load-120:WtrC-Tmp</item>
+          <item>RFS-Kly-110:Coll-WtrC-Tmp</item>
+          <item>RFS-Kly-110:Body-WtrC-Tmp</item>
+          <item>RFS-Kly-110:Sol-WtrC-Tmp</item>
+          <item>RFS-Kly-110:Oil-WtrC-Tmp</item>
+          <item>RFS-IW430_Spare</item>
+          <item>RFS-Kly-110:CWM-WtrC-Tmp</item>
+          <item>RFS-Kly-110:CWH-WtrC-Tmp</item>
+          <item>RFS-Kly-110:CWM-WtrC-Prs</item>
+          <item>RFS-Kly-110:CWH-WtrC-Prs</item>
+          <item>RFS-Load-120:WtrC-Flw</item>
+          <item>RFS-Kly-110:Coll-WtrC-Flw</item>
+          <item>RFS-IW444_Spare</item>
+          <item>RFS-IW446_Spare</item>
+          <item>RFS-Coll-110:SW_CALC</item>
         </items>
         <items_from_pv>false</items_from_pv>
       </widget>
       <widget type="textentry" version="3.0.0">
         <name>Scan</name>
-        <pv_name>loc://rflpsAnalogSignal("Oil-002:TT")</pv_name>
+        <pv_name>loc://rflpsAnalogSignal("RFS-Kly-110:Oil-Tmp")</pv_name>
         <x>300</x>
         <y>20</y>
         <width>357</width>
diff --git a/NON-APPROVED/TS2/ts2-010rfc-rflps/support/rflpsAFSystem01.bob b/NON-APPROVED/TS2/ts2-010rfc-rflps/support/rflpsAFSystem01.bob
index 5c4654fae3a7e4df781e2ab150799b8a25aff3b1..19442a1646b8e806391a1cbbe11eb481f7e0c819 100644
--- a/NON-APPROVED/TS2/ts2-010rfc-rflps/support/rflpsAFSystem01.bob
+++ b/NON-APPROVED/TS2/ts2-010rfc-rflps/support/rflpsAFSystem01.bob
@@ -145,31 +145,31 @@
         <actions>
         </actions>
         <items>
-        	<item>KlyOil-002:TT</item>       
-        	<item>KlyBody-001:TT</item>
-        	<item>KlyBody-002:TT</item>
-        	<item>KlySol-001:TT</item>
-        	<item>KlySol-002:TT</item>
-        	<item>KlySol-003:TT</item>
-        	<item>VacPS-110:I</item>
-        	<item>VacPS-120:I</item>
-        	<item>Body-233:TE</item>
-        	<item>Sol-243:TE</item>
-        	<item>Oil-253:TE</item>
-        	<item>Load-362:TE</item>
-        	<item>RLoad-364:TE</item>
-        	<item>Main-110:PT</item>
-        	<item>Coll-224:FIT</item>
-        	<item>RLoad-367:FIT</item>
-        	<item>Main-112:TE</item>
-        	<item>Circ-350:TE</item>
-        	<item>Coll-110-SW:CALC</item>
+          <item>KlyOil-002:TT</item>
+          <item>KlyBody-001:TT</item>
+          <item>KlyBody-002:TT</item>
+          <item>KlySol-001:TT</item>
+          <item>KlySol-002:TT</item>
+          <item>KlySol-003:TT</item>
+          <item>VacPS-110:I</item>
+          <item>VacPS-120:I</item>
+          <item>Body-233:TE</item>
+          <item>Sol-243:TE</item>
+          <item>Oil-253:TE</item>
+          <item>Load-362:TE</item>
+          <item>RLoad-364:TE</item>
+          <item>Main-110:PT</item>
+          <item>Coll-224:FIT</item>
+          <item>RLoad-367:FIT</item>
+          <item>Main-112:TE</item>
+          <item>Circ-350:TE</item>
+          <item>Coll-110-SW:CALC</item>
         </items>
         <items_from_pv>false</items_from_pv>
       </widget>
       <widget type="textentry" version="3.0.0">
         <name>Scan</name>
-        <pv_name>loc://rflpsAnalogSignal("Oil-002:TT")</pv_name>
+        <pv_name>loc://rflpsAnalogSignal("KlyOil-002:TT")</pv_name>
         <x>300</x>
         <y>20</y>
         <width>357</width>
diff --git a/NON-APPROVED/TS2/ts2-010rfc-rflps/support/rflpsAFSystem02.bob b/NON-APPROVED/TS2/ts2-010rfc-rflps/support/rflpsAFSystem02.bob
index ac9d6f2eb86614774e1329603122f8b74eb4f772..5ad9e634fb2ba23bae590777d627cbd712835426 100644
--- a/NON-APPROVED/TS2/ts2-010rfc-rflps/support/rflpsAFSystem02.bob
+++ b/NON-APPROVED/TS2/ts2-010rfc-rflps/support/rflpsAFSystem02.bob
@@ -144,29 +144,29 @@
         <width>261</width>
         <actions>
         </actions>
-        <items>        
-        	<item>RFS-Main-110:PT</item>
-        	<item>RFS-VacPS-110:I</item>
-        	<item>RFS-VacPS-120:I</item>
-        	<item>RFS-Main-110:TT</item>
-        	<item>RFS-Oil-110:TT</item>
-        	<item>RFS-Oil-120:TT</item>
-        	<item>RFS-Sol-110:TT</item>
-        	<item>RFS-Coll-110:FIT</item>
-        	<item>RFS-Coll-110:TT</item>
-        	<item>RFS-Body-110:TT</item>
-        	<item>RFS-Coll-110:SW_CALC</item>
-        	<item>RFS-Circ-110:TT</item>
-        	<item>RFS-Load-110:TT</item>
-        	<item>RFS-Rload-110:TT</item>
-        	<item>RFS-Rload-110:FIT</item>        	
+        <items>
+          <item>RFS-Main-110:PT</item>
+          <item>RFS-VacPS-110:I</item>
+          <item>RFS-VacPS-120:I</item>
+          <item>RFS-Main-110:TT</item>
+          <item>RFS-Oil-110:TT</item>
+          <item>RFS-Oil-120:TT</item>
+          <item>RFS-Sol-110:TT</item>
+          <item>RFS-Coll-110:FIT</item>
+          <item>RFS-Coll-110:TT</item>
+          <item>RFS-Body-110:TT</item>
+          <item>RFS-Coll-110:SW_CALC</item>
+          <item>RFS-Circ-110:TT</item>
+          <item>RFS-Load-110:TT</item>
+          <item>RFS-Rload-110:TT</item>
+          <item>RFS-Rload-110:FIT</item>
           <item>Kly-001:OP-Win-Temp</item>
         </items>
         <items_from_pv>false</items_from_pv>
       </widget>
       <widget type="textentry" version="3.0.0">
         <name>Scan</name>
-        <pv_name>loc://rflpsAnalogSignal("Oil-002:TT")</pv_name>
+        <pv_name>loc://rflpsAnalogSignal("RFS-Main-110:PT")</pv_name>
         <x>300</x>
         <y>20</y>
         <width>357</width>
diff --git a/NON-APPROVED/TS2/ts2-010rfc-rflps/support/rflpsAFsignal.bob b/NON-APPROVED/TS2/ts2-010rfc-rflps/support/rflpsAFsignal.bob
index b443082f56e97172bfe801729c0f1a3efe02fa31..9c02271377ceccf8a07bc0bca88218514ce30248 100644
--- a/NON-APPROVED/TS2/ts2-010rfc-rflps/support/rflpsAFsignal.bob
+++ b/NON-APPROVED/TS2/ts2-010rfc-rflps/support/rflpsAFsignal.bob
@@ -94,7 +94,7 @@
               <description>CPU Reset</description>
             </action>
           </actions>
-          <pv_name>$(PREFIX):CPU-RST</pv_name>
+          <pv_name>$(PREFIX):RFS-CPU-RST</pv_name>
           <x>20</x>
           <y>240</y>
           <width>220</width>
diff --git a/NON-APPROVED/TS2/ts2-010rfc-rflps/support/rflpsDIORFQ.bob b/NON-APPROVED/TS2/ts2-010rfc-rflps/support/rflpsDIORFQ.bob
index e80b23a8c78c5c2ca410facd9b701684a1cf2ac3..05abfc1f63fb9528997e2d748ff40255f458ef48 100644
--- a/NON-APPROVED/TS2/ts2-010rfc-rflps/support/rflpsDIORFQ.bob
+++ b/NON-APPROVED/TS2/ts2-010rfc-rflps/support/rflpsDIORFQ.bob
@@ -106,7 +106,7 @@
       </widget>
       <widget type="combo" version="2.0.0">
         <name>Scan Combo_1</name>
-        <pv_name>loc://rflpsDigitalSignal("Oil-001:TS")</pv_name>
+        <pv_name>loc://rflpsDigitalSignal("RFS-Kly-110:Oil-TS")</pv_name>
         <x>20</x>
         <y>20</y>
         <width>270</width>
@@ -117,47 +117,101 @@
         <actions>
         </actions>
         <items>
-          <item>Oil-001:TS</item>
-          <item>Oil-001:LS</item>
-          <item>Oil-001:Leak</item>
-          <item>Oil-001:LO</item>
-          <item>Kly-001:TS</item>
-          <item>Kly-001:ConILck</item>
-          <item>TCU-001:ES</item>
-          <item>Main-001:EmSw</item>
-          <item>VacPS-001:HVON</item>
-          <item>VacPS-002:HVON</item>
-          <item>DA-001:Ready</item>
-          <item>FIM-001:RFenaStat</item>
-          <item>FIM-001:HVenaStat</item>
-          <item>PSS-001-Ready</item>
-          <item>Cav-001-Ready</item>
-          <item>ADR-13001:ILck</item>
-          <item>ADR-13002:ILck</item>
-          <item>ADR-13003:ILck</item>
-          <item>ADR-13004:ILck</item>
-          <item>ADR-13005:ILck</item>
-          <item>ADR-13006:ILck</item>
-          <item>ADR-13007:ILck</item>
-          <item>ADR-13008:ILck</item>
-          <item>ADR-13009:ILck</item>
-          <item>ADR-13010:ILck</item>
-          <item>ADR-13011:ILck</item>
-          <item>ADR-13012:ILck</item>
-          <item>DA-001:Reset</item>
-          <item>DA-001:Daena</item>
-          <item>PSS-001-Shutter</item>
-          <item>FIM-001:HVena</item>
-          <item>FIM-001-RFena</item>
-          <item>KLY-001:GreenLight</item>
-          <item>KLY-001:YellowLight</item>
-          <item>KLY-001:RedLight</item>
+          <item>RFS-Kly-110:Oil-TS</item>
+          <item>RFS-Kly-110:Oil-LS</item>
+          <item>RFS-Kly-110:Oil-Leak</item>
+          <item>RFS-Kly-110:Oil-LO</item>
+          <item>RFS-Kly-110:APS</item>
+          <item>RFS-Kly-110:ConILck</item>
+          <item>RFS-TCU-110:ES</item>
+          <item>RFS-Kly-110:EmSw</item>
+          <item>RFS-VacPS-110:HVON</item>
+          <item>RFS-VacPS-120:HVON</item>
+          <item>RFS-PAmp-110:Ready</item>
+          <item>RFS-FIM-110:RFenaStat</item>
+          <item>RFS-FIM-110:HVenaStat</item>
+          <item>RFS-SIM-110:PSS-Ready</item>
+          <item>RFS-SIM-110:Cav-Ready</item>
+          <item>RFS-I3_4_Spare</item>
+          <item>RFS-I3_5_Spare</item>
+          <item>RFS-I3_6_Spare</item>
+          <item>RFS-I3_7_Spare</item>
+          <item>RFS-ADR-11001:ILck</item>
+          <item>RFS-ADR-11002:Ilck</item>
+          <item>RFS-ADR-11003:Ilck</item>
+          <item>RFS-ADR-11004:Ilck</item>
+          <item>RFS-ADR-11005:Ilck</item>
+          <item>RFS-ADR-11006:Ilck</item>
+          <item>RFS-ADR-11007:Ilck</item>
+          <item>RFS-ADR-11008:Ilck</item>
+          <item>RFS-ADR-11009:Ilck</item>
+          <item>RFS-ADR-11010:Ilck</item>
+          <item>RFS-ADR-11011:Ilck</item>
+          <item>RFS-ADR-11012:Ilck</item>
+          <item>RFS-ADR-13-Spare</item>
+          <item>RFS-ADR-14-Spare</item>
+          <item>RFS-I5_6_Spare</item>
+          <item>RFS-I5_7_Spare</item>
+          <item>RFS-I6_7_Spare</item>
+          <item>RFS-I7_0_Spare</item>
+          <item>RFS-I7_1_Spare</item>
+          <item>RFS-I7_2_Spare</item>
+          <item>RFS-I7_3_Spare</item>
+          <item>RFS-I7_4_Spare</item>
+          <item>RFS-I7_5_Spare</item>
+          <item>RFS-I7_6_Spare</item>
+          <item>RFS-I7_7_Spare</item>
+          <item>RFS-PAmp-110:Reset</item>
+          <item>RFS-PAmp-110:Daena</item>
+          <item>RFS-SIM-110:PSS-Shutter</item>
+          <item>RFS-Kly-110:Blower</item>
+          <item>RFS-Q2_1_Spare</item>
+          <item>RFS-Q2_2_Spare</item>
+          <item>RFS-Q2_3_Spare</item>
+          <item>RFS-Q2_4_Spare</item>
+          <item>RFS-Q2_5_Spare</item>
+          <item>RFS-Q2_6_Spare</item>
+          <item>RFS-Q2_7_Spare</item>
+          <item>RFS-Q3_0_Spare</item>
+          <item>RFS-Q3_1_Spare</item>
+          <item>RFS-Q3_2_Spare</item>
+          <item>RFS-Q3_3_Spare</item>
+          <item>RFS-Q3_4_Spare</item>
+          <item>RFS-Q3_5_Spare</item>
+          <item>RFS-Q3_6_Spare</item>
+          <item>RFS-Q3_7_Spare</item>
+          <item>RFS-Q4_1_Spare</item>
+          <item>RFS-Q4_7_Spare</item>
+          <item>RFS-FIM-110:HVena</item>
+          <item>RFS-FIM-110:RFena</item>
+          <item>RFS-Kly-001:Fil_On</item>
+          <item>RFS-SiC-110:GreenLight</item>
+          <item>RFS-SiC-110:YellowLight</item>
+          <item>RFS-SiC-110:RedLight</item>
+          <item>RFS-Q5_6_Spare</item>
+          <item>RFS-Q5_7_Spare</item>
+          <item>RFS-Circ-120:FIS</item>
+          <item>RFS-Body-110:FIS</item>
+          <item>RFS-Sol-110:FIS</item>
+          <item>RFS-Oil-110:FIS</item>
+          <item>RFS-I400_4_Spare</item>
+          <item>RFS-I400_5_Spare</item>
+          <item>RFS-I400_6_Spare</item>
+          <item>RFS-I400_7_Spare</item>
+          <item>RFS-RIO-020:Greenlight</item>
+          <item>RFS-RIO-020:Redlight</item>
+          <item>RFS-Q400_2_Spare</item>
+          <item>RFS-Q400_3_Spare</item>
+          <item>RFS-Q400_4_Spare</item>
+          <item>RFS-Q400_5_Spare</item>
+          <item>RFS-Q400_6_Spare</item>
+          <item>RFS-Q400_7_Spare</item>
         </items>
         <items_from_pv>false</items_from_pv>
       </widget>
       <widget type="textentry" version="3.0.0">
         <name>Scan_1</name>
-        <pv_name>loc://rflpsDigitalSignal("Oil-001:TS")</pv_name>
+        <pv_name>loc://rflpsDigitalSignal("RFS-Kly-110:Oil-TS")</pv_name>
         <x>310</x>
         <y>20</y>
         <width>270</width>
diff --git a/NON-APPROVED/TS2/ts2-010rfc-rflps/support/rflpsDIOSystem02.bob b/NON-APPROVED/TS2/ts2-010rfc-rflps/support/rflpsDIOSystem02.bob
index 997310f898463ca976b0d5633055af5a86084810..08fd54ad8577b87449fcb49e21afd349704cac23 100644
--- a/NON-APPROVED/TS2/ts2-010rfc-rflps/support/rflpsDIOSystem02.bob
+++ b/NON-APPROVED/TS2/ts2-010rfc-rflps/support/rflpsDIOSystem02.bob
@@ -150,7 +150,7 @@
       </widget>
       <widget type="textentry" version="3.0.0">
         <name>Scan_1</name>
-        <pv_name>loc://rflpsDigitalSignal("Oil-001:TS")</pv_name>
+        <pv_name>loc://rflpsDigitalSignal("FIM-110:HVena")</pv_name>
         <x>310</x>
         <y>20</y>
         <width>270</width>
diff --git a/NON-APPROVED/TS2/ts2-010rfc-rflps/support/rflpsDIOsignal.bob b/NON-APPROVED/TS2/ts2-010rfc-rflps/support/rflpsDIOsignal.bob
index 85412b54a6da4a0e8cee0c56fd4c0f47950b929e..1fe4bac8a2b7dd23b7665dfad826c1d6cda10949 100644
--- a/NON-APPROVED/TS2/ts2-010rfc-rflps/support/rflpsDIOsignal.bob
+++ b/NON-APPROVED/TS2/ts2-010rfc-rflps/support/rflpsDIOsignal.bob
@@ -382,7 +382,7 @@
           <description>PLC Reset</description>
         </action>
       </actions>
-      <pv_name>$(PREFIX):CPU-RST</pv_name>
+      <pv_name>$(PREFIX):RFS-CPU-RST</pv_name>
       <x>340</x>
       <y>240</y>
       <width>230</width>
diff --git a/NON-APPROVED/TS2/ts2-010rfc-rflps/support/rflpsDiagnosticsRFQ.bob b/NON-APPROVED/TS2/ts2-010rfc-rflps/support/rflpsDiagnosticsRFQ.bob
index db6a6a500901b6619ffac2e0ca69b6c91d48fd46..98fe20a87d65e259a7c6aff763a0134c3f59283a 100644
--- a/NON-APPROVED/TS2/ts2-010rfc-rflps/support/rflpsDiagnosticsRFQ.bob
+++ b/NON-APPROVED/TS2/ts2-010rfc-rflps/support/rflpsDiagnosticsRFQ.bob
@@ -2,7 +2,7 @@
 <display version="2.0.0">
   <name>rflpsDiagnosticsRFQ</name>
   <macros>
-    <DEVICE>FIM-110</DEVICE>
+    <DEVICE>RFS-FIM-110</DEVICE>
   </macros>
   <width>1940</width>
   <height>1040</height>
@@ -22,7 +22,7 @@
     <widget type="rectangle" version="2.0.0">
       <name>BGGrey01-titlebar</name>
       <width>540</width>
-      <height>490</height>
+      <height>440</height>
       <line_width>2</line_width>
       <line_color>
         <color name="GROUP-BORDER" red="150" green="155" blue="151">
@@ -320,7 +320,7 @@
     </widget>
     <widget type="textupdate" version="2.0.0">
       <name>Text Update_65</name>
-      <pv_name>$(PREFIX):CPU-INTRLCK-RB</pv_name>
+      <pv_name>$(PREFIX):RFS-CPU-INTRLCK-RB</pv_name>
       <x>180</x>
       <y>67</y>
       <width>90</width>
@@ -349,7 +349,7 @@ CPU Interlock/alarm </tooltip>
     </widget>
     <widget type="textupdate" version="2.0.0">
       <name>Text Update_66</name>
-      <pv_name>$(PREFIX):CPU-WRNACKREQ-RB</pv_name>
+      <pv_name>$(PREFIX):RFS-CPU-WRNACKREQ-RB</pv_name>
       <x>180</x>
       <y>97</y>
       <width>90</width>
@@ -378,7 +378,7 @@ One or more signals are being interlocked or may require an acknowledge.</toolti
     </widget>
     <widget type="textupdate" version="2.0.0">
       <name>Text Update_67</name>
-      <pv_name>$(PREFIX):CPU-LTCHMD-RB</pv_name>
+      <pv_name>$(PREFIX):RFS-CPU-LTCHMD-RB</pv_name>
       <x>422</x>
       <y>67</y>
       <width>90</width>
@@ -408,7 +408,7 @@ The CPU latches the interlock until a reset is applied</tooltip>
     </widget>
     <widget type="textupdate" version="2.0.0">
       <name>Text Update_68</name>
-      <pv_name>$(PREFIX):CPU-FRCACT-RB</pv_name>
+      <pv_name>$(PREFIX):RFS-CPU-FRCACT-RB</pv_name>
       <x>422</x>
       <y>97</y>
       <width>90</width>
@@ -438,13 +438,13 @@ One or more signals are being simulated</tooltip>
     </widget>
     <widget type="bool_button" version="2.0.0">
       <name>RESET_BUTTON_3</name>
-      <pv_name>$(PREFIX):CPU-RST</pv_name>
+      <pv_name>$(PREFIX):RFS-CPU-RST</pv_name>
       <x>30</x>
       <y>137</y>
       <width>150</width>
       <off_label>CPU Reset</off_label>
       <off_color>
-        <color red="0" green="100" blue="0">
+        <color name="Background" red="220" green="225" blue="221">
         </color>
       </off_color>
       <on_label>Reseting...</on_label>
@@ -470,7 +470,7 @@ Reset all non-active interlocks</tooltip>
     </widget>
     <widget type="bool_button" version="2.0.0">
       <name>Boolean Button_3</name>
-      <pv_name>$(PREFIX):CPU-TEST-ALL-ADS</pv_name>
+      <pv_name>$(PREFIX):RFS-CPU-TEST-ALL-ADS</pv_name>
       <x>362</x>
       <y>137</y>
       <width>150</width>
@@ -505,8 +505,8 @@ Reset all non-active interlocks</tooltip>
   </widget>
   <widget type="group" version="2.0.0">
     <name>    FIM - History Buffer Management 1</name>
-    <x>18</x>
-    <y>741</y>
+    <x>579</x>
+    <y>740</y>
     <width>540</width>
     <height>270</height>
     <style>3</style>
@@ -729,7 +729,7 @@ Reset all non-active interlocks</tooltip>
       <pv_name>$(PREFIX):$(DEVICE):STAT</pv_name>
       <text>OFF</text>
       <x>30</x>
-      <y>137</y>
+      <y>122</y>
       <width>150</width>
     </widget>
     <widget type="action_button" version="3.0.0">
@@ -744,7 +744,7 @@ Reset all non-active interlocks</tooltip>
       <pv_name>$(PREFIX):$(DEVICE):STAT</pv_name>
       <text>ON</text>
       <x>196</x>
-      <y>137</y>
+      <y>122</y>
       <width>150</width>
       <tooltip>$(actions)</tooltip>
     </widget>
@@ -760,7 +760,7 @@ Reset all non-active interlocks</tooltip>
       <pv_name>$(PREFIX):$(DEVICE):STAT</pv_name>
       <text>RUNNING</text>
       <x>362</x>
-      <y>137</y>
+      <y>122</y>
       <width>150</width>
       <tooltip>$(actions)</tooltip>
     </widget>
@@ -768,7 +768,7 @@ Reset all non-active interlocks</tooltip>
       <name>Text Update_60</name>
       <pv_name>$(PREFIX):$(DEVICE):STAT-RB</pv_name>
       <x>140</x>
-      <y>67</y>
+      <y>59</y>
       <width>280</width>
       <precision>0</precision>
       <horizontal_alignment>1</horizontal_alignment>
@@ -814,7 +814,7 @@ Reset all non-active interlocks</tooltip>
       <name>Label_169</name>
       <text>IOC Runtime</text>
       <x>30</x>
-      <y>67</y>
+      <y>59</y>
       <background_color>
         <color red="255" green="255" blue="255">
         </color>
@@ -828,7 +828,7 @@ Reset all non-active interlocks</tooltip>
       <name>Text Update_41</name>
       <pv_name>$(PREFIX):$(DEVICE):INFO</pv_name>
       <x>140</x>
-      <y>97</y>
+      <y>89</y>
       <width>280</width>
       <format>6</format>
       <horizontal_alignment>1</horizontal_alignment>
@@ -841,7 +841,7 @@ Reset all non-active interlocks</tooltip>
       <name>Label_170</name>
       <text>Runtime status</text>
       <x>10</x>
-      <y>97</y>
+      <y>89</y>
       <width>120</width>
       <background_color>
         <color red="255" green="255" blue="255">
@@ -856,7 +856,7 @@ Reset all non-active interlocks</tooltip>
   <widget type="group" version="2.0.0">
     <name>BGGrey01_4</name>
     <x>579</x>
-    <y>231</y>
+    <y>391</y>
     <width>260</width>
     <height>130</height>
     <style>3</style>
@@ -896,7 +896,7 @@ Reset all non-active interlocks</tooltip>
     </widget>
     <widget type="label" version="2.0.0">
       <name>LGGrey03-title_13</name>
-      <text>Autosave Restore</text>
+      <text>FIM Restore Last Values</text>
       <width>260</width>
       <height>50</height>
       <font>
@@ -926,7 +926,7 @@ Reset all non-active interlocks</tooltip>
   <widget type="group" version="2.0.0">
     <name>BGGrey01_5</name>
     <x>859</x>
-    <y>231</y>
+    <y>391</y>
     <width>260</width>
     <height>130</height>
     <style>3</style>
@@ -966,7 +966,7 @@ Reset all non-active interlocks</tooltip>
     </widget>
     <widget type="label" version="2.0.0">
       <name>LGGrey03-title_14</name>
-      <text>IOC Management</text>
+      <text>FIM IOC Management</text>
       <width>260</width>
       <height>50</height>
       <font>
@@ -980,8 +980,8 @@ Reset all non-active interlocks</tooltip>
       <name>Action Button_81</name>
       <actions>
         <action type="open_display">
-          <file>IOCmanage.bob</file>
-          <target>standalone</target>
+          <file>FIMIOC_manage_v02.bob</file>
+          <target>window</target>
           <description>Open Display</description>
         </action>
       </actions>
@@ -994,8 +994,8 @@ Reset all non-active interlocks</tooltip>
   </widget>
   <widget type="group" version="2.0.0">
     <name>BGGrey01_6</name>
-    <x>579</x>
-    <y>381</y>
+    <x>18</x>
+    <y>740</y>
     <width>260</width>
     <height>130</height>
     <style>3</style>
@@ -1063,8 +1063,8 @@ Reset all non-active interlocks</tooltip>
   </widget>
   <widget type="group" version="2.0.0">
     <name>BGGrey01_8</name>
-    <x>579</x>
-    <y>530</y>
+    <x>18</x>
+    <y>889</y>
     <width>540</width>
     <height>150</height>
     <style>3</style>
@@ -1153,8 +1153,8 @@ Reset all non-active interlocks</tooltip>
   </widget>
   <widget type="group" version="2.0.0">
     <name>BGGrey01_7</name>
-    <x>859</x>
-    <y>381</y>
+    <x>298</x>
+    <y>740</y>
     <width>260</width>
     <height>130</height>
     <style>3</style>
@@ -1220,4 +1220,233 @@ Reset all non-active interlocks</tooltip>
       <tooltip>$(actions)</tooltip>
     </widget>
   </widget>
+  <widget type="group" version="2.0.0">
+    <name>BGGrey01_9</name>
+    <x>579</x>
+    <y>231</y>
+    <width>540</width>
+    <height>149</height>
+    <style>3</style>
+    <background_color>
+      <color name="BACKGROUND" red="220" green="225" blue="221">
+      </color>
+    </background_color>
+    <widget type="rectangle" version="2.0.0">
+      <name>BGGrey01-titlebar_9</name>
+      <width>540</width>
+      <height>149</height>
+      <line_width>2</line_width>
+      <line_color>
+        <color name="GROUP-BORDER" red="150" green="155" blue="151">
+        </color>
+      </line_color>
+      <background_color>
+        <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+        </color>
+      </background_color>
+    </widget>
+    <widget type="rectangle" version="2.0.0">
+      <name>BGGrey01-background_16</name>
+      <x>10</x>
+      <y>50</y>
+      <width>520</width>
+      <height>89</height>
+      <line_width>2</line_width>
+      <line_color>
+        <color name="GROUP-BORDER" red="150" green="155" blue="151">
+        </color>
+      </line_color>
+      <background_color>
+        <color name="BACKGROUND" red="220" green="225" blue="221">
+        </color>
+      </background_color>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>LGGrey03-title_18</name>
+      <text>    FIM - Sequencer State Machine</text>
+      <width>540</width>
+      <height>50</height>
+      <font>
+        <font family="Source Sans Pro" style="BOLD" size="18.0">
+        </font>
+      </font>
+      <horizontal_alignment>1</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_4</name>
+      <class>CAPTION</class>
+      <text>Sequencer State Machine</text>
+      <x>60</x>
+      <y>84</y>
+      <width>210</width>
+      <foreground_color use_class="true">
+        <color name="Text" red="25" green="25" blue="25">
+        </color>
+      </foreground_color>
+      <horizontal_alignment use_class="true">2</horizontal_alignment>
+      <vertical_alignment use_class="true">1</vertical_alignment>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>Text Update_29</name>
+      <pv_name>$(PREFIX):$(DEVICE):stateS</pv_name>
+      <x>300</x>
+      <y>78</y>
+      <width>150</width>
+      <height>30</height>
+      <font>
+        <font family="Source Sans Pro" style="BOLD" size="16.0">
+        </font>
+      </font>
+      <precision>0</precision>
+      <horizontal_alignment>1</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+      <border_width>1</border_width>
+      <border_color>
+        <color name="BLUE-GROUP-BORDER" red="138" green="167" blue="167">
+        </color>
+      </border_color>
+    </widget>
+  </widget>
+  <widget type="group" version="2.0.0">
+    <name>BGGrey01_10</name>
+    <x>579</x>
+    <y>541</y>
+    <width>260</width>
+    <height>130</height>
+    <style>3</style>
+    <background_color>
+      <color name="BACKGROUND" red="220" green="225" blue="221">
+      </color>
+    </background_color>
+    <widget type="rectangle" version="2.0.0">
+      <name>BGGrey01-titlebar_10</name>
+      <width>260</width>
+      <height>130</height>
+      <line_width>2</line_width>
+      <line_color>
+        <color name="GROUP-BORDER" red="150" green="155" blue="151">
+        </color>
+      </line_color>
+      <background_color>
+        <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+        </color>
+      </background_color>
+    </widget>
+    <widget type="rectangle" version="2.0.0">
+      <name>BGGrey01-background_17</name>
+      <x>10</x>
+      <y>50</y>
+      <width>240</width>
+      <height>70</height>
+      <line_width>2</line_width>
+      <line_color>
+        <color name="GROUP-BORDER" red="150" green="155" blue="151">
+        </color>
+      </line_color>
+      <background_color>
+        <color name="BACKGROUND" red="220" green="225" blue="221">
+        </color>
+      </background_color>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>LGGrey03-title_19</name>
+      <text>FIM - Digital Inputs Overview</text>
+      <width>260</width>
+      <height>50</height>
+      <font>
+        <font family="Source Sans Pro" style="BOLD" size="18.0">
+        </font>
+      </font>
+      <horizontal_alignment>1</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+    </widget>
+    <widget type="action_button" version="3.0.0">
+      <name>Action Button_106</name>
+      <actions>
+        <action type="open_display">
+          <file>FIM_AllDigitalInputs_v02.bob</file>
+          <target>window</target>
+          <description>Open Display</description>
+        </action>
+      </actions>
+      <text>Digital Inputs Panel</text>
+      <x>30</x>
+      <y>70</y>
+      <width>200</width>
+      <tooltip>$(actions)</tooltip>
+    </widget>
+  </widget>
+  <widget type="group" version="2.0.0">
+    <name>BGGrey01_11</name>
+    <x>859</x>
+    <y>541</y>
+    <width>260</width>
+    <height>130</height>
+    <style>3</style>
+    <background_color>
+      <color name="BACKGROUND" red="220" green="225" blue="221">
+      </color>
+    </background_color>
+    <widget type="rectangle" version="2.0.0">
+      <name>BGGrey01-titlebar_11</name>
+      <width>260</width>
+      <height>130</height>
+      <line_width>2</line_width>
+      <line_color>
+        <color name="GROUP-BORDER" red="150" green="155" blue="151">
+        </color>
+      </line_color>
+      <background_color>
+        <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+        </color>
+      </background_color>
+    </widget>
+    <widget type="rectangle" version="2.0.0">
+      <name>BGGrey01-background_18</name>
+      <x>10</x>
+      <y>50</y>
+      <width>240</width>
+      <height>70</height>
+      <line_width>2</line_width>
+      <line_color>
+        <color name="GROUP-BORDER" red="150" green="155" blue="151">
+        </color>
+      </line_color>
+      <background_color>
+        <color name="BACKGROUND" red="220" green="225" blue="221">
+        </color>
+      </background_color>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>LGGrey03-title_20</name>
+      <text>SIM IOC Statistics</text>
+      <width>260</width>
+      <height>50</height>
+      <font>
+        <font family="Source Sans Pro" style="BOLD" size="18.0">
+        </font>
+      </font>
+      <horizontal_alignment>1</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+    </widget>
+    <widget type="action_button" version="3.0.0">
+      <name>Action Button_82</name>
+      <actions>
+        <action type="open_display">
+          <file>iocStats/iocStats.bob</file>
+          <macros>
+            <IOCNAME>RFQ-SIM-IocStats</IOCNAME>
+          </macros>
+          <target>window</target>
+          <description>Open Display</description>
+        </action>
+      </actions>
+      <text>SIM iocStats</text>
+      <x>30</x>
+      <y>70</y>
+      <width>200</width>
+      <tooltip>$(actions)</tooltip>
+    </widget>
+  </widget>
 </display>
diff --git a/NON-APPROVED/TS2/ts2-010rfc-rflps/support/transitionsRFQ.bob b/NON-APPROVED/TS2/ts2-010rfc-rflps/support/transitionsRFQ.bob
index f8cca0d84c84cac4ffeb23c65832184b72924d90..6ddd64eb9c357b243f67eacd992f55c7fa779627 100644
--- a/NON-APPROVED/TS2/ts2-010rfc-rflps/support/transitionsRFQ.bob
+++ b/NON-APPROVED/TS2/ts2-010rfc-rflps/support/transitionsRFQ.bob
@@ -84,26 +84,26 @@
           <action type="open_display">
             <file>rflpsAFsignal.bob</file>
             <macros>
-              <SGNL>Main-001:TE</SGNL>
+              <SGNL>RFS-Kly-110:CWM-WtrC-Tmp</SGNL>
             </macros>
             <target>window</target>
             <description>Change PV settings</description>
           </action>
         </actions>
-        <pv_name>Main-001:TE</pv_name>
+        <pv_name>$(PREFIX):RFS-Kly-110:CWM-WtrC-Tmp</pv_name>
         <text>...</text>
         <x>660</x>
         <y>45</y>
         <width>30</width>
         <height>20</height>
         <tooltip>$(actions) for:
-$(PREFIX):$(pv_name)</tooltip>
+$(pv_name)</tooltip>
       </widget>
       <widget type="embedded" version="2.0.0">
         <name>Embedded Display_13</name>
         <file>ai_overview_v02.bob</file>
         <macros>
-          <SGNL>Main-001:TE</SGNL>
+          <SGNL>RFS-Kly-110:CWM-WtrC-Tmp</SGNL>
         </macros>
         <x>700</x>
         <y>40</y>
@@ -116,26 +116,26 @@ $(PREFIX):$(pv_name)</tooltip>
           <action type="open_display">
             <file>rflpsAFsignal.bob</file>
             <macros>
-              <SGNL>Oil-002:TT</SGNL>
+              <SGNL>RFS-Kly-110:Oil-WtrC-Tmp</SGNL>
             </macros>
             <target>window</target>
             <description>Change PV settings</description>
           </action>
         </actions>
-        <pv_name>Oil-002:TT</pv_name>
+        <pv_name>$(PREFIX):RFS-Kly-110:Oil-WtrC-Tmp</pv_name>
         <text>...</text>
         <x>660</x>
         <y>110</y>
         <width>30</width>
         <height>20</height>
         <tooltip>$(actions) for:
-$(PREFIX):$(pv_name)</tooltip>
+$(pv_name)</tooltip>
       </widget>
       <widget type="embedded" version="2.0.0">
         <name>Embedded Display_11</name>
         <file>ai_overview_v02.bob</file>
         <macros>
-          <SGNL>Oil-002:TT</SGNL>
+          <SGNL>RFS-Kly-110:Oil-WtrC-Tmp</SGNL>
         </macros>
         <x>700</x>
         <y>105</y>
@@ -148,26 +148,26 @@ $(PREFIX):$(pv_name)</tooltip>
           <action type="open_display">
             <file>rflpsAFsignal.bob</file>
             <macros>
-              <SGNL>Main-017:TE</SGNL>
+              <SGNL>RFS-Kly-110:CWH-WtrC-Tmp</SGNL>
             </macros>
             <target>window</target>
             <description>Change PV settings</description>
           </action>
         </actions>
-        <pv_name>Main-017:TE</pv_name>
+        <pv_name>$(PREFIX):RFS-Kly-110:CWH-WtrC-Tmp</pv_name>
         <text>...</text>
         <x>660</x>
         <y>75</y>
         <width>30</width>
         <height>20</height>
         <tooltip>$(actions) for:
-$(PREFIX):$(pv_name)</tooltip>
+$(pv_name)</tooltip>
       </widget>
       <widget type="embedded" version="2.0.0">
         <name>Embedded Display_10</name>
         <file>ai_overview_v02.bob</file>
         <macros>
-          <SGNL>Main-017:TE</SGNL>
+          <SGNL>RFS-Kly-110:CWH-WtrC-Tmp</SGNL>
         </macros>
         <x>700</x>
         <y>70</y>
@@ -180,26 +180,26 @@ $(PREFIX):$(pv_name)</tooltip>
           <action type="open_display">
             <file>rflpsDIOsignal.bob</file>
             <macros>
-              <SGNL>Kly-001:ConILck</SGNL>
+              <SGNL>RFS-Kly-110:ConILck</SGNL>
             </macros>
             <target>window</target>
             <description>Change PV settings</description>
           </action>
         </actions>
-        <pv_name>Kly-001:ConILck</pv_name>
+        <pv_name>$(PREFIX):RFS-Kly-110:ConILck</pv_name>
         <text>...</text>
         <x>20</x>
         <y>105</y>
         <width>30</width>
         <height>20</height>
         <tooltip>$(actions) for:
-$(PREFIX):$(pv_name)</tooltip>
+$(pv_name)</tooltip>
       </widget>
       <widget type="embedded" version="2.0.0">
         <name>Embedded Display_9</name>
         <file>aidio_overview_v02.bob</file>
         <macros>
-          <SGNL>Kly-001:ConILck</SGNL>
+          <SGNL>RFS-Kly-110:ConILck</SGNL>
         </macros>
         <x>60</x>
         <y>100</y>
@@ -212,26 +212,26 @@ $(PREFIX):$(pv_name)</tooltip>
           <action type="open_display">
             <file>rflpsDIOsignal.bob</file>
             <macros>
-              <SGNL>Oil-001:Leak</SGNL>
+              <SGNL>RFS-Kly-110:Oil-Leak</SGNL>
             </macros>
             <target>window</target>
             <description>Change PV settings</description>
           </action>
         </actions>
-        <pv_name>Oil-001:Leak</pv_name>
+        <pv_name>$(PREFIX):RFS-Kly-110:Oil-Leak</pv_name>
         <text>...</text>
         <x>20</x>
         <y>75</y>
         <width>30</width>
         <height>20</height>
         <tooltip>$(actions) for:
-$(PREFIX):$(pv_name)</tooltip>
+$(pv_name)</tooltip>
       </widget>
       <widget type="embedded" version="2.0.0">
         <name>Embedded Display_8</name>
         <file>aidio_overview_v02.bob</file>
         <macros>
-          <SGNL>Oil-001:Leak</SGNL>
+          <SGNL>RFS-Kly-110:Oil-Leak</SGNL>
         </macros>
         <x>60</x>
         <y>70</y>
@@ -244,26 +244,26 @@ $(PREFIX):$(pv_name)</tooltip>
           <action type="open_display">
             <file>rflpsDIOsignal.bob</file>
             <macros>
-              <SGNL>Oil-001:LS</SGNL>
+              <SGNL>RFS-Kly-110:Oil-LS</SGNL>
             </macros>
             <target>window</target>
             <description>Change PV settings</description>
           </action>
         </actions>
-        <pv_name>Oil-001:LS</pv_name>
+        <pv_name>$(PREFIX):RFS-Kly-110:Oil-LS</pv_name>
         <text>...</text>
         <x>20</x>
         <y>45</y>
         <width>30</width>
         <height>20</height>
         <tooltip>$(actions) for:
-$(PREFIX):$(pv_name)</tooltip>
+$(pv_name)</tooltip>
       </widget>
       <widget type="embedded" version="2.0.0">
         <name>Embedded Display_7</name>
         <file>aidio_overview_v02.bob</file>
         <macros>
-          <SGNL>Oil-001:LS</SGNL>
+          <SGNL>RFS-Kly-110:Oil-LS</SGNL>
         </macros>
         <x>60</x>
         <y>40</y>
@@ -276,7 +276,7 @@ $(PREFIX):$(pv_name)</tooltip>
           <action type="open_display">
             <file>rflpsFILsignalv2.bob</file>
             <macros>
-              <SGNL>FILAMENT</SGNL>
+              <SGNL>RFS-FILAMENT</SGNL>
             </macros>
             <target>window</target>
             <description>Change PV settings</description>
@@ -291,7 +291,7 @@ $(PREFIX):$(pv_name)</tooltip>
       </widget>
       <widget type="led" version="2.0.0">
         <name>LED_49</name>
-        <pv_name>$(PREFIX):FILAMENT-INT-RB</pv_name>
+        <pv_name>$(PREFIX):RFS-FILAMENT-INT-RB</pv_name>
         <x>1360</x>
         <y>45</y>
         <width>21</width>
@@ -348,7 +348,7 @@ $(PREFIX):$(pv_name)</tooltip>
         <name>Embedded Display_81</name>
         <file>aidio_overview_v02.bob</file>
         <macros>
-          <SGNL>Oil-011:FIS</SGNL>
+          <SGNL>RFS-Oil-110:FIS</SGNL>
         </macros>
         <x>380</x>
         <y>40</y>
@@ -361,20 +361,20 @@ $(PREFIX):$(pv_name)</tooltip>
           <action type="open_display">
             <file>rflpsDIOsignal.bob</file>
             <macros>
-              <SGNL>Oil-011:FIS</SGNL>
+              <SGNL>RFS-Oil-110:FIS</SGNL>
             </macros>
             <target>window</target>
             <description>Change PV settings</description>
           </action>
         </actions>
-        <pv_name>Oil-011:FIS</pv_name>
+        <pv_name>$(PREFIX):RFS-Oil-110:FIS</pv_name>
         <text>...</text>
         <x>340</x>
         <y>45</y>
         <width>30</width>
         <height>20</height>
         <tooltip>$(actions) for:
-$(PREFIX):$(pv_name)</tooltip>
+$(pv_name)</tooltip>
       </widget>
       <widget type="action_button" version="3.0.0">
         <name>Action Button_65</name>
@@ -382,13 +382,13 @@ $(PREFIX):$(pv_name)</tooltip>
           <action type="open_display">
             <file>rflpsAFsignal.bob</file>
             <macros>
-              <SGNL>Oil-015:TE</SGNL>
+              <SGNL>RFS-Kly-110:Oil-Tmp</SGNL>
             </macros>
             <target>window</target>
             <description>Change PV settings</description>
           </action>
         </actions>
-        <pv_name>Oil-015:TE</pv_name>
+        <pv_name>$(PREFIX):RFS-Kly-110:Oil-Tmp</pv_name>
         <text>...</text>
         <x>980</x>
         <y>45</y>
@@ -400,7 +400,7 @@ $(PREFIX):$(pv_name)</tooltip>
         <name>Embedded Display_82</name>
         <file>ai_overview_v02.bob</file>
         <macros>
-          <SGNL>Oil-015:TE</SGNL>
+          <SGNL>RFS-Kly-110:Oil-Tmp</SGNL>
         </macros>
         <x>1020</x>
         <y>40</y>
@@ -484,7 +484,7 @@ $(PREFIX):$(pv_name)</tooltip>
         <name>Embedded Display_66</name>
         <file>aidio_overview_v02.bob</file>
         <macros>
-          <SGNL>TCU-001:ES</SGNL>
+          <SGNL>RFS-TCU-110:ES</SGNL>
         </macros>
         <x>60</x>
         <y>40</y>
@@ -497,26 +497,26 @@ $(PREFIX):$(pv_name)</tooltip>
           <action type="open_display">
             <file>rflpsDIOsignal.bob</file>
             <macros>
-              <SGNL>TCU-001:ES</SGNL>
+              <SGNL>RFS-TCU-110:ES</SGNL>
             </macros>
             <target>window</target>
             <description>Change PV settings</description>
           </action>
         </actions>
-        <pv_name>TCU-001:ES</pv_name>
+        <pv_name>$(PREFIX):RFS-TCU-110:ES</pv_name>
         <text>...</text>
         <x>20</x>
         <y>45</y>
         <width>30</width>
         <height>20</height>
         <tooltip>$(actions) for:
-$(PREFIX):$(pv_name)</tooltip>
+$(pv_name)</tooltip>
       </widget>
       <widget type="embedded" version="2.0.0">
         <name>Embedded Display_67</name>
         <file>aidio_overview_v02.bob</file>
         <macros>
-          <SGNL>Cav-001:Ready</SGNL>
+          <SGNL>RFS-SIM-110:Cav-Ready</SGNL>
         </macros>
         <x>60</x>
         <y>70</y>
@@ -529,20 +529,20 @@ $(PREFIX):$(pv_name)</tooltip>
           <action type="open_display">
             <file>rflpsDIOsignal.bob</file>
             <macros>
-              <SGNL>Cav-001:Ready</SGNL>
+              <SGNL>RFS-SIM-110:Cav-Ready</SGNL>
             </macros>
             <target>window</target>
             <description>Change PV settings</description>
           </action>
         </actions>
-        <pv_name>Cav-001:Ready</pv_name>
+        <pv_name>$(PREFIX):RFS-SIM-110:Cav-Ready</pv_name>
         <text>...</text>
         <x>20</x>
         <y>75</y>
         <width>30</width>
         <height>20</height>
         <tooltip>$(actions) for:
-$(PREFIX):$(pv_name)</tooltip>
+$(pv_name)</tooltip>
       </widget>
       <widget type="action_button" version="3.0.0">
         <name>Action Button_53</name>
@@ -550,26 +550,26 @@ $(PREFIX):$(pv_name)</tooltip>
           <action type="open_display">
             <file>rflpsDIOsignal.bob</file>
             <macros>
-              <SGNL>ADR-13001:ILck</SGNL>
+              <SGNL>RFS-ADR-11001:ILck</SGNL>
             </macros>
             <target>window</target>
             <description>Change PV settings</description>
           </action>
         </actions>
-        <pv_name>ADR-13001:Itlck</pv_name>
+        <pv_name>$(PREFIX):RFS-ADR-11001:ILck</pv_name>
         <text>...</text>
         <x>20</x>
         <y>105</y>
         <width>30</width>
         <height>20</height>
         <tooltip>$(actions) for:
-$(PREFIX):$(pv_name)</tooltip>
+$(pv_name)</tooltip>
       </widget>
       <widget type="embedded" version="2.0.0">
         <name>Embedded Display_68</name>
         <file>aidio_overview_v02.bob</file>
         <macros>
-          <SGNL>ADR-13001:ILck</SGNL>
+          <SGNL>RFS-ADR-11001:ILck</SGNL>
         </macros>
         <x>60</x>
         <y>100</y>
@@ -580,7 +580,7 @@ $(PREFIX):$(pv_name)</tooltip>
         <name>Embedded Display_69</name>
         <file>aidio_overview_v02.bob</file>
         <macros>
-          <SGNL>ADR-13002:ILck</SGNL>
+          <SGNL>RFS-ADR-11002:Ilck</SGNL>
         </macros>
         <x>60</x>
         <y>130</y>
@@ -593,26 +593,26 @@ $(PREFIX):$(pv_name)</tooltip>
           <action type="open_display">
             <file>rflpsDIOsignal.bob</file>
             <macros>
-              <SGNL>ADR-13002:ILck</SGNL>
+              <SGNL>RFS-ADR-11002:Ilck</SGNL>
             </macros>
             <target>window</target>
             <description>Change PV settings</description>
           </action>
         </actions>
-        <pv_name>ADR-13002:ILck</pv_name>
+        <pv_name>$(PREFIX):RFS-ADR-11002:Ilck</pv_name>
         <text>...</text>
         <x>20</x>
         <y>135</y>
         <width>30</width>
         <height>20</height>
         <tooltip>$(actions) for:
-$(PREFIX):$(pv_name)</tooltip>
+$(pv_name)</tooltip>
       </widget>
       <widget type="embedded" version="2.0.0">
         <name>Embedded Display_70</name>
         <file>aidio_overview_v02.bob</file>
         <macros>
-          <SGNL>ADR-13003:ILck</SGNL>
+          <SGNL>RFS-ADR-11003:Ilck</SGNL>
         </macros>
         <x>380</x>
         <y>40</y>
@@ -623,7 +623,7 @@ $(PREFIX):$(pv_name)</tooltip>
         <name>Embedded Display_71</name>
         <file>aidio_overview_v02.bob</file>
         <macros>
-          <SGNL>ADR-13004:ILck</SGNL>
+          <SGNL>RFS-ADR-11004:Ilck</SGNL>
         </macros>
         <x>380</x>
         <y>70</y>
@@ -634,7 +634,7 @@ $(PREFIX):$(pv_name)</tooltip>
         <name>Embedded Display_72</name>
         <file>aidio_overview_v02.bob</file>
         <macros>
-          <SGNL>ADR-13005:ILck</SGNL>
+          <SGNL>RFS-ADR-11005:Ilck</SGNL>
         </macros>
         <x>380</x>
         <y>100</y>
@@ -647,20 +647,20 @@ $(PREFIX):$(pv_name)</tooltip>
           <action type="open_display">
             <file>rflpsDIOsignal.bob</file>
             <macros>
-              <SGNL>ADR-13003:ILck</SGNL>
+              <SGNL>RFS-ADR-11003:Ilck</SGNL>
             </macros>
             <target>window</target>
             <description>Change PV settings</description>
           </action>
         </actions>
-        <pv_name>ADR-13003:ILck</pv_name>
+        <pv_name>$(PREFIX):RFS-ADR-11003:Ilck</pv_name>
         <text>...</text>
         <x>340</x>
         <y>45</y>
         <width>30</width>
         <height>20</height>
         <tooltip>$(actions) for:
-$(PREFIX):$(pv_name)</tooltip>
+$(pv_name)</tooltip>
       </widget>
       <widget type="action_button" version="3.0.0">
         <name>Action Button_56</name>
@@ -668,20 +668,20 @@ $(PREFIX):$(pv_name)</tooltip>
           <action type="open_display">
             <file>rflpsDIOsignal.bob</file>
             <macros>
-              <SGNL>ADR-13004:ILck</SGNL>
+              <SGNL>RFS-ADR-11004:Ilck</SGNL>
             </macros>
             <target>window</target>
             <description>Change PV settings</description>
           </action>
         </actions>
-        <pv_name>ADR-13004:ILck</pv_name>
+        <pv_name>$(PREFIX):RFS-ADR-11004:Ilck</pv_name>
         <text>...</text>
         <x>340</x>
         <y>75</y>
         <width>30</width>
         <height>20</height>
         <tooltip>$(actions) for:
-$(PREFIX):$(pv_name)</tooltip>
+$(pv_name)</tooltip>
       </widget>
       <widget type="action_button" version="3.0.0">
         <name>Action Button_57</name>
@@ -689,13 +689,13 @@ $(PREFIX):$(pv_name)</tooltip>
           <action type="open_display">
             <file>rflpsDIOsignal.bob</file>
             <macros>
-              <SGNL>ADR-13005:ILck</SGNL>
+              <SGNL>RFS-ADR-11005:Ilck</SGNL>
             </macros>
             <target>window</target>
             <description>Change PV settings</description>
           </action>
         </actions>
-        <pv_name>ADR-13005:ILck</pv_name>
+        <pv_name>$(PREFIX):RFS-ADR-11005:Ilck</pv_name>
         <text>...</text>
         <x>340</x>
         <y>105</y>
@@ -707,7 +707,7 @@ $(PREFIX):$(pv_name)</tooltip>
         <name>Embedded Display_74</name>
         <file>aidio_overview_v02.bob</file>
         <macros>
-          <SGNL>ADR-13006:ILck</SGNL>
+          <SGNL>RFS-ADR-11006:Ilck</SGNL>
         </macros>
         <x>380</x>
         <y>130</y>
@@ -726,7 +726,7 @@ $(PREFIX):$(pv_name)</tooltip>
             <description>Change PV settings</description>
           </action>
         </actions>
-        <pv_name>ADR-13006:ILck</pv_name>
+        <pv_name>$(PREFIX):RFS-ADR-11006:Ilck</pv_name>
         <text>...</text>
         <x>340</x>
         <y>135</y>
@@ -738,7 +738,7 @@ $(PREFIX):$(pv_name)</tooltip>
         <name>Embedded Display_75</name>
         <file>aidio_overview_v02.bob</file>
         <macros>
-          <SGNL>ADR-13007:ILck</SGNL>
+          <SGNL>RFS-ADR-11007:Ilck</SGNL>
         </macros>
         <x>700</x>
         <y>40</y>
@@ -751,13 +751,13 @@ $(PREFIX):$(pv_name)</tooltip>
           <action type="open_display">
             <file>rflpsDIOsignal.bob</file>
             <macros>
-              <SGNL>ADR-13007:ILck</SGNL>
+              <SGNL>RFS-ADR-11007:Ilck</SGNL>
             </macros>
             <target>window</target>
             <description>Change PV settings</description>
           </action>
         </actions>
-        <pv_name>ADR-13007:ILck</pv_name>
+        <pv_name>$(PREFIX):RFS-ADR-11007:Ilck</pv_name>
         <text>...</text>
         <x>660</x>
         <y>45</y>
@@ -771,13 +771,13 @@ $(PREFIX):$(pv_name)</tooltip>
           <action type="open_display">
             <file>rflpsAFsignal.bob</file>
             <macros>
-              <SGNL>ILoad-003:TE</SGNL>
+              <SGNL>RFS-Load-120:WtrC-Tmp</SGNL>
             </macros>
             <target>window</target>
             <description>Change PV settings</description>
           </action>
         </actions>
-        <pv_name>ILoad-003:TE</pv_name>
+        <pv_name>$(PREFIX):RFS-Load-120:WtrC-Tmp</pv_name>
         <text>...</text>
         <x>1260</x>
         <y>45</y>
@@ -789,7 +789,7 @@ $(PREFIX):$(pv_name)</tooltip>
         <name>Embedded Display_73</name>
         <file>ai_overview_v02.bob</file>
         <macros>
-          <SGNL>ILoad-003:TE</SGNL>
+          <SGNL>RFS-Load-120:WtrC-Tmp</SGNL>
         </macros>
         <x>1300</x>
         <y>40</y>
@@ -800,7 +800,7 @@ $(PREFIX):$(pv_name)</tooltip>
         <name>Embedded Display_76</name>
         <file>ai_overview_v02.bob</file>
         <macros>
-          <SGNL>RLoad-004:TE</SGNL>
+          <SGNL>RFS-Load-130:WtrC-Tmp</SGNL>
         </macros>
         <x>1300</x>
         <y>70</y>
@@ -811,7 +811,7 @@ $(PREFIX):$(pv_name)</tooltip>
         <name>Embedded Display_77</name>
         <file>ai_overview_v02.bob</file>
         <macros>
-          <SGNL>ILoad-001:FIT</SGNL>
+          <SGNL>RFS-Load-120:WtrC-Flw</SGNL>
         </macros>
         <x>1300</x>
         <y>100</y>
@@ -824,13 +824,13 @@ $(PREFIX):$(pv_name)</tooltip>
           <action type="open_display">
             <file>rflpsAFsignal.bob</file>
             <macros>
-              <SGNL>RLoad-004:TE</SGNL>
+              <SGNL>RFS-Load-130:WtrC-Tmp</SGNL>
             </macros>
             <target>window</target>
             <description>Change PV settings</description>
           </action>
         </actions>
-        <pv_name>RLoad-004:TE</pv_name>
+        <pv_name>$(PREFIX):RFS-Load-130:WtrC-Tmp</pv_name>
         <text>...</text>
         <x>1260</x>
         <y>75</y>
@@ -844,13 +844,13 @@ $(PREFIX):$(pv_name)</tooltip>
           <action type="open_display">
             <file>rflpsAFsignal.bob</file>
             <macros>
-              <SGNL>ILoad-001:FIT</SGNL>
+              <SGNL>RFS-Load-120:WtrC-Flw</SGNL>
             </macros>
             <target>window</target>
             <description>Change PV settings</description>
           </action>
         </actions>
-        <pv_name>ILoad-001:FIT</pv_name>
+        <pv_name>$(PREFIX):RFS-Load-120:WtrC-Flw</pv_name>
         <text>...</text>
         <x>1260</x>
         <y>105</y>
@@ -862,7 +862,7 @@ $(PREFIX):$(pv_name)</tooltip>
         <name>Embedded Display_88</name>
         <file>aidio_overview_v02.bob</file>
         <macros>
-          <SGNL>ADR-13008:ILck</SGNL>
+          <SGNL>RFS-ADR-11008:Ilck</SGNL>
         </macros>
         <x>700</x>
         <y>70</y>
@@ -875,13 +875,13 @@ $(PREFIX):$(pv_name)</tooltip>
           <action type="open_display">
             <file>rflpsDIOsignal.bob</file>
             <macros>
-              <SGNL>ADR-13008:ILck</SGNL>
+              <SGNL>RFS-ADR-11008:Ilck</SGNL>
             </macros>
             <target>window</target>
             <description>Change PV settings</description>
           </action>
         </actions>
-        <pv_name>ADR-13008:ILck</pv_name>
+        <pv_name>$(PREFIX):RFS-ADR-11008:Ilck</pv_name>
         <text>...</text>
         <x>660</x>
         <y>75</y>
@@ -893,7 +893,7 @@ $(PREFIX):$(pv_name)</tooltip>
         <name>Embedded Display_89</name>
         <file>aidio_overview_v02.bob</file>
         <macros>
-          <SGNL>ADR-13009:ILck</SGNL>
+          <SGNL>RFS-ADR-11009:Ilck</SGNL>
         </macros>
         <x>700</x>
         <y>100</y>
@@ -906,13 +906,13 @@ $(PREFIX):$(pv_name)</tooltip>
           <action type="open_display">
             <file>rflpsDIOsignal.bob</file>
             <macros>
-              <SGNL>ADR-13009:ILck</SGNL>
+              <SGNL>RFS-ADR-11009:Ilck</SGNL>
             </macros>
             <target>window</target>
             <description>Change PV settings</description>
           </action>
         </actions>
-        <pv_name>ADR-13009:ILck</pv_name>
+        <pv_name>$(PREFIX):RFS-ADR-11009:Ilck</pv_name>
         <text>...</text>
         <x>660</x>
         <y>105</y>
@@ -924,7 +924,7 @@ $(PREFIX):$(pv_name)</tooltip>
         <name>Embedded Display_90</name>
         <file>aidio_overview_v02.bob</file>
         <macros>
-          <SGNL>ADR-13010:ILck</SGNL>
+          <SGNL>RFS-ADR-11010:Ilck</SGNL>
         </macros>
         <x>700</x>
         <y>130</y>
@@ -937,13 +937,13 @@ $(PREFIX):$(pv_name)</tooltip>
           <action type="open_display">
             <file>rflpsDIOsignal.bob</file>
             <macros>
-              <SGNL>ADR-13010:ILck</SGNL>
+              <SGNL>RFS-ADR-11010:Ilck</SGNL>
             </macros>
             <target>window</target>
             <description>Change PV settings</description>
           </action>
         </actions>
-        <pv_name>ADR-13010:ILck</pv_name>
+        <pv_name>$(PREFIX):RFS-ADR-11010:Ilck</pv_name>
         <text>...</text>
         <x>660</x>
         <y>135</y>
@@ -955,7 +955,7 @@ $(PREFIX):$(pv_name)</tooltip>
         <name>Embedded Display_91</name>
         <file>aidio_overview_v02.bob</file>
         <macros>
-          <SGNL>ADR-13011:ILck</SGNL>
+          <SGNL>RFS-ADR-11011:Ilck</SGNL>
         </macros>
         <x>990</x>
         <y>40</y>
@@ -968,13 +968,13 @@ $(PREFIX):$(pv_name)</tooltip>
           <action type="open_display">
             <file>rflpsDIOsignal.bob</file>
             <macros>
-              <SGNL>ADR-13011:ILck</SGNL>
+              <SGNL>RFS-ADR-11011:Ilck</SGNL>
             </macros>
             <target>window</target>
             <description>Change PV settings</description>
           </action>
         </actions>
-        <pv_name>ADR-13011:ILck</pv_name>
+        <pv_name>$(PREFIX):RFS-ADR-11011:Ilck</pv_name>
         <text>...</text>
         <x>950</x>
         <y>45</y>
@@ -986,7 +986,7 @@ $(PREFIX):$(pv_name)</tooltip>
         <name>Embedded Display_92</name>
         <file>aidio_overview_v02.bob</file>
         <macros>
-          <SGNL>ADR-13012:ILck</SGNL>
+          <SGNL>RFS-ADR-11012:Ilck</SGNL>
         </macros>
         <x>990</x>
         <y>70</y>
@@ -999,13 +999,13 @@ $(PREFIX):$(pv_name)</tooltip>
           <action type="open_display">
             <file>rflpsDIOsignal.bob</file>
             <macros>
-              <SGNL>ADR-13012:ILck</SGNL>
+              <SGNL>RFS-ADR-11012:Ilck</SGNL>
             </macros>
             <target>window</target>
             <description>Change PV settings</description>
           </action>
         </actions>
-        <pv_name>ADR-13012:ILck</pv_name>
+        <pv_name>$(PREFIX):RFS-ADR-11012:Ilck</pv_name>
         <text>...</text>
         <x>950</x>
         <y>75</y>
@@ -1058,7 +1058,7 @@ $(PREFIX):$(pv_name)</tooltip>
         <name>Embedded Display_63</name>
         <file>aidio_overview_v02.bob</file>
         <macros>
-          <SGNL>Kly-001:APS</SGNL>
+          <SGNL>RFS-Kly-110:APS</SGNL>
         </macros>
         <x>60</x>
         <y>40</y>
@@ -1071,20 +1071,20 @@ $(PREFIX):$(pv_name)</tooltip>
           <action type="open_display">
             <file>rflpsDIOsignal.bob</file>
             <macros>
-              <SGNL>Kly-001:APS</SGNL>
+              <SGNL>RFS-Kly-110:APS</SGNL>
             </macros>
             <target>window</target>
             <description>Change PV settings</description>
           </action>
         </actions>
-        <pv_name>Kly-001:APS</pv_name>
+        <pv_name>$(PREFIX):RFS-Kly-110:APS</pv_name>
         <text>...</text>
         <x>20</x>
         <y>45</y>
         <width>30</width>
         <height>20</height>
         <tooltip>$(actions) for:
-$(PREFIX):$(pv_name)</tooltip>
+$(pv_name)</tooltip>
       </widget>
       <widget type="action_button" version="3.0.0">
         <name>Action Button_48</name>
@@ -1092,26 +1092,26 @@ $(PREFIX):$(pv_name)</tooltip>
           <action type="open_display">
             <file>rflpsAFsignal.bob</file>
             <macros>
-              <SGNL>Kly-001:OP-Win-Temp</SGNL>
+              <SGNL>RFS-Kly-110:OPWin-Tmp</SGNL>
             </macros>
             <target>window</target>
             <description>Change PV settings</description>
           </action>
         </actions>
-        <pv_name>Kly-001:OP-Win-Temp</pv_name>
+        <pv_name>$(PREFIX):RFS-Kly-110:OPWin-Tmp</pv_name>
         <text>...</text>
         <x>660</x>
         <y>45</y>
         <width>30</width>
         <height>20</height>
         <tooltip>$(actions) for:
-$(PREFIX):$(pv_name)</tooltip>
+$(pv_name)</tooltip>
       </widget>
       <widget type="embedded" version="2.0.0">
         <name>Embedded Display_62</name>
         <file>ai_overview_v02.bob</file>
         <macros>
-          <SGNL>Kly-001:OP-Win-Temp</SGNL>
+          <SGNL>RFS-Kly-110:OPWin-Tmp</SGNL>
         </macros>
         <x>700</x>
         <y>40</y>
@@ -1122,7 +1122,7 @@ $(PREFIX):$(pv_name)</tooltip>
         <name>Embedded Display_64</name>
         <file>ai_overview_v02.bob</file>
         <macros>
-          <SGNL>Circ-005:TE</SGNL>
+          <SGNL>RFS-Circ-120:WtrC-Tmp</SGNL>
         </macros>
         <x>700</x>
         <y>70</y>
@@ -1133,7 +1133,7 @@ $(PREFIX):$(pv_name)</tooltip>
         <name>Embedded Display_65</name>
         <file>ai_overview_v02.bob</file>
         <macros>
-          <SGNL>Coll-012:TE</SGNL>
+          <SGNL>RFS-Kly-110:Coll-WtrC-Tmp</SGNL>
         </macros>
         <x>700</x>
         <y>100</y>
@@ -1146,20 +1146,20 @@ $(PREFIX):$(pv_name)</tooltip>
           <action type="open_display">
             <file>rflpsAFsignal.bob</file>
             <macros>
-              <SGNL>Circ-005:TE</SGNL>
+              <SGNL>RFS-Circ-120:WtrC-Tmp</SGNL>
             </macros>
             <target>window</target>
             <description>Change PV settings</description>
           </action>
         </actions>
-        <pv_name>Circ-005:TE</pv_name>
+        <pv_name>$(PREFIX):RFS-Circ-120:WtrC-Tmp</pv_name>
         <text>...</text>
         <x>660</x>
         <y>75</y>
         <width>30</width>
         <height>20</height>
         <tooltip>$(actions) for:
-$(PREFIX):$(pv_name)</tooltip>
+$(pv_name)</tooltip>
       </widget>
       <widget type="action_button" version="3.0.0">
         <name>Action Button_50</name>
@@ -1167,26 +1167,26 @@ $(PREFIX):$(pv_name)</tooltip>
           <action type="open_display">
             <file>rflpsAFsignal.bob</file>
             <macros>
-              <SGNL>Coll-012:TE</SGNL>
+              <SGNL>RFS-Kly-110:Coll-WtrC-Tmp</SGNL>
             </macros>
             <target>window</target>
             <description>Change PV settings</description>
           </action>
         </actions>
-        <pv_name>Coll-012:TE</pv_name>
+        <pv_name>$(PREFIX):RFS-Kly-110:Coll-WtrC-Tmp</pv_name>
         <text>...</text>
         <x>660</x>
         <y>105</y>
         <width>30</width>
         <height>20</height>
         <tooltip>$(actions) for:
-$(PREFIX):$(pv_name)</tooltip>
+$(pv_name)</tooltip>
       </widget>
       <widget type="embedded" version="2.0.0">
         <name>Embedded Display_85</name>
         <file>aidio_overview_v02.bob</file>
         <macros>
-          <SGNL>PSS-001:Ready</SGNL>
+          <SGNL>RFS-SIM-110:PSS-Ready</SGNL>
         </macros>
         <x>60</x>
         <y>70</y>
@@ -1199,20 +1199,20 @@ $(PREFIX):$(pv_name)</tooltip>
           <action type="open_display">
             <file>rflpsDIOsignal.bob</file>
             <macros>
-              <SGNL>PSS-001:Ready</SGNL>
+              <SGNL>RFS-SIM-110:PSS-Ready</SGNL>
             </macros>
             <target>window</target>
             <description>Change PV settings</description>
           </action>
         </actions>
-        <pv_name>PSS-001:Ready</pv_name>
+        <pv_name>$(PREFIX):RFS-SIM-110:PSS-Ready</pv_name>
         <text>...</text>
         <x>20</x>
         <y>75</y>
         <width>30</width>
         <height>20</height>
         <tooltip>$(actions) for:
-$(PREFIX):$(pv_name)</tooltip>
+$(pv_name)</tooltip>
       </widget>
       <widget type="action_button" version="3.0.0">
         <name>Action Button_79</name>
@@ -1220,13 +1220,13 @@ $(PREFIX):$(pv_name)</tooltip>
           <action type="open_display">
             <file>rflpsAFsignal.bob</file>
             <macros>
-              <SGNL>Coll-008:FIT</SGNL>
+              <SGNL>RFS-Kly-110:Coll-WtrC-Flw</SGNL>
             </macros>
             <target>window</target>
             <description>Change PV settings</description>
           </action>
         </actions>
-        <pv_name>Coll-008:FIT</pv_name>
+        <pv_name>$(PREFIX):RFS-Kly-110:Coll-WtrC-Flw</pv_name>
         <text>...</text>
         <x>660</x>
         <y>135</y>
@@ -1238,7 +1238,7 @@ $(PREFIX):$(pv_name)</tooltip>
         <name>Embedded Display_87</name>
         <file>ai_overview_v02.bob</file>
         <macros>
-          <SGNL>Coll-008:FIT</SGNL>
+          <SGNL>RFS-Kly-110:Coll-WtrC-Flw</SGNL>
         </macros>
         <x>700</x>
         <y>130</y>
@@ -1251,26 +1251,26 @@ $(PREFIX):$(pv_name)</tooltip>
           <action type="open_display">
             <file>rflpsAFsignal.bob</file>
             <macros>
-              <SGNL>Coll-001:SW_CALC</SGNL>
+              <SGNL>RFS-Coll-110:SW_CALC</SGNL>
             </macros>
             <target>window</target>
             <description>Change PV settings</description>
           </action>
         </actions>
-        <pv_name>Coll-001:SW_CALC</pv_name>
+        <pv_name>$(PREFIX):RFS-Coll-110:SW_CALC</pv_name>
         <text>...</text>
         <x>990</x>
         <y>45</y>
         <width>30</width>
         <height>20</height>
         <tooltip>$(actions) for:
-$(PREFIX):$(pv_name)</tooltip>
+$(pv_name)</tooltip>
       </widget>
       <widget type="embedded" version="2.0.0">
         <name>Embedded Display_78</name>
         <file>ai_overview_v02.bob</file>
         <macros>
-          <SGNL>Coll-001:SW_CALC</SGNL>
+          <SGNL>RFS-Coll-110:SW_CALC</SGNL>
         </macros>
         <x>1030</x>
         <y>40</y>
@@ -1334,7 +1334,7 @@ $(PREFIX):$(pv_name)</tooltip>
       </widget>
       <widget type="led" version="2.0.0">
         <name>LED_73</name>
-        <pv_name>$(PREFIX):SOLENOID02-INT-RB</pv_name>
+        <pv_name>$(PREFIX):RFS-SOLENOID02-INT-RB</pv_name>
         <x>1360</x>
         <y>75</y>
         <width>21</width>
@@ -1356,7 +1356,7 @@ $(PREFIX):$(pv_name)</tooltip>
       </widget>
       <widget type="led" version="2.0.0">
         <name>LED_72</name>
-        <pv_name>$(PREFIX):SOLENOID01-INT-RB</pv_name>
+        <pv_name>$(PREFIX):RFS-SOLENOID01-INT-RB</pv_name>
         <x>1360</x>
         <y>45</y>
         <width>21</width>
@@ -1378,7 +1378,7 @@ $(PREFIX):$(pv_name)</tooltip>
       </widget>
       <widget type="led" version="2.0.0">
         <name>LED_74</name>
-        <pv_name>$(PREFIX):SOLENOID03-INT-RB</pv_name>
+        <pv_name>$(PREFIX):RFS-SOLENOID03-INT-RB</pv_name>
         <x>1360</x>
         <y>105</y>
         <width>21</width>
@@ -1437,13 +1437,13 @@ $(PREFIX):$(pv_name)</tooltip>
           <action type="open_display">
             <file>rflpsSOLsignal_v03.bob</file>
             <macros>
-              <SGNL>SOLENOID01</SGNL>
+              <SGNL>RFS-SOLENOID01</SGNL>
             </macros>
             <target>window</target>
             <description>Change PV settings</description>
           </action>
         </actions>
-        <pv_name>SOLENOID01</pv_name>
+        <pv_name>$(PREFIX):RFS-SOLENOID01</pv_name>
         <text>...</text>
         <x>1320</x>
         <y>45</y>
@@ -1457,13 +1457,13 @@ $(PREFIX):$(pv_name)</tooltip>
           <action type="open_display">
             <file>rflpsSOLsignal_v03.bob</file>
             <macros>
-              <SGNL>SOLENOID03</SGNL>
+              <SGNL>RFS-SOLENOID03</SGNL>
             </macros>
             <target>window</target>
             <description>Change PV settings</description>
           </action>
         </actions>
-        <pv_name>SOLENOID03</pv_name>
+        <pv_name>$(PREFIX):RFS-SOLENOID03</pv_name>
         <text>...</text>
         <x>1320</x>
         <y>105</y>
@@ -1477,13 +1477,13 @@ $(PREFIX):$(pv_name)</tooltip>
           <action type="open_display">
             <file>rflpsSOLsignal_v03.bob</file>
             <macros>
-              <SGNL>SOLENOID02</SGNL>
+              <SGNL>RFS-SOLENOID02</SGNL>
             </macros>
             <target>window</target>
             <description>Change PV settings</description>
           </action>
         </actions>
-        <pv_name>SOLENOID02</pv_name>
+        <pv_name>$(PREFIX):RFS-SOLENOID02</pv_name>
         <text>...</text>
         <x>1320</x>
         <y>75</y>
@@ -1495,7 +1495,7 @@ $(PREFIX):$(pv_name)</tooltip>
         <name>Embedded Display_57</name>
         <file>aidio_overview_v02.bob</file>
         <macros>
-          <SGNL>Oil-001:LO</SGNL>
+          <SGNL>RFS-Kly-110:Oil-LO</SGNL>
         </macros>
         <x>60</x>
         <y>40</y>
@@ -1508,26 +1508,26 @@ $(PREFIX):$(pv_name)</tooltip>
           <action type="open_display">
             <file>rflpsDIOsignal.bob</file>
             <macros>
-              <SGNL>Oil-001:LO</SGNL>
+              <SGNL>RFS-Kly-110:Oil-LO</SGNL>
             </macros>
             <target>window</target>
             <description>Change PV settings</description>
           </action>
         </actions>
-        <pv_name>Oil-001:LO</pv_name>
+        <pv_name>$(PREFIX):RFS-Kly-110:Oil-LO</pv_name>
         <text>...</text>
         <x>20</x>
         <y>45</y>
         <width>30</width>
         <height>20</height>
         <tooltip>$(actions) for:
-$(PREFIX):$(pv_name)</tooltip>
+$(pv_name)</tooltip>
       </widget>
       <widget type="embedded" version="2.0.0">
         <name>Embedded Display_59</name>
         <file>aidio_overview_v02.bob</file>
         <macros>
-          <SGNL>DA-001:Ready</SGNL>
+          <SGNL>RFS-PAmp-110:Ready</SGNL>
         </macros>
         <x>60</x>
         <y>70</y>
@@ -1540,13 +1540,13 @@ $(PREFIX):$(pv_name)</tooltip>
           <action type="open_display">
             <file>rflpsDIOsignal.bob</file>
             <macros>
-              <SGNL>DA-001:Ready</SGNL>
+              <SGNL>RFS-PAmp-110:Ready</SGNL>
             </macros>
             <target>window</target>
             <description>Change PV settings</description>
           </action>
         </actions>
-        <pv_name>DA-001:Ready</pv_name>
+        <pv_name>$(PREFIX):RFS-PAmp-110:Ready</pv_name>
         <text>...</text>
         <x>20</x>
         <y>75</y>
@@ -1558,7 +1558,7 @@ $(PREFIX):$(pv_name)</tooltip>
         <name>Embedded Display_61</name>
         <file>aidio_overview_v02.bob</file>
         <macros>
-          <SGNL>Body-009:FIS</SGNL>
+          <SGNL>RFS-Body-110:FIS</SGNL>
         </macros>
         <x>60</x>
         <y>100</y>
@@ -1571,13 +1571,13 @@ $(PREFIX):$(pv_name)</tooltip>
           <action type="open_display">
             <file>rflpsDIOsignal.bob</file>
             <macros>
-              <SGNL>Body-009:FIS</SGNL>
+              <SGNL>RFS-Body-110:FIS</SGNL>
             </macros>
             <target>window</target>
             <description>Change PV settings</description>
           </action>
         </actions>
-        <pv_name>Body-009:FIS</pv_name>
+        <pv_name>$(PREFIX):RFS-Body-110:FIS</pv_name>
         <text>...</text>
         <x>20</x>
         <y>105</y>
@@ -1589,7 +1589,7 @@ $(PREFIX):$(pv_name)</tooltip>
         <name>Embedded Display_58</name>
         <file>ai_overview_v02.bob</file>
         <macros>
-          <SGNL>Body-013:TE</SGNL>
+          <SGNL>RFS-Kly-110:Body-WtrC-Tmp</SGNL>
         </macros>
         <x>700</x>
         <y>40</y>
@@ -1600,7 +1600,7 @@ $(PREFIX):$(pv_name)</tooltip>
         <name>Embedded Display_60</name>
         <file>ai_overview_v02.bob</file>
         <macros>
-          <SGNL>Sol-014:TE</SGNL>
+          <SGNL>RFS-Kly-110:Sol-WtrC-Tmp</SGNL>
         </macros>
         <x>700</x>
         <y>70</y>
@@ -1613,13 +1613,13 @@ $(PREFIX):$(pv_name)</tooltip>
           <action type="open_display">
             <file>rflpsAFsignal.bob</file>
             <macros>
-              <SGNL>Sol-014:TE</SGNL>
+              <SGNL>RFS-Kly-110:Sol-WtrC-Tmp</SGNL>
             </macros>
             <target>window</target>
             <description>Change PV settings</description>
           </action>
         </actions>
-        <pv_name>Sol-014:TE</pv_name>
+        <pv_name>$(PREFIX):RFS-Kly-110:Sol-WtrC-Tmp</pv_name>
         <text>...</text>
         <x>660</x>
         <y>75</y>
@@ -1633,20 +1633,20 @@ $(PREFIX):$(pv_name)</tooltip>
           <action type="open_display">
             <file>rflpsAFsignal.bob</file>
             <macros>
-              <SGNL>Body-013:TE</SGNL>
+              <SGNL>RFS-Kly-110:Body-WtrC-Tmp</SGNL>
             </macros>
             <target>window</target>
             <description>Change PV settings</description>
           </action>
         </actions>
-        <pv_name>Body-013:TE</pv_name>
+        <pv_name>$(PREFIX):RFS-Kly-110:Body-WtrC-Tmp</pv_name>
         <text>...</text>
         <x>660</x>
         <y>45</y>
         <width>30</width>
         <height>20</height>
         <tooltip>$(actions) for:
-$(PREFIX):$(pv_name)</tooltip>
+$(pv_name)</tooltip>
       </widget>
       <widget type="action_button" version="3.0.0">
         <name>Action Button_75</name>
@@ -1654,26 +1654,26 @@ $(PREFIX):$(pv_name)</tooltip>
           <action type="open_display">
             <file>rflpsDIOsignal.bob</file>
             <macros>
-              <SGNL>Sol-010:FIS</SGNL>
+              <SGNL>RFS-Sol-110:FIS</SGNL>
             </macros>
             <target>window</target>
             <description>Change PV settings</description>
           </action>
         </actions>
-        <pv_name>Sol-010:FIS</pv_name>
+        <pv_name>$(PREFIX):RFS-Sol-110:FIS</pv_name>
         <text>...</text>
         <x>340</x>
         <y>45</y>
         <width>30</width>
         <height>20</height>
         <tooltip>$(actions) for:
-$(PREFIX):$(pv_name)</tooltip>
+$(pv_name)</tooltip>
       </widget>
       <widget type="embedded" version="2.0.0">
         <name>Embedded Display_83</name>
         <file>aidio_overview_v02.bob</file>
         <macros>
-          <SGNL>Sol-010:FIS</SGNL>
+          <SGNL>RFS-Sol-110:FIS</SGNL>
         </macros>
         <x>380</x>
         <y>40</y>
@@ -1684,7 +1684,7 @@ $(PREFIX):$(pv_name)</tooltip>
         <name>Embedded Display_84</name>
         <file>aidio_overview_v02.bob</file>
         <macros>
-          <SGNL>Circ-002:FIS</SGNL>
+          <SGNL>RFS-Circ-120:FIS</SGNL>
         </macros>
         <x>380</x>
         <y>70</y>
@@ -1697,20 +1697,20 @@ $(PREFIX):$(pv_name)</tooltip>
           <action type="open_display">
             <file>rflpsDIOsignal.bob</file>
             <macros>
-              <SGNL>Circ-002:FIS</SGNL>
+              <SGNL>RFS-Circ-120:FIS</SGNL>
             </macros>
             <target>window</target>
             <description>Change PV settings</description>
           </action>
         </actions>
-        <pv_name>Circ-002:FIS</pv_name>
+        <pv_name>$(PREFIX):RFS-Circ-120:FIS</pv_name>
         <text>...</text>
         <x>340</x>
         <y>75</y>
         <width>30</width>
         <height>20</height>
         <tooltip>$(actions) for:
-$(PREFIX):$(pv_name)</tooltip>
+$(pv_name)</tooltip>
       </widget>
     </widget>
     <widget type="rectangle" version="2.0.0">
@@ -1751,7 +1751,7 @@ $(PREFIX):$(pv_name)</tooltip>
         <name>Embedded Display_2</name>
         <file>ai_overview_v02.bob</file>
         <macros>
-          <SGNL>VacPS-001:I</SGNL>
+          <SGNL>RFS-VacPS-110:I</SGNL>
         </macros>
         <x>380</x>
         <y>40</y>
@@ -1764,26 +1764,26 @@ $(PREFIX):$(pv_name)</tooltip>
           <action type="open_display">
             <file>rflpsAFsignal.bob</file>
             <macros>
-              <SGNL>VacPS-001:I</SGNL>
+              <SGNL>RFS-VacPS-110:I</SGNL>
             </macros>
             <target>window</target>
             <description>Change PV settings</description>
           </action>
         </actions>
-        <pv_name>VacPS-001:I</pv_name>
+        <pv_name>$(PREFIX):RFS-VacPS-110:I</pv_name>
         <text>...</text>
         <x>340</x>
         <y>45</y>
         <width>30</width>
         <height>20</height>
         <tooltip>$(actions) for:
-$(PREFIX):$(pv_name)</tooltip>
+$(pv_name)</tooltip>
       </widget>
       <widget type="embedded" version="2.0.0">
         <name>Embedded Display_45</name>
         <file>ai_overview_v02.bob</file>
         <macros>
-          <SGNL>VacPS-002:I</SGNL>
+          <SGNL>RFS-VacPS-120:I</SGNL>
         </macros>
         <x>380</x>
         <y>70</y>
@@ -1796,20 +1796,20 @@ $(PREFIX):$(pv_name)</tooltip>
           <action type="open_display">
             <file>rflpsAFsignal.bob</file>
             <macros>
-              <SGNL>VacPS-002:I</SGNL>
+              <SGNL>RFS-VacPS-120:I</SGNL>
             </macros>
             <target>window</target>
             <description>Change PV settings</description>
           </action>
         </actions>
-        <pv_name>VacPS-002:I</pv_name>
+        <pv_name>$(PREFIX):RFS-VacPS-120:I</pv_name>
         <text>...</text>
         <x>340</x>
         <y>75</y>
         <width>30</width>
         <height>20</height>
         <tooltip>$(actions) for:
-$(PREFIX):$(pv_name)</tooltip>
+$(pv_name)</tooltip>
       </widget>
       <widget type="action_button" version="3.0.0">
         <name>Action Button_74</name>
@@ -1817,20 +1817,20 @@ $(PREFIX):$(pv_name)</tooltip>
           <action type="open_display">
             <file>rflpsDIOsignal.bob</file>
             <macros>
-              <SGNL>Main-001:EmSw</SGNL>
+              <SGNL>RFS-Kly-110:EmSw</SGNL>
             </macros>
             <target>window</target>
             <description>Change PV settings</description>
           </action>
         </actions>
-        <pv_name>Main-001:EmSw</pv_name>
+        <pv_name>$(PREFIX):RFS-Kly-110:EmSw</pv_name>
         <text>...</text>
         <x>20</x>
         <y>105</y>
         <width>30</width>
         <height>20</height>
         <tooltip>$(actions) for:
-$(PREFIX):$(pv_name)</tooltip>
+$(pv_name)</tooltip>
       </widget>
       <widget type="action_button" version="3.0.0">
         <name>Action Button_72</name>
@@ -1838,26 +1838,26 @@ $(PREFIX):$(pv_name)</tooltip>
           <action type="open_display">
             <file>rflpsDIOsignal.bob</file>
             <macros>
-              <SGNL>VacPS-002:HVON</SGNL>
+              <SGNL>RFS-VacPS-120:HVON</SGNL>
             </macros>
             <target>window</target>
             <description>Change PV settings</description>
           </action>
         </actions>
-        <pv_name>VacPS-002:HVON</pv_name>
+        <pv_name>$(PREFIX):RFS-VacPS-120:HVON</pv_name>
         <text>...</text>
         <x>20</x>
         <y>75</y>
         <width>30</width>
         <height>20</height>
         <tooltip>$(actions) for:
-$(PREFIX):$(pv_name)</tooltip>
+$(pv_name)</tooltip>
       </widget>
       <widget type="embedded" version="2.0.0">
         <name>Embedded Display_47</name>
         <file>aidio_overview_v02.bob</file>
         <macros>
-          <SGNL>Main-001:EmSw</SGNL>
+          <SGNL>RFS-Kly-110:EmSw</SGNL>
         </macros>
         <x>60</x>
         <y>100</y>
@@ -1868,7 +1868,7 @@ $(PREFIX):$(pv_name)</tooltip>
         <name>Embedded Display_46</name>
         <file>aidio_overview_v02.bob</file>
         <macros>
-          <SGNL>VacPS-002:HVON</SGNL>
+          <SGNL>RFS-VacPS-120:HVON</SGNL>
         </macros>
         <x>60</x>
         <y>70</y>
@@ -1879,7 +1879,7 @@ $(PREFIX):$(pv_name)</tooltip>
         <name>Embedded Display_6</name>
         <file>aidio_overview_v02.bob</file>
         <macros>
-          <SGNL>VacPS-001:HVON</SGNL>
+          <SGNL>RFS-VacPS-110:HVON</SGNL>
         </macros>
         <x>60</x>
         <y>40</y>
@@ -1892,20 +1892,20 @@ $(PREFIX):$(pv_name)</tooltip>
           <action type="open_display">
             <file>rflpsDIOsignal.bob</file>
             <macros>
-              <SGNL>VacPS-001:HVON</SGNL>
+              <SGNL>RFS-VacPS-110:HVON</SGNL>
             </macros>
             <target>window</target>
             <description>Change PV settings</description>
           </action>
         </actions>
-        <pv_name>VacPS-001:HVON</pv_name>
+        <pv_name>$(PREFIX):RFS-VacPS-110:HVON</pv_name>
         <text>...</text>
         <x>20</x>
         <y>45</y>
         <width>30</width>
         <height>20</height>
         <tooltip>$(actions) for:
-$(PREFIX):$(pv_name)</tooltip>
+$(pv_name)</tooltip>
       </widget>
       <widget type="label" version="2.0.0">
         <name>Label_284</name>
@@ -2058,7 +2058,7 @@ h, m = divmod(minutes, 60)
 #pv = "%02d:%02d" % (minutes, seconds)
 
 widget.setPropertyValue('text', "%d:%02d:%02d" % (h, m, s))]]></text>
-            <pv_name>$(PREFIX):FILAMENT-TWARMTLEFT-RB</pv_name>
+            <pv_name>$(PREFIX):RFS-FILAMENT-TWARMTLEFT-RB</pv_name>
           </script>
         </scripts>
       </widget>
@@ -2089,7 +2089,7 @@ widget.setPropertyValue('text', "%d:%02d:%02d" % (h, m, s))]]></text>
       </widget>
       <widget type="textupdate" version="2.0.0">
         <name>Text Update_119</name>
-        <pv_name>$(PREFIX):FILAMENT-ON-RB</pv_name>
+        <pv_name>$(PREFIX):RFS-FILAMENT-ON-RB</pv_name>
         <x>130</x>
         <y>40</y>
         <width>80</width>
@@ -2119,7 +2119,7 @@ widget.setPropertyValue('text', "%d:%02d:%02d" % (h, m, s))]]></text>
       </widget>
       <widget type="textupdate" version="2.0.0">
         <name>Text Update_118</name>
-        <pv_name>$(PREFIX):FILAMENT-CURRENTSTAT-RB</pv_name>
+        <pv_name>$(PREFIX):RFS-FILAMENT-CURRENTSTAT-RB</pv_name>
         <x>130</x>
         <y>70</y>
         <width>80</width>
@@ -2164,7 +2164,7 @@ widget.setPropertyValue('text', "%d:%02d:%02d" % (h, m, s))]]></text>
                 </color>
               </value>
             </exp>
-            <pv_name>$(PREFIX):FILAMENT-CURRENTSTAT-RB</pv_name>
+            <pv_name>$(pv_name)</pv_name>
           </rule>
         </rules>
         <tooltip>$(pv_name)
@@ -2228,7 +2228,7 @@ $(pv_value)
       </widget>
       <widget type="textupdate" version="2.0.0">
         <name>Text Update_123</name>
-        <pv_name>$(PREFIX):SOLENOID02-ON-RB</pv_name>
+        <pv_name>$(PREFIX):RFS-SOLENOID02-ON-RB</pv_name>
         <x>130</x>
         <y>70</y>
         <width>90</width>
@@ -2254,7 +2254,7 @@ $(pv_value)
       </widget>
       <widget type="textupdate" version="2.0.0">
         <name>Text Update_124</name>
-        <pv_name>$(PREFIX):SOLENOID01-ON-RB</pv_name>
+        <pv_name>$(PREFIX):RFS-SOLENOID01-ON-RB</pv_name>
         <x>130</x>
         <y>40</y>
         <width>90</width>
@@ -2280,7 +2280,7 @@ $(pv_value)
       </widget>
       <widget type="textupdate" version="2.0.0">
         <name>Text Update_125</name>
-        <pv_name>$(PREFIX):SOLENOID03-ON-RB</pv_name>
+        <pv_name>$(PREFIX):RFS-SOLENOID03-ON-RB</pv_name>
         <x>130</x>
         <y>100</y>
         <width>90</width>
@@ -2386,24 +2386,24 @@ $(pv_value)
           <action type="open_display">
             <file>rflpsDIOsignal.bob</file>
             <macros>
-              <SGNL>FIM-001:HVenaStat</SGNL>
+              <SGNL>RFS-FIM-110:HVenaStat</SGNL>
             </macros>
             <target>window</target>
             <description>Change PV settings</description>
           </action>
         </actions>
-        <pv_name>FIM-001:HVenaStat</pv_name>
+        <pv_name>$(PREFIX):RFS-FIM-110:HVenaStat</pv_name>
         <text>...</text>
         <x>220</x>
         <y>130</y>
         <width>30</width>
         <height>20</height>
         <tooltip>$(actions) for:
-$(PREFIX):$(pv_name)</tooltip>
+$(pv_name)</tooltip>
       </widget>
       <widget type="textupdate" version="2.0.0">
         <name>Text Update_129</name>
-        <pv_name>$(PREFIX):FIM-001:HVena-INT-RB</pv_name>
+        <pv_name>$(PREFIX):RFS-FIM-110:HVena-INT-RB</pv_name>
         <x>160</x>
         <y>45</y>
         <width>90</width>
@@ -2432,7 +2432,7 @@ $(PREFIX):$(pv_name)</tooltip>
         <name>Embedded Display_79</name>
         <file>aidio_overview_v02.bob</file>
         <macros>
-          <SGNL>FIM-001:HVenaStat</SGNL>
+          <SGNL>RFS-FIM-110:HVenaStat</SGNL>
         </macros>
         <x>10</x>
         <y>125</y>
@@ -2441,7 +2441,7 @@ $(PREFIX):$(pv_name)</tooltip>
       </widget>
       <widget type="textupdate" version="2.0.0">
         <name>Text Update_130</name>
-        <pv_name>$(PREFIX):FIM-001:HVena.DESC</pv_name>
+        <pv_name>$(PREFIX):RFS-FIM-110:HVena.DESC</pv_name>
         <x>20</x>
         <y>45</y>
         <width>120</width>
@@ -2531,24 +2531,24 @@ $(PREFIX):$(pv_name)</tooltip>
           <action type="open_display">
             <file>rflpsDIOsignal.bob</file>
             <macros>
-              <SGNL>FIM-001:RFenaStat</SGNL>
+              <SGNL>RFS-FIM-110:RFenaStat</SGNL>
             </macros>
             <target>window</target>
             <description>Change PV settings</description>
           </action>
         </actions>
-        <pv_name>FIM-001:RFenaStat</pv_name>
+        <pv_name>$(PREFIX):RFS-FIM-110:RFenaStat</pv_name>
         <text>...</text>
         <x>220</x>
         <y>130</y>
         <width>30</width>
         <height>20</height>
         <tooltip>$(actions) for:
-$(PREFIX):$(pv_name)</tooltip>
+$(pv_name)</tooltip>
       </widget>
       <widget type="textupdate" version="2.0.0">
         <name>Text Update_106</name>
-        <pv_name>$(PREFIX):FIM-001-RFena-INT-RB</pv_name>
+        <pv_name>$(PREFIX):RFS-FIM-110:RFenaStat-INT-RB</pv_name>
         <x>160</x>
         <y>35</y>
         <width>90</width>
@@ -2575,7 +2575,7 @@ $(PREFIX):$(pv_name)</tooltip>
       </widget>
       <widget type="textupdate" version="2.0.0">
         <name>Text Update_109</name>
-        <pv_name>$(PREFIX):DA-001:Daena-INT-RB</pv_name>
+        <pv_name>$(PREFIX):RFS-PAmp-110:Daena-INT-RB</pv_name>
         <x>160</x>
         <y>73</y>
         <width>90</width>
@@ -2604,7 +2604,7 @@ $(PREFIX):$(pv_name)</tooltip>
         <name>Embedded Display_80</name>
         <file>aidio_overview_v02.bob</file>
         <macros>
-          <SGNL>FIM-001:RFenaStat</SGNL>
+          <SGNL>RFS-FIM-110:RFenaStat</SGNL>
         </macros>
         <x>10</x>
         <y>125</y>
@@ -2613,7 +2613,7 @@ $(PREFIX):$(pv_name)</tooltip>
       </widget>
       <widget type="textupdate" version="2.0.0">
         <name>Text Update_131</name>
-        <pv_name>$(PREFIX):FIM-001-RFena.DESC</pv_name>
+        <pv_name>$(PREFIX):RFS-FIM-110:RFenaStat.DESC</pv_name>
         <x>20</x>
         <y>35</y>
         <width>120</width>
@@ -2644,7 +2644,7 @@ $(PREFIX):$(pv_name)</tooltip>
       </widget>
       <widget type="textupdate" version="2.0.0">
         <name>Text Update_132</name>
-        <pv_name>$(PREFIX):DA-001:Daena.DESC</pv_name>
+        <pv_name>$(PREFIX):RFS-FIM-110:RFenaStat.DESC</pv_name>
         <x>20</x>
         <y>73</y>
         <width>120</width>
diff --git a/NON-APPROVED/TS2/ts2-010rfc-rflps/support/transitions_fim_v02.bob b/NON-APPROVED/TS2/ts2-010rfc-rflps/support/transitions_fim_v02.bob
index 4424826dac029996fe0503acc79b7b586e260eba..f79018f9807e9edd8244a314a9141f057bfb2e4d 100644
--- a/NON-APPROVED/TS2/ts2-010rfc-rflps/support/transitions_fim_v02.bob
+++ b/NON-APPROVED/TS2/ts2-010rfc-rflps/support/transitions_fim_v02.bob
@@ -5,16 +5,16 @@
     <EXPERT_DISPLAY>AnalogChannelGeneric.bob</EXPERT_DISPLAY>
     <ch_index>AI0</ch_index>
   </macros>
-  <width>1715</width>
-  <height>1101</height>
+  <width>1970</width>
+  <height>1080</height>
   <actions>
   </actions>
   <widget type="group" version="2.0.0">
     <name>Analog Inputs</name>
     <x>18</x>
     <y>11</y>
-    <width>840</width>
-    <height>1060</height>
+    <width>942</width>
+    <height>1049</height>
     <style>3</style>
     <background_color>
       <color name="BACKGROUND" red="220" green="225" blue="221">
@@ -22,8 +22,8 @@
     </background_color>
     <widget type="rectangle" version="2.0.0">
       <name>MGGrey03-background</name>
-      <width>840</width>
-      <height>1060</height>
+      <width>941</width>
+      <height>1049</height>
       <line_width>2</line_width>
       <line_color>
         <color name="GROUP-BORDER" red="150" green="155" blue="151">
@@ -55,7 +55,7 @@
     <widget type="label" version="2.0.0">
       <name>Label_32</name>
       <text>pre</text>
-      <x>578</x>
+      <x>686</x>
       <y>60</y>
       <width>40</width>
       <font>
@@ -67,7 +67,7 @@
     <widget type="label" version="2.0.0">
       <name>Label_18</name>
       <text>RF ON</text>
-      <x>598</x>
+      <x>702</x>
       <y>60</y>
       <width>72</width>
       <font>
@@ -80,7 +80,7 @@
     <widget type="label" version="2.0.0">
       <name>Label_20</name>
       <text>HV ON</text>
-      <x>489</x>
+      <x>596</x>
       <y>60</y>
       <width>72</width>
       <font>
@@ -93,7 +93,7 @@
     <widget type="label" version="2.0.0">
       <name>Label_21</name>
       <text>pre</text>
-      <x>468</x>
+      <x>575</x>
       <y>60</y>
       <width>40</width>
       <font>
@@ -105,7 +105,7 @@
     <widget type="label" version="2.0.0">
       <name>Label_22</name>
       <text>Description</text>
-      <x>258</x>
+      <x>312</x>
       <y>60</y>
       <width>170</width>
       <font>
@@ -137,7 +137,7 @@
       </macros>
       <x>21</x>
       <y>90</y>
-      <width>800</width>
+      <width>910</width>
       <height>34</height>
       <resize>2</resize>
       <transparent>true</transparent>
@@ -156,7 +156,7 @@
       </macros>
       <x>21</x>
       <y>138</y>
-      <width>800</width>
+      <width>910</width>
       <height>34</height>
       <resize>2</resize>
       <transparent>true</transparent>
@@ -175,7 +175,7 @@
       </macros>
       <x>21</x>
       <y>186</y>
-      <width>800</width>
+      <width>910</width>
       <height>34</height>
       <resize>2</resize>
       <transparent>true</transparent>
@@ -194,7 +194,7 @@
       </macros>
       <x>21</x>
       <y>234</y>
-      <width>800</width>
+      <width>910</width>
       <height>34</height>
       <resize>2</resize>
       <transparent>true</transparent>
@@ -213,7 +213,7 @@
       </macros>
       <x>21</x>
       <y>282</y>
-      <width>800</width>
+      <width>910</width>
       <height>34</height>
       <resize>2</resize>
       <transparent>true</transparent>
@@ -232,7 +232,7 @@
       </macros>
       <x>21</x>
       <y>330</y>
-      <width>800</width>
+      <width>910</width>
       <height>34</height>
       <resize>2</resize>
       <transparent>true</transparent>
@@ -251,7 +251,7 @@
       </macros>
       <x>21</x>
       <y>378</y>
-      <width>800</width>
+      <width>910</width>
       <height>34</height>
       <resize>2</resize>
       <transparent>true</transparent>
@@ -270,7 +270,7 @@
       </macros>
       <x>21</x>
       <y>426</y>
-      <width>800</width>
+      <width>910</width>
       <height>34</height>
       <resize>2</resize>
       <transparent>true</transparent>
@@ -289,7 +289,7 @@
       </macros>
       <x>21</x>
       <y>474</y>
-      <width>800</width>
+      <width>910</width>
       <height>34</height>
       <resize>2</resize>
       <transparent>true</transparent>
@@ -308,7 +308,7 @@
       </macros>
       <x>21</x>
       <y>522</y>
-      <width>800</width>
+      <width>910</width>
       <height>34</height>
       <resize>2</resize>
       <transparent>true</transparent>
@@ -327,7 +327,7 @@
       </macros>
       <x>21</x>
       <y>570</y>
-      <width>800</width>
+      <width>910</width>
       <height>34</height>
       <resize>2</resize>
       <transparent>true</transparent>
@@ -346,7 +346,7 @@
       </macros>
       <x>21</x>
       <y>618</y>
-      <width>800</width>
+      <width>910</width>
       <height>34</height>
       <resize>2</resize>
       <transparent>true</transparent>
@@ -365,7 +365,7 @@
       </macros>
       <x>21</x>
       <y>666</y>
-      <width>800</width>
+      <width>910</width>
       <height>34</height>
       <resize>2</resize>
       <transparent>true</transparent>
@@ -384,7 +384,7 @@
       </macros>
       <x>21</x>
       <y>762</y>
-      <width>800</width>
+      <width>910</width>
       <height>34</height>
       <resize>2</resize>
       <transparent>true</transparent>
@@ -403,7 +403,7 @@
       </macros>
       <x>21</x>
       <y>810</y>
-      <width>800</width>
+      <width>910</width>
       <height>34</height>
       <resize>2</resize>
       <transparent>true</transparent>
@@ -422,7 +422,7 @@
       </macros>
       <x>21</x>
       <y>858</y>
-      <width>800</width>
+      <width>910</width>
       <height>34</height>
       <resize>2</resize>
       <transparent>true</transparent>
@@ -441,7 +441,7 @@
       </macros>
       <x>21</x>
       <y>906</y>
-      <width>800</width>
+      <width>910</width>
       <height>34</height>
       <resize>2</resize>
       <transparent>true</transparent>
@@ -460,7 +460,7 @@
       </macros>
       <x>21</x>
       <y>954</y>
-      <width>800</width>
+      <width>910</width>
       <height>34</height>
       <resize>2</resize>
       <transparent>true</transparent>
@@ -479,7 +479,7 @@
       </macros>
       <x>21</x>
       <y>1001</y>
-      <width>800</width>
+      <width>910</width>
       <height>34</height>
       <resize>2</resize>
       <transparent>true</transparent>
@@ -498,7 +498,7 @@
       </macros>
       <x>21</x>
       <y>714</y>
-      <width>800</width>
+      <width>910</width>
       <height>34</height>
       <resize>2</resize>
       <transparent>true</transparent>
@@ -510,7 +510,7 @@
     <widget type="label" version="2.0.0">
       <name>Label_19</name>
       <text>ILCK</text>
-      <x>732</x>
+      <x>845</x>
       <y>60</y>
       <width>46</width>
       <font>
@@ -523,7 +523,7 @@
     <widget type="label" version="2.0.0">
       <name>Label_24</name>
       <text>First</text>
-      <x>778</x>
+      <x>884</x>
       <y>60</y>
       <width>46</width>
       <font>
@@ -536,10 +536,10 @@
   </widget>
   <widget type="group" version="2.0.0">
     <name>Digital Inputs</name>
-    <x>870</x>
+    <x>980</x>
     <y>11</y>
-    <width>840</width>
-    <height>1060</height>
+    <width>950</width>
+    <height>1049</height>
     <style>3</style>
     <background_color>
       <color name="BACKGROUND" red="220" green="225" blue="221">
@@ -547,8 +547,8 @@
     </background_color>
     <widget type="rectangle" version="2.0.0">
       <name>MGGrey03-background_1</name>
-      <width>840</width>
-      <height>1060</height>
+      <width>950</width>
+      <height>1049</height>
       <line_width>2</line_width>
       <line_color>
         <color name="GROUP-BORDER" red="150" green="155" blue="151">
@@ -662,7 +662,7 @@
       </macros>
       <x>20</x>
       <y>90</y>
-      <width>800</width>
+      <width>910</width>
       <height>34</height>
       <resize>2</resize>
       <transparent>true</transparent>
@@ -681,7 +681,7 @@
       </macros>
       <x>20</x>
       <y>138</y>
-      <width>800</width>
+      <width>910</width>
       <height>34</height>
       <resize>2</resize>
       <transparent>true</transparent>
@@ -700,7 +700,7 @@
       </macros>
       <x>20</x>
       <y>186</y>
-      <width>800</width>
+      <width>910</width>
       <height>34</height>
       <resize>2</resize>
       <transparent>true</transparent>
@@ -719,7 +719,7 @@
       </macros>
       <x>20</x>
       <y>234</y>
-      <width>800</width>
+      <width>910</width>
       <height>34</height>
       <resize>2</resize>
       <transparent>true</transparent>
@@ -738,7 +738,7 @@
       </macros>
       <x>20</x>
       <y>282</y>
-      <width>800</width>
+      <width>910</width>
       <height>34</height>
       <resize>2</resize>
       <transparent>true</transparent>
@@ -757,7 +757,7 @@
       </macros>
       <x>20</x>
       <y>330</y>
-      <width>800</width>
+      <width>910</width>
       <height>34</height>
       <resize>2</resize>
       <transparent>true</transparent>
@@ -776,7 +776,7 @@
       </macros>
       <x>20</x>
       <y>378</y>
-      <width>800</width>
+      <width>910</width>
       <height>34</height>
       <resize>2</resize>
       <transparent>true</transparent>
@@ -795,7 +795,7 @@
       </macros>
       <x>20</x>
       <y>426</y>
-      <width>800</width>
+      <width>910</width>
       <height>34</height>
       <resize>2</resize>
       <transparent>true</transparent>
@@ -814,7 +814,7 @@
       </macros>
       <x>20</x>
       <y>474</y>
-      <width>800</width>
+      <width>910</width>
       <height>34</height>
       <resize>2</resize>
       <transparent>true</transparent>
@@ -833,7 +833,7 @@
       </macros>
       <x>20</x>
       <y>522</y>
-      <width>800</width>
+      <width>910</width>
       <height>34</height>
       <resize>2</resize>
       <transparent>true</transparent>
@@ -852,7 +852,7 @@
       </macros>
       <x>20</x>
       <y>570</y>
-      <width>800</width>
+      <width>910</width>
       <height>34</height>
       <resize>2</resize>
       <transparent>true</transparent>
@@ -871,7 +871,7 @@
       </macros>
       <x>20</x>
       <y>618</y>
-      <width>800</width>
+      <width>910</width>
       <height>34</height>
       <resize>2</resize>
       <transparent>true</transparent>
@@ -890,7 +890,7 @@
       </macros>
       <x>20</x>
       <y>666</y>
-      <width>800</width>
+      <width>910</width>
       <height>34</height>
       <resize>2</resize>
       <transparent>true</transparent>
@@ -909,7 +909,7 @@
       </macros>
       <x>20</x>
       <y>714</y>
-      <width>800</width>
+      <width>910</width>
       <height>34</height>
       <resize>2</resize>
       <transparent>true</transparent>
@@ -928,7 +928,7 @@
       </macros>
       <x>20</x>
       <y>762</y>
-      <width>800</width>
+      <width>910</width>
       <height>34</height>
       <resize>2</resize>
       <transparent>true</transparent>
@@ -947,7 +947,7 @@
       </macros>
       <x>20</x>
       <y>810</y>
-      <width>800</width>
+      <width>910</width>
       <height>34</height>
       <resize>2</resize>
       <transparent>true</transparent>
@@ -982,5 +982,24 @@
       <horizontal_alignment>1</horizontal_alignment>
       <vertical_alignment>1</vertical_alignment>
     </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display_42</name>
+      <file>ChOverview_v02.bob</file>
+      <macros>
+        <DEVICE>$(DI20)</DEVICE>
+        <EXPERT_DISPLAY>DigitalChannelGeneric.bob</EXPERT_DISPLAY>
+        <ch_index>DI20</ch_index>
+      </macros>
+      <x>20</x>
+      <y>858</y>
+      <width>910</width>
+      <height>34</height>
+      <resize>2</resize>
+      <transparent>true</transparent>
+      <border_color>
+        <color name="GROUP-BORDER" red="150" green="155" blue="151">
+        </color>
+      </border_color>
+    </widget>
   </widget>
 </display>