diff --git a/rbf_water.Device.RBFWater.74ccca2f-50e3-4d5a-9d7a-9fd420284f83.bootinfo b/rbf_water.Device.RBFWater.74ccca2f-50e3-4d5a-9d7a-9fd420284f83.bootinfo
index e4e8f6b..5aa4444 100644
--- a/rbf_water.Device.RBFWater.74ccca2f-50e3-4d5a-9d7a-9fd420284f83.bootinfo
+++ b/rbf_water.Device.RBFWater.74ccca2f-50e3-4d5a-9d7a-9fd420284f83.bootinfo
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:021aaf0c91a7c84f5461d138994c240e7d5d73a42f69348de765be5fe94988cc
-size 9535812
+oid sha256:182d57226e2158c5866f45b5f11d58fb0daa3fecc376e6929fbe86b7457139db
+size 9650766
diff --git a/rbf_water.Device.RBFWater.74ccca2f-50e3-4d5a-9d7a-9fd420284f83.bootinfo_guids b/rbf_water.Device.RBFWater.74ccca2f-50e3-4d5a-9d7a-9fd420284f83.bootinfo_guids
index 323eaa5..2400838 100644
Binary files a/rbf_water.Device.RBFWater.74ccca2f-50e3-4d5a-9d7a-9fd420284f83.bootinfo_guids and b/rbf_water.Device.RBFWater.74ccca2f-50e3-4d5a-9d7a-9fd420284f83.bootinfo_guids differ
diff --git a/rbf_water.Device.RBFWater.74ccca2f-50e3-4d5a-9d7a-9fd420284f83.compileinfo b/rbf_water.Device.RBFWater.74ccca2f-50e3-4d5a-9d7a-9fd420284f83.compileinfo
index e4e8f6b..5aa4444 100644
--- a/rbf_water.Device.RBFWater.74ccca2f-50e3-4d5a-9d7a-9fd420284f83.compileinfo
+++ b/rbf_water.Device.RBFWater.74ccca2f-50e3-4d5a-9d7a-9fd420284f83.compileinfo
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:021aaf0c91a7c84f5461d138994c240e7d5d73a42f69348de765be5fe94988cc
-size 9535812
+oid sha256:182d57226e2158c5866f45b5f11d58fb0daa3fecc376e6929fbe86b7457139db
+size 9650766
diff --git a/rbf_water.Device.RBFWater.xml b/rbf_water.Device.RBFWater.xml
index d631dfb..94fc03a 100644
--- a/rbf_water.Device.RBFWater.xml
+++ b/rbf_water.Device.RBFWater.xml
@@ -6,7 +6,7 @@
     <ProjectInfo name="rbf_water" devicename="Device" appname="RBFWater" />
   </Header>
   <TypeList>
-    <TypeUserDef name="T_atOdotB64" size="0" nativesize="9472" typeclass="Userdef" pouclass="FUNCTION_BLOCK" iecname="atOdotB64" />
+    <TypeUserDef name="T_atOdotB64" size="0" nativesize="9392" typeclass="Userdef" pouclass="FUNCTION_BLOCK" iecname="atOdotB64" />
     <TypeSimple name="T_BOOL" size="1" swapsize="0" typeclass="Bool" iecname="BOOL" />
     <TypeSimple name="T_BYTE" size="1" swapsize="1" typeclass="Byte" iecname="BYTE" />
     <TypeSimple name="T_DINT" size="4" swapsize="4" typeclass="DInt" iecname="DINT" />
@@ -50,7 +50,13 @@
     <TypeSimple name="T_POINTER_TO_atBTXXXX" size="8" swapsize="8" typeclass="Pointer" iecname="POINTER TO atBTXXXX" />
     <TypeSimple name="T_POINTER_TO_atMbRequestStats" size="8" swapsize="8" typeclass="Pointer" iecname="POINTER TO atMbRequestStats" />
     <TypeSimple name="T_REFERENCE_TO_BOOL_REF" size="1" swapsize="0" typeclass="Reference" iecname="REFERENCE TO BOOL_REF" basetype="T_BOOL" />
-    <TypeUserDef name="T_atAlarm" size="13" nativesize="2672" typeclass="Userdef" pouclass="FUNCTION_BLOCK" iecname="atAlarm">
+    <TypeUserDef name="T_TOF" size="16" nativesize="32" typeclass="Userdef" pouclass="FUNCTION_BLOCK" iecname="TOF">
+      <UserDefElement iecname="IN" type="T_BOOL" byteoffset="0" vartype="VAR_INPUT" access="ReadWrite" />
+      <UserDefElement iecname="PT" type="T_TIME" byteoffset="4" vartype="VAR_INPUT" access="ReadWrite" />
+      <UserDefElement iecname="Q" type="T_BOOL" byteoffset="8" vartype="VAR_OUTPUT" access="ReadWrite" />
+      <UserDefElement iecname="ET" type="T_TIME" byteoffset="12" vartype="VAR_OUTPUT" access="ReadWrite" />
+    </TypeUserDef>
+    <TypeUserDef name="T_atAlarm" size="13" nativesize="2752" typeclass="Userdef" pouclass="FUNCTION_BLOCK" iecname="atAlarm">
       <UserDefElement iecname="in_en" type="T_BOOL" byteoffset="0" vartype="VAR_INPUT" access="ReadWrite" />
       <UserDefElement iecname="in_delOn" type="T_TIME" byteoffset="4" vartype="VAR_INPUT" access="ReadWrite" />
       <UserDefElement iecname="in_delOff" type="T_TIME" byteoffset="8" vartype="VAR_INPUT" access="ReadWrite" />
@@ -61,10 +67,6 @@
       <UserDefElement iecname="hi" type="T_REAL" byteoffset="4" vartype="VAR_INPUT" access="ReadWrite" />
       <UserDefElement iecname="avg" type="T_REAL" byteoffset="8" vartype="VAR_INPUT" access="ReadWrite" />
     </TypeUserDef>
-    <TypeUserDef name="T_atDQ" size="2" nativesize="3800" typeclass="Userdef" pouclass="FUNCTION_BLOCK" iecname="atDQ">
-      <UserDefElement iecname="in_raw" type="T_BOOL" byteoffset="0" vartype="VAR_INPUT" access="ReadWrite" />
-      <UserDefElement iecname="out_val" type="T_BOOL" byteoffset="1" vartype="VAR_OUTPUT" access="ReadWrite" />
-    </TypeUserDef>
     <TypeUserDef name="T_atDebouncePersistent" size="8" nativesize="1120" typeclass="Userdef" pouclass="FUNCTION_BLOCK" iecname="atDebouncePersistent">
       <UserDefElement iecname="in_delOn" type="T_TIME" byteoffset="0" vartype="VAR_INPUT" access="ReadWrite" />
       <UserDefElement iecname="in_delOff" type="T_TIME" byteoffset="4" vartype="VAR_INPUT" access="ReadWrite" />
@@ -80,15 +82,6 @@
       <UserDefElement iecname="in_tau" type="T_TIME" byteoffset="0" vartype="VAR_INPUT" access="ReadWrite" />
       <UserDefElement iecname="out_filt" type="T_REAL" byteoffset="4" vartype="VAR_OUTPUT" access="ReadWrite" />
     </TypeUserDef>
-    <TypeUserDef name="T_atHSC" size="24" nativesize="5304" typeclass="Userdef" pouclass="FUNCTION_BLOCK" iecname="atHSC">
-      <UserDefElement iecname="in_resetDay" type="T_BOOL" byteoffset="0" vartype="VAR_INPUT" access="ReadWrite" />
-      <UserDefElement iecname="in_avgTime" type="T_INT" byteoffset="2" vartype="VAR_INPUT" access="ReadWrite" />
-      <UserDefElement iecname="in_multiplier" type="T_REAL" byteoffset="4" vartype="VAR_INPUT" access="ReadWrite" />
-      <UserDefElement iecname="out_freq" type="T_REAL" byteoffset="8" vartype="VAR_OUTPUT" access="ReadWrite" />
-      <UserDefElement iecname="euTotal" type="T_UDINT" byteoffset="12" vartype="VAR_OUTPUT" access="ReadWrite" />
-      <UserDefElement iecname="todayEu" type="T_UDINT" byteoffset="16" vartype="VAR_OUTPUT" access="ReadWrite" />
-      <UserDefElement iecname="yesterdayEu" type="T_UDINT" byteoffset="20" vartype="VAR_OUTPUT" access="ReadWrite" />
-    </TypeUserDef>
     <TypeUserDef name="T_atLimitBase" size="29" nativesize="1144" typeclass="Userdef" pouclass="FUNCTION_BLOCK" iecname="atLimitBase">
       <UserDefElement iecname="in_sp" type="T_REAL" byteoffset="0" vartype="VAR_INPUT" access="ReadWrite" />
       <UserDefElement iecname="in_hyst" type="T_REAL" byteoffset="4" vartype="VAR_INPUT" access="ReadWrite" />
@@ -126,8 +119,12 @@
       <UserDefElement type="T_atSStStatusCode" iecname="initialization" enumvalue="10" />
       <UserDefElement type="T_atSStStatusCode" iecname="unknown" enumvalue="11" />
     </TypeUserDef>
