diff --git a/Development/Archive.prj b/Development/Archive.prj
index dfcbb66..7f5f332 100644
Binary files a/Development/Archive.prj and b/Development/Archive.prj differ
diff --git a/Development/rbf_water-User-ATOM-CRDESKTOP.opt b/Development/rbf_water-User-ATOM-CRDESKTOP.opt
index fb564b6..ec4eade 100644
Binary files a/Development/rbf_water-User-ATOM-CRDESKTOP.opt and b/Development/rbf_water-User-ATOM-CRDESKTOP.opt differ
diff --git a/Development/rbf_water.Device.Application.74ccca2f-50e3-4d5a-9d7a-9fd420284f83.bootinfo b/Development/rbf_water.Device.Application.74ccca2f-50e3-4d5a-9d7a-9fd420284f83.bootinfo
index c61148c..4a742ec 100644
Binary files a/Development/rbf_water.Device.Application.74ccca2f-50e3-4d5a-9d7a-9fd420284f83.bootinfo and b/Development/rbf_water.Device.Application.74ccca2f-50e3-4d5a-9d7a-9fd420284f83.bootinfo differ
diff --git a/Development/rbf_water.Device.Application.74ccca2f-50e3-4d5a-9d7a-9fd420284f83.bootinfo_guids b/Development/rbf_water.Device.Application.74ccca2f-50e3-4d5a-9d7a-9fd420284f83.bootinfo_guids
index 9da6e74..959e82c 100644
Binary files a/Development/rbf_water.Device.Application.74ccca2f-50e3-4d5a-9d7a-9fd420284f83.bootinfo_guids and b/Development/rbf_water.Device.Application.74ccca2f-50e3-4d5a-9d7a-9fd420284f83.bootinfo_guids differ
diff --git a/Development/rbf_water.Device.Application.74ccca2f-50e3-4d5a-9d7a-9fd420284f83.compileinfo b/Development/rbf_water.Device.Application.74ccca2f-50e3-4d5a-9d7a-9fd420284f83.compileinfo
index c61148c..4a742ec 100644
Binary files a/Development/rbf_water.Device.Application.74ccca2f-50e3-4d5a-9d7a-9fd420284f83.compileinfo and b/Development/rbf_water.Device.Application.74ccca2f-50e3-4d5a-9d7a-9fd420284f83.compileinfo differ
diff --git a/Development/rbf_water.Device.Application.xml b/Development/rbf_water.Device.Application.xml
index 93b58dc..693677d 100644
--- a/Development/rbf_water.Device.Application.xml
+++ b/Development/rbf_water.Device.Application.xml
@@ -25,6 +25,12 @@
       <UserDefElement type="T_atAlarmDefault" iecname="unlatched" enumvalue="0" />
       <UserDefElement type="T_atAlarmDefault" iecname="latched" enumvalue="1" />
     </TypeUserDef>
+    <TypeUserDef name="T_atDebounce" size="13" nativesize="96" typeclass="Userdef" pouclass="FUNCTION_BLOCK" iecname="atDebounce">
+      <UserDefElement iecname="in_raw" 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" />
+      <UserDefElement iecname="out_val" type="T_BOOL" byteoffset="12" vartype="VAR_OUTPUT" access="ReadWrite" />
+    </TypeUserDef>
     <TypeUserDef name="T_atFilter" size="12" nativesize="96" typeclass="Userdef" pouclass="FUNCTION_BLOCK" iecname="atFilter">
       <UserDefElement iecname="in_cv" type="T_REAL" byteoffset="0" vartype="VAR_INPUT" access="ReadWrite" />
       <UserDefElement iecname="in_tau" type="T_TIME" byteoffset="4" vartype="VAR_INPUT" access="ReadWrite" />
@@ -85,6 +91,13 @@
       <UserDefElement iecname="in_overSP" type="T_REAL" byteoffset="88" vartype="VAR_INPUT" access="ReadWrite" />
       <UserDefElement iecname="in_underSP" type="T_REAL" byteoffset="92" vartype="VAR_INPUT" access="ReadWrite" />
     </TypeUserDef>
