Index: firmware/App/Modes/ModeGenDialysate.c
===================================================================
diff -u -r5e92cbb2c29854fb60a91dc4abafeb9b08d3272c -r5126b79e4970ffe2ed9db4cccea18a1216c78570
--- firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision 5e92cbb2c29854fb60a91dc4abafeb9b08d3272c)
+++ firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision 5126b79e4970ffe2ed9db4cccea18a1216c78570)
@@ -625,19 +625,6 @@
 
 /*********************************************************************//**
  * @brief
- * The setCurrentGenDialysateState function sets the current state of the
- * gen dialysate mode.
- * @details \b Inputs: genDialysateState
- * @details \b Outputs: genDialysateState
- * @return the current state of gen dialysate mode
- *************************************************************************/
-void setCurrentGenDialysateState( DD_GEND_MODE_STATE_T state )
-{
-    genDialysateState = state;
-}
-
-/*********************************************************************//**
- * @brief
  * The setTreatmentParamUpdate function sets the flag to indicate one or more
  * treatement parameters updated.
  * gen dialysate mode.
@@ -867,8 +854,11 @@
             if ( payload.execStateSet < NUM_OF_DD_GEND_MODE_STATES )
             {
                 //set the GenD exec state machine
-                setCurrentGenDialysateState( (DD_GEND_MODE_STATE_T)payload.execStateSet);
+                DD_GEND_MODE_STATE_T state = (DD_GEND_MODE_STATE_T)payload.execStateSet;
 
+                setModeGenDStateTransition( state );
+                genDialysateState = state;
+
                 result = TRUE;
             }
         }