-    <TypeUserDef name="T_atScaling" size="4" nativesize="1152" typeclass="Userdef" pouclass="FUNCTION_BLOCK" iecname="atScaling">
-      <UserDefElement iecname="out_eu" type="T_REAL" byteoffset="0" vartype="VAR_OUTPUT" access="ReadWrite" />
+    <TypeUserDef name="T_atScaling" size="20" nativesize="1152" typeclass="Userdef" pouclass="FUNCTION_BLOCK" iecname="atScaling">
+      <UserDefElement iecname="in_rawMin" type="T_REAL" byteoffset="0" vartype="VAR_INPUT" access="ReadWrite" />
+      <UserDefElement iecname="in_rawMax" type="T_REAL" byteoffset="4" vartype="VAR_INPUT" access="ReadWrite" />
+      <UserDefElement iecname="in_euMin" type="T_REAL" byteoffset="8" vartype="VAR_INPUT" access="ReadWrite" />
+      <UserDefElement iecname="in_euMax" type="T_REAL" byteoffset="12" vartype="VAR_INPUT" access="ReadWrite" />
+      <UserDefElement iecname="out_eu" type="T_REAL" byteoffset="16" vartype="VAR_OUTPUT" access="ReadWrite" />
     </TypeUserDef>
     <TypeUserDef name="T_atScalingPersistent" size="24" nativesize="1144" typeclass="Userdef" pouclass="FUNCTION_BLOCK" iecname="atScalingPersistent">
       <UserDefElement iecname="in_raw" type="T_REAL" byteoffset="0" vartype="VAR_INPUT" access="ReadWrite" />
@@ -142,7 +139,7 @@
       <UserDefElement iecname="in_startDly" type="T_TIME" byteoffset="4" vartype="VAR_INPUT" access="ReadWrite" />
       <UserDefElement iecname="in_stopDly" type="T_TIME" byteoffset="8" vartype="VAR_INPUT" access="ReadWrite" />
     </TypeUserDef>
-    <TypeUserDef name="T_atTrkPumpCtl" size="22" nativesize="1536" typeclass="Userdef" pouclass="FUNCTION_BLOCK" iecname="atTrkPumpCtl">
+    <TypeUserDef name="T_atTrkPumpCtl" size="22" nativesize="1456" typeclass="Userdef" pouclass="FUNCTION_BLOCK" iecname="atTrkPumpCtl">
       <UserDefElement iecname="in_fillMultiplierSP" type="T_REAL" byteoffset="0" vartype="VAR_INPUT" access="ReadWrite" />
       <UserDefElement iecname="in_fillOffsetSP" type="T_REAL" byteoffset="4" vartype="VAR_INPUT" access="ReadWrite" />
       <UserDefElement iecname="in_revOnTmrSP" type="T_DINT" byteoffset="8" vartype="VAR_INPUT" access="ReadWrite" />
@@ -167,6 +164,7 @@
       <UserDefElement type="T_atVFDFaultCode" iecname="outPhaseLoss" enumvalue="11" />
       <UserDefElement type="T_atVFDFaultCode" iecname="overHeat" enumvalue="12" />
       <UserDefElement type="T_atVFDFaultCode" iecname="localCtl" enumvalue="13" />
+      <UserDefElement type="T_atVFDFaultCode" iecname="driveCommFlt" enumvalue="14" />
       <UserDefElement type="T_atVFDFaultCode" iecname="unknown" enumvalue="99" />
     </TypeUserDef>
     <TypeUserDef name="T_atWellHistoryItem" size="12" nativesize="12" typeclass="Userdef" pouclass="STRUCTURE" iecname="atWellHistoryItem">
@@ -193,24 +191,26 @@
     <TypeArray name="T_ARRAY__0__99__OF_POINTER_TO_atMbRequestStats" size="800" nativesize="800" typeclass="Array" iecname="ARRAY [0..99] OF POINTER TO atMbRequestStats" basetype="T_POINTER_TO_atMbRequestStats">
       <ArrayDim minrange="0" maxrange="99" />
     </TypeArray>
-    <TypeSimple name="T_REFERENCE_TO_atHSC_REF" size="24" swapsize="0" typeclass="Reference" iecname="REFERENCE TO atHSC_REF" basetype="T_atHSC" />
-    <TypeUserDef name="T_atAiFault" size="56" nativesize="9072" typeclass="Userdef" pouclass="FUNCTION_BLOCK" iecname="atAiFault">
+    <TypeUserDef name="T_atAiFault" size="56" nativesize="9312" typeclass="Userdef" pouclass="FUNCTION_BLOCK" iecname="atAiFault">
       <UserDefElement iecname="under" type="T_atAlarm" byteoffset="0" vartype="VAR_INPUT" access="ReadWrite" />
       <UserDefElement iecname="over" type="T_atAlarm" byteoffset="16" vartype="VAR_INPUT" access="ReadWrite" />
       <UserDefElement iecname="chan" type="T_atAlarm" byteoffset="32" vartype="VAR_INPUT" access="ReadWrite" />
       <UserDefElement iecname="in_overSP" type="T_REAL" byteoffset="48" vartype="VAR_INPUT" access="ReadWrite" />
       <UserDefElement iecname="in_underSP" type="T_REAL" byteoffset="52" vartype="VAR_INPUT" access="ReadWrite" />
     </TypeUserDef>
-    <TypeUserDef name="T_atBTXXXX" size="13" nativesize="3744" typeclass="Userdef" pouclass="FUNCTION_BLOCK" iecname="atBTXXXX">
+    <TypeUserDef name="T_atBTXXXX" size="13" nativesize="3824" typeclass="Userdef" pouclass="FUNCTION_BLOCK" iecname="atBTXXXX">
       <UserDefElement iecname="fault" type="T_atAlarm" byteoffset="0" vartype="VAR_INPUT" access="ReadWrite" />
     </TypeUserDef>
-    <TypeUserDef name="T_atDI" size="26" nativesize="9712" typeclass="Userdef" pouclass="FUNCTION_BLOCK" iecname="atDI">
-      <UserDefElement iecname="alm" type="T_atAlarm" byteoffset="0" vartype="VAR_INPUT" access="ReadWrite" />
-      <UserDefElement iecname="debounce" type="T_atDebouncePersistent" byteoffset="16" vartype="VAR_INPUT" access="ReadWrite" />
-      <UserDefElement iecname="out_raw" type="T_BOOL" byteoffset="24" vartype="VAR_OUTPUT" access="ReadWrite" />
-      <UserDefElement iecname="out_val" type="T_BOOL" byteoffset="25" vartype="VAR_OUTPUT" access="ReadWrite" />
+    <TypeUserDef name="T_atDIFault" size="13" nativesize="3792" typeclass="Userdef" pouclass="FUNCTION_BLOCK" iecname="atDIFault">
+      <UserDefElement iecname="chan" type="T_atAlarm" byteoffset="0" vartype="VAR_INPUT" access="ReadWrite" />
     </TypeUserDef>
-    <TypeUserDef name="T_atDevice" size="28" nativesize="6000" typeclass="Userdef" pouclass="FUNCTION_BLOCK" iecname="atDevice">
+    <TypeUserDef name="T_atDQ" size="18" nativesize="3824" typeclass="Userdef" pouclass="FUNCTION_BLOCK" iecname="atDQ">
+      <UserDefElement iecname="in_raw" type="T_BOOL" byteoffset="0" vartype="VAR_INPUT" access="ReadWrite" />
+      <UserDefElement iecname="in_nameIdx" type="T_INT" byteoffset="2" vartype="VAR_INPUT" access="ReadWrite" />
+      <UserDefElement iecname="fault" type="T_atAlarm" byteoffset="4" vartype="VAR_INPUT" access="ReadWrite" />
+      <UserDefElement iecname="out_val" type="T_BOOL" byteoffset="17" vartype="VAR_OUTPUT" access="ReadWrite" />
+    </TypeUserDef>
+    <TypeUserDef name="T_atDevice" size="28" nativesize="5920" typeclass="Userdef" pouclass="FUNCTION_BLOCK" iecname="atDevice">
       <UserDefElement iecname="seq" type="T_atSeqCtl" byteoffset="0" vartype="VAR_INPUT" access="ReadWrite" />
       <UserDefElement iecname="in_pause" type="T_BOOL" byteoffset="12" vartype="VAR_INPUT" access="ReadWrite" />
       <UserDefElement iecname="out_run" type="T_BOOL" byteoffset="13" vartype="VAR_OUTPUT" access="ReadWrite" />
@@ -219,10 +219,20 @@
       <UserDefElement iecname="out_runTime" type="T_DINT" byteoffset="20" vartype="VAR_OUTPUT" access="ReadWrite" />
       <UserDefElement iecname="out_tss" type="T_DINT" byteoffset="24" vartype="VAR_OUTPUT" access="ReadWrite" />
     </TypeUserDef>