+    <TypeUserDef name="T_atDIFault" size="42" nativesize="224" typeclass="Userdef" pouclass="FUNCTION_BLOCK" iecname="atDIFault">
+      <UserDefElement iecname="card" type="T_atAlarm" byteoffset="0" vartype="VAR_INPUT" access="ReadWrite" />
+      <UserDefElement iecname="chan" type="T_atAlarm" byteoffset="20" vartype="VAR_INPUT" access="ReadWrite" />
+      <UserDefElement iecname="in_reset" type="T_BOOL" byteoffset="39" vartype="VAR_INPUT" access="ReadWrite" />
+      <UserDefElement iecname="in_card" type="T_BOOL" byteoffset="40" vartype="VAR_INPUT" access="ReadWrite" />
+      <UserDefElement iecname="in_chan" type="T_BOOL" byteoffset="41" vartype="VAR_INPUT" access="ReadWrite" />
+    </TypeUserDef>
     <TypeUserDef name="T_atLimit" size="56" nativesize="216" typeclass="Userdef" pouclass="FUNCTION_BLOCK" iecname="atLimit">
       <UserDefElement iecname="alm" type="T_atAlarm" byteoffset="0" vartype="VAR_INPUT" access="ReadWrite" />
       <UserDefElement iecname="in_val" type="T_REAL" byteoffset="20" vartype="VAR_INPUT" access="ReadWrite" />
@@ -99,6 +112,20 @@
       <UserDefElement iecname="in_procDelOn" type="T_TIME" byteoffset="48" vartype="VAR_INPUT" access="ReadWrite" />
       <UserDefElement iecname="in_procDelOff" type="T_TIME" byteoffset="52" vartype="VAR_INPUT" access="ReadWrite" />
     </TypeUserDef>
+    <TypeUserDef name="T_atDI" size="167" nativesize="528" typeclass="Userdef" pouclass="FUNCTION_BLOCK" iecname="atDI">
+      <UserDefElement iecname="in_raw" type="T_BOOL" byteoffset="0" vartype="VAR_INPUT" access="ReadWrite" />
+      <UserDefElement iecname="in_reset" type="T_BOOL" byteoffset="1" vartype="VAR_INPUT" access="ReadWrite" />
+      <UserDefElement iecname="in_ready" type="T_BOOL" byteoffset="2" vartype="VAR_INPUT" access="ReadWrite" />
+      <UserDefElement iecname="faults" type="T_atDIFault" byteoffset="4" vartype="VAR_INPUT" access="ReadWrite" />
+      <UserDefElement iecname="alm" type="T_atAlarm" byteoffset="48" vartype="VAR_INPUT" access="ReadWrite" />
+      <UserDefElement iecname="debounce" type="T_atDebounce" byteoffset="68" vartype="VAR_INPUT" access="ReadWrite" />
+      <UserDefElement iecname="in_invert" type="T_BOOL" byteoffset="81" vartype="VAR_INPUT" access="ReadWrite" />
+      <UserDefElement iecname="in_name" type="T_STRING" byteoffset="82" vartype="VAR_INPUT" access="ReadWrite" />
+      <UserDefElement iecname="out_raw" type="T_BOOL" byteoffset="163" vartype="VAR_OUTPUT" access="ReadWrite" />
+      <UserDefElement iecname="out_val" type="T_BOOL" byteoffset="164" vartype="VAR_OUTPUT" access="ReadWrite" />
+      <UserDefElement iecname="out_ready" type="T_BOOL" byteoffset="165" vartype="VAR_OUTPUT" access="ReadWrite" />
+      <UserDefElement iecname="raw" type="T_BOOL" byteoffset="166" vartype="VAR" access="ReadWrite" />
+    </TypeUserDef>
     <TypeUserDef name="T_atLimits" size="232" nativesize="880" typeclass="Userdef" pouclass="FUNCTION_BLOCK" iecname="atLimits">
       <UserDefElement iecname="in_val" type="T_REAL" byteoffset="0" vartype="VAR_INPUT" access="ReadWrite" />
       <UserDefElement iecname="in_reset" type="T_BOOL" byteoffset="4" vartype="VAR_INPUT" access="ReadWrite" />
@@ -175,6 +202,7 @@
       </Node>
       <Node name="g">
         <Node name="cysLevel" type="T_atAI" access="ReadWrite" />
+        <Node name="cysNoPress" type="T_atDI" access="ReadWrite" />
         <Node name="cysPress" type="T_atAI" access="ReadWrite" />
       </Node>
     </Node>
diff --git a/Development/rbf_water.project b/Development/rbf_water.project
index 23a1897..77acaf2 100644
Binary files a/Development/rbf_water.project and b/Development/rbf_water.project differ
diff --git a/Development/rbf_water.~u b/Development/rbf_water.~u
deleted file mode 100644
index ecae73f..0000000
--- a/Development/rbf_water.~u
+++ /dev/null
@@ -1,4 +0,0 @@
-User
-ATOM-CRDESKTOP
-31584
-638919239448598202
diff --git a/Development/rbf_water_project.precompilecache b/Development/rbf_water_project.precompilecache
index 0289ce5..c1e7306 100644
Binary files a/Development/rbf_water_project.precompilecache and b/Development/rbf_water_project.precompilecache differ