Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -r07f2ffedebb65a5a2b76ed9833c654c24221ec37 -r12c4f28723f9af89ae693df771039da1bc7ffc80
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 07f2ffedebb65a5a2b76ed9833c654c24221ec37)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 12c4f28723f9af89ae693df771039da1bc7ffc80)
@@ -16,6 +16,7 @@
 ***************************************************************************/
 
 #include "ModeStandby.h"
+#include "ModeWaterPreGen.h"
 #include "OperationModes.h"
 #include "PersistentAlarm.h"
 #include "SystemCommRO.h"
@@ -30,7 +31,6 @@
 // ********** private data **********
 
 static RO_STANDBY_MODE_STATE_T standbyState;                                              ///< Currently active standby state.
-static U32 pendingStartRORequest;                                              ///< Flag indicating DD has requested RO start the generate permeate (Overridable).
 
 // ********** private function prototypes **********
 
@@ -46,7 +46,6 @@
 void initStandbyMode( void )
 {
     standbyState = RO_STANDBY_MODE_STATE_IDLE;
-    pendingStartRORequest               = FALSE;
 }
 
 /*********************************************************************//**
@@ -103,10 +102,9 @@
 {
     RO_STANDBY_MODE_STATE_T state = RO_STANDBY_MODE_STATE_IDLE;
 
-    if ( TRUE == pendingStartRORequest )
+    if ( TRUE == getPreGenRequest() )
     {
-        pendingStartRORequest = FALSE;
-        requestNewOperationMode( RO_MODE_GENP );
+        requestNewOperationMode( RO_MODE_PGEN );
     }
 
     return state;
@@ -124,27 +122,7 @@
     return standbyState;
 }
 
-/*********************************************************************//**
- * @brief
- * The requestROStart function handles an DD request to start (go to gen permeate mode).
- * @details \b Inputs: standbyState
- * @details \b Outputs: pendingStartRORequest
- * @return TRUE if request accepted, FALSE if not.
- *************************************************************************/
-BOOL requestROStart( void )
-{
-    BOOL result = FALSE;
 
-    if ( ( RO_MODE_STAN == getCurrentOperationMode() ) && ( RO_STANDBY_MODE_STATE_IDLE == standbyState ) )
-    {
-        result                    = TRUE;
-        pendingStartRORequest     = TRUE;
-    }
-
-    return result;
-}
-
-
 /*************************************************************************
  *                       TEST SUPPORT FUNCTIONS
  *************************************************************************/