+    <TypeUserDef name="T_atHSC" size="40" nativesize="6344" typeclass="Userdef" pouclass="FUNCTION_BLOCK" iecname="atHSC">
+      <UserDefElement iecname="in_resetDay" type="T_BOOL" byteoffset="0" vartype="VAR_INPUT" access="ReadWrite" />
+      <UserDefElement iecname="fault" type="T_atAlarm" byteoffset="4" vartype="VAR_INPUT" access="ReadWrite" />
+      <UserDefElement iecname="in_avgTime" type="T_INT" byteoffset="18" vartype="VAR_INPUT" access="ReadWrite" />
+      <UserDefElement iecname="in_multiplier" type="T_REAL" byteoffset="20" vartype="VAR_INPUT" access="ReadWrite" />
+      <UserDefElement iecname="out_freq" type="T_REAL" byteoffset="24" vartype="VAR_OUTPUT" access="ReadWrite" />
+      <UserDefElement iecname="euTotal" type="T_UDINT" byteoffset="28" vartype="VAR_OUTPUT" access="ReadWrite" />
+      <UserDefElement iecname="todayEu" type="T_UDINT" byteoffset="32" vartype="VAR_OUTPUT" access="ReadWrite" />
+      <UserDefElement iecname="yesterdayEu" type="T_UDINT" byteoffset="36" vartype="VAR_OUTPUT" access="ReadWrite" />
+    </TypeUserDef>
     <TypeUserDef name="T_atHist7DintSP" size="32" nativesize="32" typeclass="Userdef" pouclass="STRUCTURE" iecname="atHist7DintSP">
       <UserDefElement iecname="daily" type="T_ARRAY__0__7__OF_DINT" byteoffset="0" vartype="VAR" access="ReadWrite" />
     </TypeUserDef>
-    <TypeUserDef name="T_atLimit" size="45" nativesize="4848" typeclass="Userdef" pouclass="FUNCTION_BLOCK" iecname="atLimit" basetype="T_atLimitBase">
+    <TypeUserDef name="T_atLimit" size="45" nativesize="4928" typeclass="Userdef" pouclass="FUNCTION_BLOCK" iecname="atLimit" basetype="T_atLimitBase">
       <UserDefElement iecname="in_sp" type="T_REAL" byteoffset="0" vartype="VAR_INPUT" inherited_from="T_atLimitBase" access="ReadWrite" />
       <UserDefElement iecname="in_hyst" type="T_REAL" byteoffset="4" vartype="VAR_INPUT" inherited_from="T_atLimitBase" access="ReadWrite" />
       <UserDefElement iecname="in_en" type="T_BOOL" byteoffset="8" vartype="VAR_INPUT" inherited_from="T_atLimitBase" access="ReadWrite" />
@@ -233,47 +243,57 @@
       <UserDefElement iecname="out" type="T_BOOL" byteoffset="28" vartype="VAR_OUTPUT" inherited_from="T_atLimitBase" access="ReadWrite" />
       <UserDefElement iecname="alm" type="T_atAlarm" byteoffset="32" vartype="VAR_INPUT" access="ReadWrite" />
     </TypeUserDef>
-    <TypeUserDef name="T_atMbRequestStats" size="81" nativesize="4624" typeclass="Userdef" pouclass="FUNCTION_BLOCK" iecname="atMbRequestStats">
-      <UserDefElement iecname="reqDone" type="T_BOOL" byteoffset="0" vartype="VAR_INPUT" access="ReadWrite" />
-      <UserDefElement iecname="reqBusy" type="T_BOOL" byteoffset="1" vartype="VAR_INPUT" access="ReadWrite" />
-      <UserDefElement iecname="reqError" type="T_BOOL" byteoffset="2" vartype="VAR_INPUT" access="ReadWrite" />
-      <UserDefElement iecname="lastErrorId" type="T_Error" byteoffset="4" vartype="VAR_INPUT" access="ReadWrite" />
-      <UserDefElement iecname="lastExceptionCode" type="T_atMBExceptionCodes" byteoffset="6" vartype="VAR_INPUT" access="ReadWrite" />
-      <UserDefElement iecname="lastValidDuration" type="T_UDINT" byteoffset="8" vartype="VAR_INPUT" access="ReadWrite" />
-      <UserDefElement iecname="longestValidDuration" type="T_UDINT" byteoffset="12" vartype="VAR_INPUT" access="ReadWrite" />
-      <UserDefElement iecname="interval" type="T_UDINT" byteoffset="16" vartype="VAR_INPUT" access="ReadWrite" />
-      <UserDefElement iecname="offlineCnt" type="T_UINT" byteoffset="20" vartype="VAR_INPUT" access="ReadWrite" />
-      <UserDefElement iecname="doneCnt" type="T_UDINT" byteoffset="24" vartype="VAR_INPUT" access="ReadWrite" />
-      <UserDefElement iecname="errorCnt" type="T_UDINT" byteoffset="28" vartype="VAR_INPUT" access="ReadWrite" />
-      <UserDefElement iecname="doneCntRst" type="T_UDINT" byteoffset="32" vartype="VAR_INPUT" access="ReadWrite" />
-      <UserDefElement iecname="errorCntRst" type="T_UDINT" byteoffset="36" vartype="VAR_INPUT" access="ReadWrite" />
-      <UserDefElement iecname="sinceLastExec" type="T_UDINT" byteoffset="40" vartype="VAR_INPUT" access="ReadWrite" />
-      <UserDefElement iecname="execute" type="T_BOOL" byteoffset="44" vartype="VAR_INPUT" access="ReadWrite" />
-      <UserDefElement iecname="timeoutCnt" type="T_UDINT" byteoffset="48" vartype="VAR_INPUT" access="ReadWrite" />
-      <UserDefElement iecname="reqLength" type="T_UINT" byteoffset="52" vartype="VAR_INPUT" access="ReadWrite" />
-      <UserDefElement iecname="executeLight" type="T_BOOL" byteoffset="54" vartype="VAR_OUTPUT" access="ReadWrite" />
-      <UserDefElement iecname="reqDoneLight" type="T_BOOL" byteoffset="55" vartype="VAR_OUTPUT" access="ReadWrite" />
-      <UserDefElement iecname="reqErrorLight" type="T_BOOL" byteoffset="56" vartype="VAR_OUTPUT" access="ReadWrite" />
-      <UserDefElement iecname="reqBusyLight" type="T_BOOL" byteoffset="57" vartype="VAR_OUTPUT" access="ReadWrite" />
-      <UserDefElement iecname="online" type="T_BOOL" byteoffset="58" vartype="VAR_OUTPUT" access="ReadWrite" />
-      <UserDefElement iecname="active" type="T_BOOL" byteoffset="59" vartype="VAR_OUTPUT" access="ReadWrite" />
-      <UserDefElement iecname="toString" type="T_STRING_20_" byteoffset="60" vartype="VAR" access="ReadWrite" />
+    <TypeUserDef name="T_atMbRequestStats" size="78" nativesize="4624" typeclass="Userdef" pouclass="FUNCTION_BLOCK" iecname="atMbRequestStats">
+      <UserDefElement iecname="lastErrorId" type="T_Error" byteoffset="0" vartype="VAR_INPUT" access="ReadWrite" />
+      <UserDefElement iecname="lastExceptionCode" type="T_atMBExceptionCodes" byteoffset="2" vartype="VAR_INPUT" access="ReadWrite" />
+      <UserDefElement iecname="lastValidDuration" type="T_UDINT" byteoffset="4" vartype="VAR_INPUT" access="ReadWrite" />
+      <UserDefElement iecname="longestValidDuration" type="T_UDINT" byteoffset="8" vartype="VAR_INPUT" access="ReadWrite" />
+      <UserDefElement iecname="interval" type="T_UDINT" byteoffset="12" vartype="VAR_INPUT" access="ReadWrite" />
+      <UserDefElement iecname="offlineCnt" type="T_UINT" byteoffset="16" vartype="VAR_INPUT" access="ReadWrite" />
+      <UserDefElement iecname="doneCnt" type="T_UDINT" byteoffset="20" vartype="VAR_INPUT" access="ReadWrite" />
+      <UserDefElement iecname="errorCnt" type="T_UDINT" byteoffset="24" vartype="VAR_INPUT" access="ReadWrite" />
+      <UserDefElement iecname="doneCntRst" type="T_UDINT" byteoffset="28" vartype="VAR_INPUT" access="ReadWrite" />
+      <UserDefElement iecname="errorCntRst" type="T_UDINT" byteoffset="32" vartype="VAR_INPUT" access="ReadWrite" />
+      <UserDefElement iecname="sinceLastExec" type="T_UDINT" byteoffset="36" vartype="VAR_INPUT" access="ReadWrite" />
+      <UserDefElement iecname="timeoutCnt" type="T_UDINT" byteoffset="40" vartype="VAR_INPUT" access="ReadWrite" />
+      <UserDefElement iecname="reqLength" type="T_UINT" byteoffset="44" vartype="VAR_INPUT" access="ReadWrite" />
+      <UserDefElement iecname="executeLight" type="T_BOOL" byteoffset="46" vartype="VAR_OUTPUT" access="ReadWrite" />
+      <UserDefElement iecname="reqDoneLight" type="T_BOOL" byteoffset="47" vartype="VAR_OUTPUT" access="ReadWrite" />
+      <UserDefElement iecname="reqErrorLight" type="T_BOOL" byteoffset="48" vartype="VAR_OUTPUT" access="ReadWrite" />
+      <UserDefElement iecname="reqBusyLight" type="T_BOOL" byteoffset="49" vartype="VAR_OUTPUT" access="ReadWrite" />
+      <UserDefElement iecname="online" type="T_BOOL" byteoffset="50" vartype="VAR_OUTPUT" access="ReadWrite" />
+      <UserDefElement iecname="active" type="T_BOOL" byteoffset="51" vartype="VAR_OUTPUT" access="ReadWrite" />
+      <UserDefElement iecname="executeMbFb" type="T_BOOL" byteoffset="52" vartype="VAR_OUTPUT" access="ReadWrite" />
+      <UserDefElement iecname="toString" type="T_STRING_20_" byteoffset="53" vartype="VAR" access="ReadWrite" />
+      <UserDefElement iecname="_execute" type="T_BOOL" byteoffset="74" vartype="VAR" access="ReadWrite" />
+      <UserDefElement iecname="_reqDone" type="T_BOOL" byteoffset="75" vartype="VAR" access="ReadWrite" />
+      <UserDefElement iecname="_reqBusy" type="T_BOOL" byteoffset="76" vartype="VAR" access="ReadWrite" />
+      <UserDefElement iecname="_reqError" type="T_BOOL" byteoffset="77" vartype="VAR" access="ReadWrite" />
     </TypeUserDef>
     <TypeSimple name="T_REFERENCE_TO_atDevice_REF" size="28" swapsize="0" typeclass="Reference" iecname="REFERENCE TO atDevice_REF" basetype="T_atDevice" />
