Index: firmware/App/Services/DDInterface.c
===================================================================
diff -u -r410afd26b3ae5e372310c696c82f58c59235e10d -r8d272582cbd2cb5fc0c6af0fead2867ce02658b0
--- firmware/App/Services/DDInterface.c	(.../DDInterface.c)	(revision 410afd26b3ae5e372310c696c82f58c59235e10d)
+++ firmware/App/Services/DDInterface.c	(.../DDInterface.c)	(revision 8d272582cbd2cb5fc0c6af0fead2867ce02658b0)
@@ -15,16 +15,20 @@
 *
 ***************************************************************************/
 
-#include <ModePreGenPermeate.h>
-#include <SystemCommFP.h>
+
+#include "BoostPump.h"
 #include "DDInterface.h"
 #include "Messaging.h"
 #include "MessagePayloads.h"
 #include "ModeGenPermeate.h"
+#include "ModeGenPermeateDefeatured.h"
+#include "ModePreGenPermeate.h"
+#include "ModePreGenPermeateDefeatured.h"
 #include "ModeStandby.h"
 #include "OperationModes.h"
 #include "PersistentAlarm.h"
 #include "ROPump.h"
+#include "SystemCommFP.h"
 #include "TaskGeneral.h"
 #include "Timers.h"
 
@@ -180,16 +184,25 @@
     if ( ( FP_MODE_STAN == roMode ) && ( TRUE == start ) )
     {
         setDDPermeateFlowRate( roRate );
-        setFluidPumpPWMDutyCycle( P12_PUMP, roRate );
-        result = requestPreGenStart();
+        if ( TRUE == isDefeatured() )
+        {
+            result = requestPreGenDefStart();
+        }
+
+        else
+        {
+            result = requestPreGenStart();
+        }
+
     }
+
     else if ( FP_MODE_PGEN == roMode )
     {
         if ( FALSE == start )
         {
-            signalROPumpHardStop();
             result = requestPreGenStop();
         }
+
         else
         {
             // Set flow rate and delivery.
@@ -198,6 +211,11 @@
         }
     }
 
+    else if ( FP_MODE_DPGW == roMode )
+    {
+        result = requestPreGenDefStop();
+    }
+
     return result;
 }
 
@@ -219,16 +237,24 @@
     if ( ( FP_MODE_PGEN == roMode ) && ( TRUE == start ) )
     {
         setDDPermeateFlowRate( roRate );
-        setFluidPumpPWMDutyCycle( P12_PUMP,roRate );
-        result = requestGenWaterStart();
+        if ( TRUE == isDefeatured() )
+        {
+            result = requestGenWaterDefStart();
+        }
+
+        else
+        {
+            result = requestGenWaterStart();
+        }
     }
+
     else if ( FP_MODE_GENP == roMode )
     {
         if ( FALSE == start )
         {
-            signalROPumpHardStop();
             result = requestGenWaterStop();
         }
+
         else
         {
             // Set flow rate and delivery.
@@ -237,6 +263,11 @@
         }
     }
 
+    else if ( FP_MODE_DEGW == roMode )
+    {
+        result = requestGenWaterDefStop();
+    }
+
     return result;
 }