Index: DDDefs.h
===================================================================
diff -u -rffe968d36207b80678a9fd77a834f48f7d3b5aed -r9c5b75dbcbba4a4126382b834a2446c1b9f32294
--- DDDefs.h	(.../DDDefs.h)	(revision ffe968d36207b80678a9fd77a834f48f7d3b5aed)
+++ DDDefs.h	(.../DDDefs.h)	(revision 9c5b75dbcbba4a4126382b834a2446c1b9f32294)
@@ -7,8 +7,8 @@
 *
 * @file    DDDefs.h
 *
-* @author  (last)      Dara Navaei
-* @date    (last)      27-May-2026
+* @author  (last)      Sameer Kalliadan Poyil
+* @date    (last)      24-Jun-2026
 *
 * @author  (original)  Sean Nash
 * @date    (original)  01-Aug-2024
@@ -472,22 +472,6 @@
 /**@}*/
 
 /**
- *  @addtogroup Ultrafiltraion
- *  @{
- */
-
-/// Enumeration of ultra filtration exec states.
-enum Ultra_filtration_Exec_States
-{
-    DD_UF_PAUSED = 0,                               ///< Ultrafiltration pasued state
-    DD_UF_RUNNING,                                  ///< Ultrafiltration running state
-    NUM_OF_UF_EXEC_STATES                           ///< Number of ultrafiltration exec states
-};
-typedef enum Ultra_filtration_Exec_States UF_EXEC_STATE_T;  ///< Type for ultrafiltration exec state enumeration
-
-/**@}*/
-
-/**
  *  @addtogroup SpentChamberFill
  *  @{
  */
@@ -533,26 +517,35 @@
     BICARB_CHAMBER_START_STATE = 0,                                  ///< Initial state of Chamber F fill
     BICARB_CARTRIDGE_FILL_WATER_START_STATE,                         ///< Dry bicart fill water start state while dialysate delivery
     BICARB_CARTRIDGE_FILL_WATER_END_STATE,                           ///< Dry bicart fill water end state while dialysate delivery
-    BICARB_CHAMBER_CHECK_LEVEL_STATE,                                ///< Bicarb Chamber check level state
-    BICARB_CHAMBER_FILL_STATE,                                       ///< Bicarb Chamber fill start state
+    BICARB_CHAMBER_SUPPLY_STATE,                                     ///< Bicarb Chamber fill start state
     BICARB_CHAMBER_PRESSURE_CHECK_STATE,                             ///< Bicarb Chamber pressure check start state
     BICARB_SUPPLY_VENT_START_STATE,                                  ///< Bicarb Chamber supply vent cartridge and Chamber F start state
     BICARB_SUPPLY_VENT_END_STATE,                                    ///< Bicarb Chamber supply vent cartridge and Chamber F end state
     NUM_OF_BICARB_CHAMBER_FILL_EXEC_STATES                           ///< Number of Bicarb chamber fill state
 };
 typedef enum Bicarb_Chamber_F_Fill_Exec_States BICARB_CHAMBER_FILL_EXEC_STATE_T;  ///< Type for bicarb chamber fill exec state enumeration
 
-/// Enumeration of Bicarb chmaber drain mode exec states
+/// Enumeration of DryBicart drain exec states
 enum Dry_Bicart_Drain_Exec_States
 {
-    DRY_BICART_DRAIN_START_STATE = 0,                                 ///< Initial state of dry bicart drain
-    DRY_BICART_FLUID_DRAIN_STATE,                                     ///< Dry bicart fluid drain state
-    DRY_BICART_FLUID_DRAIN_DURATION_CHECK_STATE,                      ///< Dry bicart drain duration check state
-    DRY_BICART_FLUID_DRAIN_END_STATE,                                 ///< Dry bicart drain end state
+    DRY_BICART_DRAIN_START_STATE = 0,                                ///< Initial state of dry bicart drain
+    DRY_BICART_FLUID_DRAIN_STATE,                                    ///< Dry bicart fluid drain state
+    DRY_BICART_FLUID_DRAIN_DURATION_CHECK_STATE,                     ///< Dry bicart drain duration check state
+    DRY_BICART_FLUID_DRAIN_END_STATE,                                ///< Dry bicart drain end state
     NUM_OF_DRY_BICART_DRAIN_EXEC_STATES
 };
 typedef enum Dry_Bicart_Drain_Exec_States DRY_BICART_DRAIN_EXEC_STATE_T;    ///< Type for dry bicart fill exec state enumeration
 
+/// Enumeration of drybicart depressurize exec states
+enum Dry_Bicart_Depressurize_Exec_States
+{
+    DRY_BICART_DEPRESSURIZE_START_STATE = 0,                         ///< Initial state of dry bicart depressurise
+    DRY_BICART_DEPRESSURIZE_VENT_START_STATE,                        ///< Dry bicart depressurize vent start state
+    DRY_BICART_DEPRESSURIZE_VENT_END_STATE,                          ///< Dry bicart depressurize vent end state
+    NUM_OF_DRY_BICART_DEPRESSURIZE_EXEC_STATES
+};
+typedef enum Dry_Bicart_Depressurize_Exec_States DRY_BICART_DEPRESSURIZE_EXEC_STATE_T;    ///< Type for dry bicart depressurize exec state enumeration
+
 /// Enumeration of conductivity sensors.
 enum Conductivity_Sensors
 {