-    <TypeUserDef name="T_atBT124F" size="13" nativesize="19648" typeclass="Userdef" pouclass="FUNCTION_BLOCK" iecname="atBT124F" basetype="T_atBTXXXX">
+    <TypeSimple name="T_REFERENCE_TO_atHSC_REF" size="40" swapsize="0" typeclass="Reference" iecname="REFERENCE TO atHSC_REF" basetype="T_atHSC" />
+    <TypeUserDef name="T_atBT124F" size="13" nativesize="19728" typeclass="Userdef" pouclass="FUNCTION_BLOCK" iecname="atBT124F" basetype="T_atBTXXXX">
       <UserDefElement iecname="fault" type="T_atAlarm" byteoffset="0" vartype="VAR_INPUT" inherited_from="T_atBTXXXX" access="ReadWrite" />
     </TypeUserDef>
-    <TypeUserDef name="T_atBT222F" size="13" nativesize="12240" typeclass="Userdef" pouclass="FUNCTION_BLOCK" iecname="atBT222F" basetype="T_atBTXXXX">
+    <TypeUserDef name="T_atBT222F" size="13" nativesize="12320" typeclass="Userdef" pouclass="FUNCTION_BLOCK" iecname="atBT222F" basetype="T_atBTXXXX">
       <UserDefElement iecname="fault" type="T_atAlarm" byteoffset="0" vartype="VAR_INPUT" inherited_from="T_atBTXXXX" access="ReadWrite" />
     </TypeUserDef>
-    <TypeUserDef name="T_atBT3238" size="13" nativesize="12184" typeclass="Userdef" pouclass="FUNCTION_BLOCK" iecname="atBT3238" basetype="T_atBTXXXX">
+    <TypeUserDef name="T_atBT3238" size="13" nativesize="12264" typeclass="Userdef" pouclass="FUNCTION_BLOCK" iecname="atBT3238" basetype="T_atBTXXXX">
       <UserDefElement iecname="fault" type="T_atAlarm" byteoffset="0" vartype="VAR_INPUT" inherited_from="T_atBTXXXX" access="ReadWrite" />
     </TypeUserDef>
-    <TypeUserDef name="T_atBT623F" size="16" nativesize="26792" typeclass="Userdef" pouclass="FUNCTION_BLOCK" iecname="atBT623F" basetype="T_atBTXXXX">
+    <TypeUserDef name="T_atBT623F" size="16" nativesize="26872" typeclass="Userdef" pouclass="FUNCTION_BLOCK" iecname="atBT623F" basetype="T_atBTXXXX">
       <UserDefElement iecname="fault" type="T_atAlarm" byteoffset="0" vartype="VAR_INPUT" inherited_from="T_atBTXXXX" access="ReadWrite" />
       <UserDefElement iecname="diStartAddr" type="T_UINT" byteoffset="14" vartype="VAR" access="ReadWrite" />
     </TypeUserDef>
-    <TypeUserDef name="T_atGadget" size="32" nativesize="7080" typeclass="Userdef" pouclass="FUNCTION_BLOCK" iecname="atGadget" basetype="T_atDevice">
+    <TypeUserDef name="T_atDI" size="44" nativesize="9816" typeclass="Userdef" pouclass="FUNCTION_BLOCK" iecname="atDI">
+      <UserDefElement iecname="faults" type="T_atDIFault" byteoffset="0" vartype="VAR_INPUT" access="ReadWrite" />
+      <UserDefElement iecname="alm" type="T_atAlarm" byteoffset="16" vartype="VAR_INPUT" access="ReadWrite" />
+      <UserDefElement iecname="debounce" type="T_atDebouncePersistent" byteoffset="32" vartype="VAR_INPUT" access="ReadWrite" />
+      <UserDefElement iecname="in_nameIdx" type="T_INT" byteoffset="40" vartype="VAR_INPUT" access="ReadWrite" />
+      <UserDefElement iecname="out_raw" type="T_BOOL" byteoffset="42" vartype="VAR_OUTPUT" access="ReadWrite" />
+      <UserDefElement iecname="out_val" type="T_BOOL" byteoffset="43" vartype="VAR_OUTPUT" access="ReadWrite" />
+    </TypeUserDef>
+    <TypeUserDef name="T_atGadget" size="32" nativesize="7000" typeclass="Userdef" pouclass="FUNCTION_BLOCK" iecname="atGadget" basetype="T_atDevice">
       <UserDefElement iecname="seq" type="T_atSeqCtl" byteoffset="0" vartype="VAR_INPUT" inherited_from="T_atDevice" access="ReadWrite" />
       <UserDefElement iecname="in_pause" type="T_BOOL" byteoffset="12" vartype="VAR_INPUT" inherited_from="T_atDevice" access="ReadWrite" />
       <UserDefElement iecname="out_run" type="T_BOOL" byteoffset="13" vartype="VAR_OUTPUT" inherited_from="T_atDevice" access="ReadWrite" />
@@ -283,39 +303,55 @@
       <UserDefElement iecname="out_tss" type="T_DINT" byteoffset="24" vartype="VAR_OUTPUT" inherited_from="T_atDevice" access="ReadWrite" />
       <UserDefElement iecname="in_manOnMaxSP" type="T_TIME" byteoffset="28" vartype="VAR_INPUT" access="ReadWrite" />
     </TypeUserDef>
-    <TypeUserDef name="T_atLimits" size="189" nativesize="20432" typeclass="Userdef" pouclass="FUNCTION_BLOCK" iecname="atLimits">
+    <TypeUserDef name="T_atLimits" size="189" nativesize="20752" typeclass="Userdef" pouclass="FUNCTION_BLOCK" iecname="atLimits">
       <UserDefElement iecname="hihi" type="T_atLimit" byteoffset="0" vartype="VAR_INPUT" access="ReadWrite" />
       <UserDefElement iecname="hi" type="T_atLimit" byteoffset="48" vartype="VAR_INPUT" access="ReadWrite" />
       <UserDefElement iecname="lo" type="T_atLimit" byteoffset="96" vartype="VAR_INPUT" access="ReadWrite" />
       <UserDefElement iecname="lolo" type="T_atLimit" byteoffset="144" vartype="VAR_INPUT" access="ReadWrite" />
     </TypeUserDef>
-    <TypeUserDef name="T_atMbClient" size="800" nativesize="4072" typeclass="Userdef" pouclass="FUNCTION_BLOCK" iecname="atMbClient">
+    <TypeUserDef name="T_atMbClient" size="800" nativesize="3992" typeclass="Userdef" pouclass="FUNCTION_BLOCK" iecname="atMbClient">
       <UserDefElement iecname="reqStats" type="T_ARRAY__0__99__OF_POINTER_TO_atMbRequestStats" byteoffset="0" vartype="VAR_OUTPUT" access="ReadWrite" />
     </TypeUserDef>
-    <TypeUserDef name="T_atWellHistory" size="348" nativesize="2608" typeclass="Userdef" pouclass="FUNCTION_BLOCK" iecname="atWellHistory">
+    <TypeUserDef name="T_atWellHistory" size="344" nativesize="3560" typeclass="Userdef" pouclass="FUNCTION_BLOCK" iecname="atWellHistory">
       <UserDefElement iecname="in_runStat" type="T_BOOL" byteoffset="0" vartype="VAR_INPUT" access="ReadWrite" />
       <UserDefElement iecname="in_vol" type="T_DINT" byteoffset="4" vartype="VAR_INPUT" access="ReadWrite" />
-      <UserDefElement iecname="in_level" type="T_REAL" byteoffset="8" vartype="VAR_INPUT" access="ReadWrite" />
-      <UserDefElement iecname="roll24" type="T_atWellHistoryItem" byteoffset="12" vartype="VAR_OUTPUT" access="ReadWrite" />
-      <UserDefElement iecname="history24" type="T_ARRAY__0__24__OF_atWellHistoryItem" byteoffset="24" vartype="VAR_OUTPUT" access="ReadWrite" />
-      <UserDefElement iecname="today" type="T_atWellHistoryItem" byteoffset="324" vartype="VAR_OUTPUT" access="ReadWrite" />
-      <UserDefElement iecname="yday" type="T_atWellHistoryItem" byteoffset="336" vartype="VAR_OUTPUT" access="ReadWrite" />
+      <UserDefElement iecname="roll24" type="T_atWellHistoryItem" byteoffset="8" vartype="VAR_OUTPUT" access="ReadWrite" />
+      <UserDefElement iecname="history24" type="T_ARRAY__0__24__OF_atWellHistoryItem" byteoffset="20" vartype="VAR_OUTPUT" access="ReadWrite" />
+      <UserDefElement iecname="today" type="T_atWellHistoryItem" byteoffset="320" vartype="VAR_OUTPUT" access="ReadWrite" />
+      <UserDefElement iecname="yday" type="T_atWellHistoryItem" byteoffset="332" vartype="VAR_OUTPUT" access="ReadWrite" />
     </TypeUserDef>
