Index: firmware/App/DDCommon.h
===================================================================
diff -u -r8348015aa77e1ee2c4c20e9f8e2c45b59bcf3f17 -r83801fb34ea084512961215be50b3558794ec88b
--- firmware/App/DDCommon.h	(.../DDCommon.h)	(revision 8348015aa77e1ee2c4c20e9f8e2c45b59bcf3f17)
+++ firmware/App/DDCommon.h	(.../DDCommon.h)	(revision 83801fb34ea084512961215be50b3558794ec88b)
@@ -25,7 +25,7 @@
 #define DD_VERSION_MAJOR        0
 #define DD_VERSION_MINOR        0
 #define DD_VERSION_MICRO        0
-#define DD_VERSION_BUILD  80
+#define DD_VERSION_BUILD  81
 
 // ********** development build switches **********
 
Index: firmware/App/Modes/ModeGenDialysate.c
===================================================================
diff -u -r8348015aa77e1ee2c4c20e9f8e2c45b59bcf3f17 -r83801fb34ea084512961215be50b3558794ec88b
--- firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision 8348015aa77e1ee2c4c20e9f8e2c45b59bcf3f17)
+++ firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision 83801fb34ea084512961215be50b3558794ec88b)
@@ -7,8 +7,8 @@
 *
 * @file    ModeGenDialysate.c
 *
-* @author  (last)      Sameer Kalliadan Poyil
-* @date    (last)      23-Apr-2026
+* @author  (last)      Raghu Kallala
+* @date    (last)      05-May-2026
 *
 * @author  (original)  Vinayakam Mani
 * @date    (original)  06-Nov-2024
@@ -24,6 +24,7 @@
 #include "FpgaDD.h"
 #include "Heaters.h"
 #include "Level.h"
+#include "MessagePayloads.h"
 #include "Messaging.h"
 #include "ModeGenDialysate.h"
 #include "ModeStandby.h"
Index: firmware/App/Modes/ModeGenDialysate.h
===================================================================
diff -u -r8348015aa77e1ee2c4c20e9f8e2c45b59bcf3f17 -r83801fb34ea084512961215be50b3558794ec88b
--- firmware/App/Modes/ModeGenDialysate.h	(.../ModeGenDialysate.h)	(revision 8348015aa77e1ee2c4c20e9f8e2c45b59bcf3f17)
+++ firmware/App/Modes/ModeGenDialysate.h	(.../ModeGenDialysate.h)	(revision 83801fb34ea084512961215be50b3558794ec88b)
@@ -8,7 +8,7 @@
 * @file    ModeGenDialysate.h
 *
 * @author  (last)      Raghu Kallala
-* @date    (last)      22-Apr-2026
+* @date    (last)      30-Apr-2026
 *
 * @author  (original)  Vinayakam Mani
 * @date    (original)  06-Nov-2024
@@ -37,15 +37,6 @@
 #define DIAL_PUMP_DRAIN_RPM                     1000                                        ///< Nominal RPM target for dialysate pump to drain the dry bicart.
 #define SPENT_DIAL_PUMP_FILL_RPM                200                                         ///< Nominal RPM target for spent chamber fill operations.
 
-/// Generate dialysate mode data structure
-typedef struct
-{
-    U32 genDialysateExecState;                          ///< Generate dialysate execution state
-    BOOL isDialDelInProgress;                           ///< Whether Dialysate Delivery in progress or not
-    BOOL isDialysateGoodtoDeliver;                      ///< Ready to deliver dialysate or not
-    F32 currentQd;                                      ///< Current dialysate flow rate (ml/min)
-} GEN_DIALYSATE_MODE_DATA_T;
-
 // ********** public function prototypes **********
 
 void initGenDialysateMode( void );                          // Initialize this gen dialysate mode unit