Index: firmware/App/Services/DDInterface.c
===================================================================
diff -u -r286fbceae8be1276780690fe4b3010c8b2270239 -r12c4f28723f9af89ae693df771039da1bc7ffc80
--- firmware/App/Services/DDInterface.c	(.../DDInterface.c)	(revision 286fbceae8be1276780690fe4b3010c8b2270239)
+++ firmware/App/Services/DDInterface.c	(.../DDInterface.c)	(revision 12c4f28723f9af89ae693df771039da1bc7ffc80)
@@ -188,17 +188,18 @@
     {
         if ( FALSE == start )
         {
-            // stop Permeate Generation by transitioning to standby mode
             signalROPumpStop( P12_PUMP );
-            requestNewOperationMode( RO_MODE_STAN );
+            result = requestPreGenStop();
         }
         else
         {
             // Set flow rate and delivery.
             setDDPermeateFlowRate( roRate );
+            result = TRUE;
         }
-        result = TRUE;
     }
+
+    return result;
 }
 
 /*********************************************************************//**
@@ -226,17 +227,18 @@
     {
         if ( FALSE == start )
         {
-            // stop Permeate Generation by transitioning to standby mode
             signalROPumpStop( P12_PUMP );
-            requestNewOperationMode( RO_MODE_STAN );
+            result = requestGenWaterStop();
         }
         else
         {
             // Set flow rate and delivery.
             setDDPermeateFlowRate( roRate );
+            result = TRUE;
         }
-        result = TRUE;
     }
+
+    return result;
 }