-    <TypeUserDef name="T_atAI" size="296" nativesize="36184" typeclass="Userdef" pouclass="FUNCTION_BLOCK" iecname="atAI">
-      <UserDefElement iecname="in_calMin" type="T_BOOL" byteoffset="0" vartype="VAR_INPUT" access="ReadWrite" />
-      <UserDefElement iecname="in_calMax" type="T_BOOL" byteoffset="1" vartype="VAR_INPUT" access="ReadWrite" />
-      <UserDefElement iecname="limits" type="T_atLimits" byteoffset="4" vartype="VAR_INPUT" access="ReadWrite" />
-      <UserDefElement iecname="scalingRaw" type="T_atScaling" byteoffset="196" vartype="VAR_INPUT" access="ReadWrite" />
-      <UserDefElement iecname="scalingEU" type="T_atScalingPersistent" byteoffset="200" vartype="VAR_INPUT" access="ReadWrite" />
-      <UserDefElement iecname="faults" type="T_atAiFault" byteoffset="224" vartype="VAR_INPUT" access="ReadWrite" />
-      <UserDefElement iecname="filter" type="T_atFilter" byteoffset="280" vartype="VAR_INPUT" access="ReadWrite" />
-      <UserDefElement iecname="in_filterTim" type="T_DINT" byteoffset="288" vartype="VAR_INPUT" access="ReadWrite" />
-      <UserDefElement iecname="out_eu" type="T_REAL" byteoffset="292" vartype="VAR_OUTPUT" access="ReadWrite" />
+    <TypeUserDef name="T_atAI" size="324" nativesize="36744" typeclass="Userdef" pouclass="FUNCTION_BLOCK" iecname="atAI">
+      <UserDefElement iecname="in_raw" type="T_REAL" byteoffset="0" vartype="VAR_INPUT" access="ReadWrite" />
+      <UserDefElement iecname="in_calMin" type="T_BOOL" byteoffset="4" vartype="VAR_INPUT" access="ReadWrite" />
+      <UserDefElement iecname="in_calMax" type="T_BOOL" byteoffset="5" vartype="VAR_INPUT" access="ReadWrite" />
+      <UserDefElement iecname="limits" type="T_atLimits" byteoffset="8" vartype="VAR_INPUT" access="ReadWrite" />
+      <UserDefElement iecname="scalingRaw" type="T_atScaling" byteoffset="200" vartype="VAR_INPUT" access="ReadWrite" />
+      <UserDefElement iecname="scalingEU" type="T_atScalingPersistent" byteoffset="220" vartype="VAR_INPUT" access="ReadWrite" />
+      <UserDefElement iecname="faults" type="T_atAiFault" byteoffset="244" vartype="VAR_INPUT" access="ReadWrite" />
+      <UserDefElement iecname="filter" type="T_atFilter" byteoffset="300" vartype="VAR_INPUT" access="ReadWrite" />
+      <UserDefElement iecname="in_signal" type="T_REAL" byteoffset="308" vartype="VAR_INPUT" access="ReadWrite" />
+      <UserDefElement iecname="in_nameIdx" type="T_INT" byteoffset="312" vartype="VAR_INPUT" access="ReadWrite" />
+      <UserDefElement iecname="in_filterTim" type="T_DINT" byteoffset="316" vartype="VAR_INPUT" access="ReadWrite" />
+      <UserDefElement iecname="out_eu" type="T_REAL" byteoffset="320" vartype="VAR_OUTPUT" access="ReadWrite" />
     </TypeUserDef>
-    <TypeUserDef name="T_atMbClientTCP" size="800" nativesize="8280" typeclass="Userdef" pouclass="FUNCTION_BLOCK" iecname="atMbClientTCP" basetype="T_atMbClient">
+    <TypeUserDef name="T_atMbClientTCP" size="800" nativesize="8200" typeclass="Userdef" pouclass="FUNCTION_BLOCK" iecname="atMbClientTCP" basetype="T_atMbClient">
       <UserDefElement iecname="reqStats" type="T_ARRAY__0__99__OF_POINTER_TO_atMbRequestStats" byteoffset="0" vartype="VAR_OUTPUT" inherited_from="T_atMbClient" access="ReadWrite" />
     </TypeUserDef>
-    <TypeUserDef name="T_atVFD" size="108" nativesize="12064" typeclass="Userdef" pouclass="FUNCTION_BLOCK" iecname="atVFD" basetype="T_atGadget">
+    <TypeUserDef name="T_atMotor" size="44" nativesize="8080" typeclass="Userdef" pouclass="FUNCTION_BLOCK" iecname="atMotor" basetype="T_atGadget">
+      <UserDefElement iecname="seq" type="T_atSeqCtl" byteoffset="0" vartype="VAR_INPUT" inherited_from="T_atDevice" access="ReadWrite" />
+      <UserDefElement iecname="in_pause" type="T_BOOL" byteoffset="12" vartype="VAR_INPUT" inherited_from="T_atDevice" access="ReadWrite" />
+      <UserDefElement iecname="out_run" type="T_BOOL" byteoffset="13" vartype="VAR_OUTPUT" inherited_from="T_atDevice" access="ReadWrite" />
+      <UserDefElement iecname="out_status" type="T_atDeviceStatus" byteoffset="14" vartype="VAR_OUTPUT" inherited_from="T_atDevice" access="ReadWrite" />
+      <UserDefElement iecname="in_autoMode" type="T_BOOL" byteoffset="16" vartype="VAR_INPUT" inherited_from="T_atDevice" access="ReadWrite" />
+      <UserDefElement iecname="out_runTime" type="T_DINT" byteoffset="20" vartype="VAR_OUTPUT" inherited_from="T_atDevice" access="ReadWrite" />
+      <UserDefElement iecname="out_tss" type="T_DINT" byteoffset="24" vartype="VAR_OUTPUT" inherited_from="T_atDevice" access="ReadWrite" />
+      <UserDefElement iecname="in_manOnMaxSP" type="T_TIME" byteoffset="28" vartype="VAR_INPUT" inherited_from="T_atGadget" access="ReadWrite" />
+      <UserDefElement iecname="in_manStart" type="T_BOOL" byteoffset="32" vartype="VAR_INPUT" access="ReadWrite" />
+      <UserDefElement iecname="in_manStop" type="T_BOOL" byteoffset="33" vartype="VAR_INPUT" access="ReadWrite" />
+      <UserDefElement iecname="in_outputEU" type="T_REAL" byteoffset="36" vartype="VAR_INPUT" access="ReadWrite" />
+      <UserDefElement iecname="out_estimatedEU" type="T_REAL" byteoffset="40" vartype="VAR_OUTPUT" access="ReadWrite" />
+    </TypeUserDef>
+    <TypeUserDef name="T_atVFD" size="120" nativesize="12080" typeclass="Userdef" pouclass="FUNCTION_BLOCK" iecname="atVFD" basetype="T_atGadget">
       <UserDefElement iecname="seq" type="T_atSeqCtl" byteoffset="0" vartype="VAR_INPUT" inherited_from="T_atDevice" access="ReadWrite" />
       <UserDefElement iecname="in_pause" type="T_BOOL" byteoffset="12" vartype="VAR_INPUT" inherited_from="T_atDevice" access="ReadWrite" />
       <UserDefElement iecname="out_run" type="T_BOOL" byteoffset="13" vartype="VAR_OUTPUT" inherited_from="T_atDevice" access="ReadWrite" />
@@ -332,22 +368,25 @@
       <UserDefElement iecname="in_hzMax" type="T_REAL" byteoffset="44" vartype="VAR_INPUT" access="ReadWrite" />
       <UserDefElement iecname="in_autoFixedRef" type="T_REAL" byteoffset="48" vartype="VAR_INPUT" access="ReadWrite" />
       <UserDefElement iecname="in_autoFixedEn" type="T_BOOL" byteoffset="52" vartype="VAR_INPUT" access="ReadWrite" />
-      <UserDefElement iecname="out_speedCmdHz" type="T_REAL" byteoffset="56" vartype="VAR_OUTPUT" access="ReadWrite" />
-      <UserDefElement iecname="out_speedCmd" type="T_REAL" byteoffset="60" vartype="VAR_OUTPUT" access="ReadWrite" />
-      <UserDefElement iecname="out_speedActHz" type="T_REAL" byteoffset="64" vartype="VAR_OUTPUT" access="ReadWrite" />
-      <UserDefElement iecname="out_speedAct" type="T_REAL" byteoffset="68" vartype="VAR_OUTPUT" access="ReadWrite" />
-      <UserDefElement iecname="out_current" type="T_REAL" byteoffset="72" vartype="VAR_OUTPUT" access="ReadWrite" />
-      <UserDefElement iecname="out_voltage" type="T_REAL" byteoffset="76" vartype="VAR_OUTPUT" access="ReadWrite" />
-      <UserDefElement iecname="out_dcBus" type="T_REAL" byteoffset="80" vartype="VAR_OUTPUT" access="ReadWrite" />
-      <UserDefElement iecname="out_fwdCmd" type="T_BOOL" byteoffset="84" vartype="VAR_OUTPUT" access="ReadWrite" />
-      <UserDefElement iecname="out_revCmd" type="T_BOOL" byteoffset="85" vartype="VAR_OUTPUT" access="ReadWrite" />
-      <UserDefElement iecname="out_faultVFDId" type="T_atVFDFaultCode" byteoffset="86" vartype="VAR_OUTPUT" access="ReadWrite" />
-      <UserDefElement iecname="out_faultVFDId_last" type="T_atVFDFaultCode" byteoffset="88" vartype="VAR_OUTPUT" access="ReadWrite" />
-      <UserDefElement iecname="fault" type="T_atAlarm" byteoffset="92" vartype="VAR_OUTPUT" access="ReadWrite" />
-      <UserDefElement iecname="out_statusID" type="T_atSStStatusCode" byteoffset="106" vartype="VAR_OUTPUT" access="ReadWrite" />
+      <UserDefElement iecname="in_outputEUMin" type="T_REAL" byteoffset="56" vartype="VAR_INPUT" access="ReadWrite" />
+      <UserDefElement iecname="in_outputEUMax" type="T_REAL" byteoffset="60" vartype="VAR_INPUT" access="ReadWrite" />
+      <UserDefElement iecname="out_speedCmdHz" type="T_REAL" byteoffset="64" vartype="VAR_OUTPUT" access="ReadWrite" />
+      <UserDefElement iecname="out_speedCmd" type="T_REAL" byteoffset="68" vartype="VAR_OUTPUT" access="ReadWrite" />
+      <UserDefElement iecname="out_speedActHz" type="T_REAL" byteoffset="72" vartype="VAR_OUTPUT" access="ReadWrite" />
+      <UserDefElement iecname="out_speedAct" type="T_REAL" byteoffset="76" vartype="VAR_OUTPUT" access="ReadWrite" />
+      <UserDefElement iecname="out_current" type="T_REAL" byteoffset="80" vartype="VAR_OUTPUT" access="ReadWrite" />
+      <UserDefElement iecname="out_voltage" type="T_REAL" byteoffset="84" vartype="VAR_OUTPUT" access="ReadWrite" />
+      <UserDefElement iecname="out_dcBus" type="T_REAL" byteoffset="88" vartype="VAR_OUTPUT" access="ReadWrite" />
+      <UserDefElement iecname="out_fwdCmd" type="T_BOOL" byteoffset="92" vartype="VAR_OUTPUT" access="ReadWrite" />
+      <UserDefElement iecname="out_revCmd" type="T_BOOL" byteoffset="93" vartype="VAR_OUTPUT" access="ReadWrite" />
+      <UserDefElement iecname="out_faultVFDId" type="T_atVFDFaultCode" byteoffset="94" vartype="VAR_OUTPUT" access="ReadWrite" />
+      <UserDefElement iecname="out_faultVFDId_last" type="T_atVFDFaultCode" byteoffset="96" vartype="VAR_OUTPUT" access="ReadWrite" />
+      <UserDefElement iecname="fault" type="T_atAlarm" byteoffset="100" vartype="VAR_OUTPUT" access="ReadWrite" />
+      <UserDefElement iecname="out_statusID" type="T_atSStStatusCode" byteoffset="114" vartype="VAR_OUTPUT" access="ReadWrite" />
+      <UserDefElement iecname="out_estimatedEU" type="T_REAL" byteoffset="116" vartype="VAR_OUTPUT" access="ReadWrite" />
     </TypeUserDef>
-    <TypeSimple name="T_REFERENCE_TO_atAI_REF" size="296" swapsize="0" typeclass="Reference" iecname="REFERENCE TO atAI_REF" basetype="T_atAI" />
-    <TypeUserDef name="T_atOdotB32" size="840" nativesize="9376" typeclass="Userdef" pouclass="FUNCTION_BLOCK" iecname="atOdotB32">
+    <TypeSimple name="T_REFERENCE_TO_atAI_REF" size="324" swapsize="0" typeclass="Reference" iecname="REFERENCE TO atAI_REF" basetype="T_atAI" />
+    <TypeUserDef name="T_atOdotB32" size="840" nativesize="9296" typeclass="Userdef" pouclass="FUNCTION_BLOCK" iecname="atOdotB32">
       <UserDefElement iecname="in_timeout" type="T_TIME" byteoffset="0" vartype="VAR_INPUT" access="ReadWrite" />
       <UserDefElement iecname="in_ipAddress" type="T_ARRAY__0__3__OF_BYTE" byteoffset="4" vartype="VAR_INPUT" access="ReadWrite" />
       <UserDefElement iecname="cards" type="T_ARRAY__0__2__OF_POINTER_TO_atBTXXXX" byteoffset="8" vartype="VAR_INPUT" access="ReadWrite" />
@@ -355,7 +394,7 @@
       <UserDefElement iecname="in_simEn" type="T_BOOL" byteoffset="33" vartype="VAR_IN_OUT" access="ReadWrite" />
       <UserDefElement iecname="client" type="T_atMbClientTCP" byteoffset="40" vartype="VAR" access="ReadWrite" />
     </TypeUserDef>
-    <TypeUserDef name="T_atVFDModbus" size="108" nativesize="13112" typeclass="Userdef" pouclass="FUNCTION_BLOCK" iecname="atVFDModbus" basetype="T_atVFD">
+    <TypeUserDef name="T_atVFDModbus" size="120" nativesize="13128" typeclass="Userdef" pouclass="FUNCTION_BLOCK" iecname="atVFDModbus" basetype="T_atVFD">
       <UserDefElement iecname="seq" type="T_atSeqCtl" byteoffset="0" vartype="VAR_INPUT" inherited_from="T_atDevice" access="ReadWrite" />
       <UserDefElement iecname="in_pause" type="T_BOOL" byteoffset="12" vartype="VAR_INPUT" inherited_from="T_atDevice" access="ReadWrite" />
       <UserDefElement iecname="out_run" type="T_BOOL" byteoffset="13" vartype="VAR_OUTPUT" inherited_from="T_atDevice" access="ReadWrite" />
@@ -372,21 +411,24 @@
       <UserDefElement iecname="in_hzMax" type="T_REAL" byteoffset="44" vartype="VAR_INPUT" inherited_from="T_atVFD" access="ReadWrite" />
       <UserDefElement iecname="in_autoFixedRef" type="T_REAL" byteoffset="48" vartype="VAR_INPUT" inherited_from="T_atVFD" access="ReadWrite" />
       <UserDefElement iecname="in_autoFixedEn" type="T_BOOL" byteoffset="52" vartype="VAR_INPUT" inherited_from="T_atVFD" access="ReadWrite" />
-      <UserDefElement iecname="out_speedCmdHz" type="T_REAL" byteoffset="56" vartype="VAR_OUTPUT" inherited_from="T_atVFD" access="ReadWrite" />
-      <UserDefElement iecname="out_speedCmd" type="T_REAL" byteoffset="60" vartype="VAR_OUTPUT" inherited_from="T_atVFD" access="ReadWrite" />
-      <UserDefElement iecname="out_speedActHz" type="T_REAL" byteoffset="64" vartype="VAR_OUTPUT" inherited_from="T_atVFD" access="ReadWrite" />
-      <UserDefElement iecname="out_speedAct" type="T_REAL" byteoffset="68" vartype="VAR_OUTPUT" inherited_from="T_atVFD" access="ReadWrite" />
-      <UserDefElement iecname="out_current" type="T_REAL" byteoffset="72" vartype="VAR_OUTPUT" inherited_from="T_atVFD" access="ReadWrite" />
-      <UserDefElement iecname="out_voltage" type="T_REAL" byteoffset="76" vartype="VAR_OUTPUT" inherited_from="T_atVFD" access="ReadWrite" />
-      <UserDefElement iecname="out_dcBus" type="T_REAL" byteoffset="80" vartype="VAR_OUTPUT" inherited_from="T_atVFD" access="ReadWrite" />
-      <UserDefElement iecname="out_fwdCmd" type="T_BOOL" byteoffset="84" vartype="VAR_OUTPUT" inherited_from="T_atVFD" access="ReadWrite" />
-      <UserDefElement iecname="out_revCmd" type="T_BOOL" byteoffset="85" vartype="VAR_OUTPUT" inherited_from="T_atVFD" access="ReadWrite" />
-      <UserDefElement iecname="out_faultVFDId" type="T_atVFDFaultCode" byteoffset="86" vartype="VAR_OUTPUT" inherited_from="T_atVFD" access="ReadWrite" />
-      <UserDefElement iecname="out_faultVFDId_last" type="T_atVFDFaultCode" byteoffset="88" vartype="VAR_OUTPUT" inherited_from="T_atVFD" access="ReadWrite" />
-      <UserDefElement iecname="fault" type="T_atAlarm" byteoffset="92" vartype="VAR_OUTPUT" inherited_from="T_atVFD" access="ReadWrite" />
-      <UserDefElement iecname="out_statusID" type="T_atSStStatusCode" byteoffset="106" vartype="VAR_OUTPUT" inherited_from="T_atVFD" access="ReadWrite" />
+      <UserDefElement iecname="in_outputEUMin" type="T_REAL" byteoffset="56" vartype="VAR_INPUT" inherited_from="T_atVFD" access="ReadWrite" />
+      <UserDefElement iecname="in_outputEUMax" type="T_REAL" byteoffset="60" vartype="VAR_INPUT" inherited_from="T_atVFD" access="ReadWrite" />
+      <UserDefElement iecname="out_speedCmdHz" type="T_REAL" byteoffset="64" vartype="VAR_OUTPUT" inherited_from="T_atVFD" access="ReadWrite" />
+      <UserDefElement iecname="out_speedCmd" type="T_REAL" byteoffset="68" vartype="VAR_OUTPUT" inherited_from="T_atVFD" access="ReadWrite" />
+      <UserDefElement iecname="out_speedActHz" type="T_REAL" byteoffset="72" vartype="VAR_OUTPUT" inherited_from="T_atVFD" access="ReadWrite" />
+      <UserDefElement iecname="out_speedAct" type="T_REAL" byteoffset="76" vartype="VAR_OUTPUT" inherited_from="T_atVFD" access="ReadWrite" />
+      <UserDefElement iecname="out_current" type="T_REAL" byteoffset="80" vartype="VAR_OUTPUT" inherited_from="T_atVFD" access="ReadWrite" />
+      <UserDefElement iecname="out_voltage" type="T_REAL" byteoffset="84" vartype="VAR_OUTPUT" inherited_from="T_atVFD" access="ReadWrite" />
+      <UserDefElement iecname="out_dcBus" type="T_REAL" byteoffset="88" vartype="VAR_OUTPUT" inherited_from="T_atVFD" access="ReadWrite" />
+      <UserDefElement iecname="out_fwdCmd" type="T_BOOL" byteoffset="92" vartype="VAR_OUTPUT" inherited_from="T_atVFD" access="ReadWrite" />
+      <UserDefElement iecname="out_revCmd" type="T_BOOL" byteoffset="93" vartype="VAR_OUTPUT" inherited_from="T_atVFD" access="ReadWrite" />
+      <UserDefElement iecname="out_faultVFDId" type="T_atVFDFaultCode" byteoffset="94" vartype="VAR_OUTPUT" inherited_from="T_atVFD" access="ReadWrite" />
+      <UserDefElement iecname="out_faultVFDId_last" type="T_atVFDFaultCode" byteoffset="96" vartype="VAR_OUTPUT" inherited_from="T_atVFD" access="ReadWrite" />
+      <UserDefElement iecname="fault" type="T_atAlarm" byteoffset="100" vartype="VAR_OUTPUT" inherited_from="T_atVFD" access="ReadWrite" />
+      <UserDefElement iecname="out_statusID" type="T_atSStStatusCode" byteoffset="114" vartype="VAR_OUTPUT" inherited_from="T_atVFD" access="ReadWrite" />
+      <UserDefElement iecname="out_estimatedEU" type="T_REAL" byteoffset="116" vartype="VAR_OUTPUT" inherited_from="T_atVFD" access="ReadWrite" />
     </TypeUserDef>
-    <TypeUserDef name="T_atVFDGS20" size="108" nativesize="28632" typeclass="Userdef" pouclass="FUNCTION_BLOCK" iecname="atVFDGS20" basetype="T_atVFDModbus">
+    <TypeUserDef name="T_atVFDGS20" size="120" nativesize="28648" typeclass="Userdef" pouclass="FUNCTION_BLOCK" iecname="atVFDGS20" basetype="T_atVFDModbus">
       <UserDefElement iecname="seq" type="T_atSeqCtl" byteoffset="0" vartype="VAR_INPUT" inherited_from="T_atDevice" access="ReadWrite" />
       <UserDefElement iecname="in_pause" type="T_BOOL" byteoffset="12" vartype="VAR_INPUT" inherited_from="T_atDevice" access="ReadWrite" />
       <UserDefElement iecname="out_run" type="T_BOOL" byteoffset="13" vartype="VAR_OUTPUT" inherited_from="T_atDevice" access="ReadWrite" />
@@ -403,37 +445,41 @@
       <UserDefElement iecname="in_hzMax" type="T_REAL" byteoffset="44" vartype="VAR_INPUT" inherited_from="T_atVFD" access="ReadWrite" />
       <UserDefElement iecname="in_autoFixedRef" type="T_REAL" byteoffset="48" vartype="VAR_INPUT" inherited_from="T_atVFD" access="ReadWrite" />
       <UserDefElement iecname="in_autoFixedEn" type="T_BOOL" byteoffset="52" vartype="VAR_INPUT" inherited_from="T_atVFD" access="ReadWrite" />
-      <UserDefElement iecname="out_speedCmdHz" type="T_REAL" byteoffset="56" vartype="VAR_OUTPUT" inherited_from="T_atVFD" access="ReadWrite" />
-      <UserDefElement iecname="out_speedCmd" type="T_REAL" byteoffset="60" vartype="VAR_OUTPUT" inherited_from="T_atVFD" access="ReadWrite" />
-      <UserDefElement iecname="out_speedActHz" type="T_REAL" byteoffset="64" vartype="VAR_OUTPUT" inherited_from="T_atVFD" access="ReadWrite" />
-      <UserDefElement iecname="out_speedAct" type="T_REAL" byteoffset="68" vartype="VAR_OUTPUT" inherited_from="T_atVFD" access="ReadWrite" />
-      <UserDefElement iecname="out_current" type="T_REAL" byteoffset="72" vartype="VAR_OUTPUT" inherited_from="T_atVFD" access="ReadWrite" />
-      <UserDefElement iecname="out_voltage" type="T_REAL" byteoffset="76" vartype="VAR_OUTPUT" inherited_from="T_atVFD" access="ReadWrite" />
-      <UserDefElement iecname="out_dcBus" type="T_REAL" byteoffset="80" vartype="VAR_OUTPUT" inherited_from="T_atVFD" access="ReadWrite" />
-      <UserDefElement iecname="out_fwdCmd" type="T_BOOL" byteoffset="84" vartype="VAR_OUTPUT" inherited_from="T_atVFD" access="ReadWrite" />
-      <UserDefElement iecname="out_revCmd" type="T_BOOL" byteoffset="85" vartype="VAR_OUTPUT" inherited_from="T_atVFD" access="ReadWrite" />
-      <UserDefElement iecname="out_faultVFDId" type="T_atVFDFaultCode" byteoffset="86" vartype="VAR_OUTPUT" inherited_from="T_atVFD" access="ReadWrite" />
-      <UserDefElement iecname="out_faultVFDId_last" type="T_atVFDFaultCode" byteoffset="88" vartype="VAR_OUTPUT" inherited_from="T_atVFD" access="ReadWrite" />
-      <UserDefElement iecname="fault" type="T_atAlarm" byteoffset="92" vartype="VAR_OUTPUT" inherited_from="T_atVFD" access="ReadWrite" />
-      <UserDefElement iecname="out_statusID" type="T_atSStStatusCode" byteoffset="106" vartype="VAR_OUTPUT" inherited_from="T_atVFD" access="ReadWrite" />
+      <UserDefElement iecname="in_outputEUMin" type="T_REAL" byteoffset="56" vartype="VAR_INPUT" inherited_from="T_atVFD" access="ReadWrite" />
+      <UserDefElement iecname="in_outputEUMax" type="T_REAL" byteoffset="60" vartype="VAR_INPUT" inherited_from="T_atVFD" access="ReadWrite" />
+      <UserDefElement iecname="out_speedCmdHz" type="T_REAL" byteoffset="64" vartype="VAR_OUTPUT" inherited_from="T_atVFD" access="ReadWrite" />
+      <UserDefElement iecname="out_speedCmd" type="T_REAL" byteoffset="68" vartype="VAR_OUTPUT" inherited_from="T_atVFD" access="ReadWrite" />
+      <UserDefElement iecname="out_speedActHz" type="T_REAL" byteoffset="72" vartype="VAR_OUTPUT" inherited_from="T_atVFD" access="ReadWrite" />
+      <UserDefElement iecname="out_speedAct" type="T_REAL" byteoffset="76" vartype="VAR_OUTPUT" inherited_from="T_atVFD" access="ReadWrite" />
+      <UserDefElement iecname="out_current" type="T_REAL" byteoffset="80" vartype="VAR_OUTPUT" inherited_from="T_atVFD" access="ReadWrite" />
+      <UserDefElement iecname="out_voltage" type="T_REAL" byteoffset="84" vartype="VAR_OUTPUT" inherited_from="T_atVFD" access="ReadWrite" />
+      <UserDefElement iecname="out_dcBus" type="T_REAL" byteoffset="88" vartype="VAR_OUTPUT" inherited_from="T_atVFD" access="ReadWrite" />
+      <UserDefElement iecname="out_fwdCmd" type="T_BOOL" byteoffset="92" vartype="VAR_OUTPUT" inherited_from="T_atVFD" access="ReadWrite" />
+      <UserDefElement iecname="out_revCmd" type="T_BOOL" byteoffset="93" vartype="VAR_OUTPUT" inherited_from="T_atVFD" access="ReadWrite" />
+      <UserDefElement iecname="out_faultVFDId" type="T_atVFDFaultCode" byteoffset="94" vartype="VAR_OUTPUT" inherited_from="T_atVFD" access="ReadWrite" />
+      <UserDefElement iecname="out_faultVFDId_last" type="T_atVFDFaultCode" byteoffset="96" vartype="VAR_OUTPUT" inherited_from="T_atVFD" access="ReadWrite" />
+      <UserDefElement iecname="fault" type="T_atAlarm" byteoffset="100" vartype="VAR_OUTPUT" inherited_from="T_atVFD" access="ReadWrite" />
+      <UserDefElement iecname="out_statusID" type="T_atSStStatusCode" byteoffset="114" vartype="VAR_OUTPUT" inherited_from="T_atVFD" access="ReadWrite" />
+      <UserDefElement iecname="out_estimatedEU" type="T_REAL" byteoffset="116" vartype="VAR_OUTPUT" inherited_from="T_atVFD" access="ReadWrite" />
     </TypeUserDef>
-    <TypeUserDef name="T_atWell" size="1100" nativesize="33360" typeclass="Userdef" pouclass="FUNCTION_BLOCK" iecname="atWell">
+    <TypeUserDef name="T_atWell" size="1184" nativesize="34264" typeclass="Userdef" pouclass="FUNCTION_BLOCK" iecname="atWell">
       <UserDefElement iecname="in_runStatFromFlowSP" type="T_REAL" byteoffset="0" vartype="VAR_INPUT" access="ReadWrite" />
       <UserDefElement iecname="in_demandPerc" type="T_REAL" byteoffset="4" vartype="VAR_INPUT" access="ReadWrite" />
       <UserDefElement iecname="in_pumpEn" type="T_BOOL" byteoffset="8" vartype="VAR_INPUT" access="ReadWrite" />
       <UserDefElement iecname="pump" type="T_atDevice" byteoffset="12" vartype="VAR_INPUT" access="ReadWrite" />
       <UserDefElement iecname="lvl" type="T_atAI" byteoffset="40" vartype="VAR_INPUT" access="ReadWrite" />
-      <UserDefElement iecname="flow" type="T_atAI" byteoffset="336" vartype="VAR_INPUT" access="ReadWrite" />
-      <UserDefElement iecname="vol" type="T_atHSC" byteoffset="632" vartype="VAR_INPUT" access="ReadWrite" />
-      <UserDefElement iecname="out_runStat" type="T_BOOL" byteoffset="656" vartype="VAR_OUTPUT" access="ReadWrite" />
-      <UserDefElement iecname="lvlHistory" type="T_atAnalogAggregateItem" byteoffset="660" vartype="VAR_OUTPUT" access="ReadWrite" />
-      <UserDefElement iecname="history" type="T_atWellHistory" byteoffset="672" vartype="VAR_OUTPUT" access="ReadWrite" />
-      <UserDefElement iecname="out_volTdy" type="T_DINT" byteoffset="1020" vartype="VAR_OUTPUT" access="ReadWrite" />
-      <UserDefElement iecname="out_volYest" type="T_DINT" byteoffset="1024" vartype="VAR_OUTPUT" access="ReadWrite" />
-      <UserDefElement iecname="out_rtTdy" type="T_DINT" byteoffset="1028" vartype="VAR_OUTPUT" access="ReadWrite" />
-      <UserDefElement iecname="out_rtYest" type="T_DINT" byteoffset="1032" vartype="VAR_OUTPUT" access="ReadWrite" />
-      <UserDefElement iecname="info" type="T_atWellInfoSP" byteoffset="1036" vartype="VAR_OUTPUT" access="ReadWrite" />
-      <UserDefElement iecname="runTimeHistory" type="T_atHist7DintSP" byteoffset="1068" vartype="VAR_OUTPUT" access="ReadWrite" />
+      <UserDefElement iecname="flow" type="T_atAI" byteoffset="364" vartype="VAR_INPUT" access="ReadWrite" />
+      <UserDefElement iecname="vol" type="T_atHSC" byteoffset="688" vartype="VAR_INPUT" access="ReadWrite" />
+      <UserDefElement iecname="out_runStat" type="T_BOOL" byteoffset="728" vartype="VAR_OUTPUT" access="ReadWrite" />
+      <UserDefElement iecname="lvlHistory" type="T_atAnalogAggregateItem" byteoffset="732" vartype="VAR_OUTPUT" access="ReadWrite" />
+      <UserDefElement iecname="history" type="T_atWellHistory" byteoffset="744" vartype="VAR_OUTPUT" access="ReadWrite" />
+      <UserDefElement iecname="out_volTdy" type="T_DINT" byteoffset="1088" vartype="VAR_OUTPUT" access="ReadWrite" />
+      <UserDefElement iecname="out_volYest" type="T_DINT" byteoffset="1092" vartype="VAR_OUTPUT" access="ReadWrite" />
+      <UserDefElement iecname="out_rtTdy" type="T_DINT" byteoffset="1096" vartype="VAR_OUTPUT" access="ReadWrite" />
+      <UserDefElement iecname="out_rtYest" type="T_DINT" byteoffset="1100" vartype="VAR_OUTPUT" access="ReadWrite" />
+      <UserDefElement iecname="info" type="T_atWellInfoSP" byteoffset="1104" vartype="VAR_OUTPUT" access="ReadWrite" />
+      <UserDefElement iecname="runTimeHistory" type="T_atHist7DintSP" byteoffset="1136" vartype="VAR_OUTPUT" access="ReadWrite" />
+      <UserDefElement iecname="loLvlPauseDly" type="T_TOF" byteoffset="1168" vartype="VAR" access="ReadWrite" />
     </TypeUserDef>
   </TypeList>
   <NodeList>
@@ -452,6 +498,28 @@
         <Node name="cysPress" type="T_atAI" access="ReadWrite" />
         <Node name="IOBase_1" type="T_atOdotB32" access="ReadWrite" />
         <Node name="IOBase_4" type="T_atOdotB64" access="ReadWrite" />
+        <Node name="spareAI2" type="T_atAI" access="ReadWrite" />
+        <Node name="spareAI3" type="T_atAI" access="ReadWrite" />
+        <Node name="spareAI4" type="T_atAI" access="ReadWrite" />
+        <Node name="spareAI5" type="T_atAI" access="ReadWrite" />
+        <Node name="spareAI6" type="T_atAI" access="ReadWrite" />
+        <Node name="spareAI7" type="T_atAI" access="ReadWrite" />
+        <Node name="spareAI8" type="T_atAI" access="ReadWrite" />
+        <Node name="spareDI2" type="T_atDI" access="ReadWrite" />
+        <Node name="spareDI3" type="T_atDI" access="ReadWrite" />
+        <Node name="spareDI4" type="T_atDI" access="ReadWrite" />
+        <Node name="spareDI5" type="T_atDI" access="ReadWrite" />
+        <Node name="spareDI6" type="T_atDI" access="ReadWrite" />
+        <Node name="spareDI7" type="T_atDI" access="ReadWrite" />
+        <Node name="spareDI8" type="T_atDI" access="ReadWrite" />
+        <Node name="spareDQ1" type="T_atDQ" access="ReadWrite" />
+        <Node name="spareDQ2" type="T_atDQ" access="ReadWrite" />
+        <Node name="spareDQ3" type="T_atDQ" access="ReadWrite" />
+        <Node name="spareDQ4" type="T_atDQ" access="ReadWrite" />
+        <Node name="spareDQ5" type="T_atDQ" access="ReadWrite" />
+        <Node name="spareDQ6" type="T_atDQ" access="ReadWrite" />
+        <Node name="spareDQ7" type="T_atDQ" access="ReadWrite" />
+        <Node name="spareDQ8" type="T_atDQ" access="ReadWrite" />
         <Node name="trkLdctl1" type="T_atTrkPumpCtl" access="ReadWrite" />
         <Node name="trkLdctl2" type="T_atTrkPumpCtl" access="ReadWrite" />
         <Node name="trkLdVFD1" type="T_atVFDGS20" access="ReadWrite" />
@@ -463,6 +531,7 @@
         <Node name="well4" type="T_atWell" access="ReadWrite" />
         <Node name="well4_IOBase" type="T_atOdotB32" access="ReadWrite" />
         <Node name="well4IO_cd1" type="T_atBT3238" access="ReadWrite" />
+        <Node name="well4Pump" type="T_atMotor" access="ReadWrite" />
       </Node>
     </Node>
   </NodeList>
diff --git a/rbf_water.project b/rbf_water.project
index 7f5e2cd..cd306e5 100644
--- a/rbf_water.project
+++ b/rbf_water.project
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bf597c04fef383af4460156b8571e13a3f1403b15b9e09f90e585b651e1c43d0
-size 5896208
+oid sha256:23c273303285bc97f16b100f46f59d8d11b53d4ef72eb5422ac39eeb9751636d
+size 6516726
diff --git a/rbf_water_project.precompilecache b/rbf_water_project.precompilecache
index d88c618..3af63ea 100644
--- a/rbf_water_project.precompilecache
+++ b/rbf_water_project.precompilecache
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bb5c18f83c82d87e0534089ba94cbf952b1e243edbe9f20d1ab85f6bc9dd95a7
-size 1038883
+oid sha256:ab501ce9660f3f108ebcc03a85f40e28cbc4bfb5c31fd0916dd46f97f67aa218
+size 1081040