Index: firmware/App/Modes/ModePreGenDialysate.c
===================================================================
diff -u -r1a258edd45a2bca2fbbff23a5480493f0ab3f10e -r604c63782c972bef41038d2d0eaaa282595d3599
--- firmware/App/Modes/ModePreGenDialysate.c	(.../ModePreGenDialysate.c)	(revision 1a258edd45a2bca2fbbff23a5480493f0ab3f10e)
+++ firmware/App/Modes/ModePreGenDialysate.c	(.../ModePreGenDialysate.c)	(revision 604c63782c972bef41038d2d0eaaa282595d3599)
@@ -300,15 +300,20 @@
     DD_PRE_GEN_DIALYSATE_STATE_T state  = DD_PRE_GEN_WAIT_FOR_FP_GEN;
     FP_OP_MODE_T fpMode = getCurrentFPOperationMode();
 
-    if ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_RUN_SOLO ) )
+    // Start FP Pre-Generate Permeate
+    if ( ( FP_MODE_STAN == fpMode ))
     {
+        signalStartGenPermeate();
+    }
+
+    else if ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_RUN_SOLO ) )
+    {
         state = DD_PRE_GEN_DIALYSATE_HYD_CHAMBER_FILL_CHECK;
     }
 
     else if ( ( FP_MODE_DEGP  == fpMode ) || ( FP_MODE_GENP  == fpMode ) )
     {
         state = DD_PRE_GEN_DIALYSATE_HYD_CHAMBER_FILL_CHECK;
-
     }
 
     //TODO: Should DD keep a timer and Alarm if FP never transitions?
@@ -368,12 +373,12 @@
 
         if ( d18Diff > PRE_GEN_HYDRO_RECIRC_PRESSURE_TOLERANCE )
         {
-            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_PRE_GEN_D18_PRESSURE, d18Pres, d18Diff )
+            SET_ALARM_WITH_2_F32_DATA( ALARM_ID_DD_PRE_GEN_D18_PRESSURE, d18Pres, d18Diff )
         }
 
         if ( d9Diff > PRE_GEN_HYDRO_RECIRC_PRESSURE_TOLERANCE )
         {
-            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_PRE_GEN_D9_PRESSURE, d9Pres, d9Diff )
+            SET_ALARM_WITH_2_F32_DATA( ALARM_ID_DD_PRE_GEN_D9_PRESSURE, d9Pres, d9Diff )
         }
 
         if ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_DISABLE_DRY_BICARB ) )
Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -rff0edadf0c6f161a0a092ddaf94d1940d64f7d5e -r604c63782c972bef41038d2d0eaaa282595d3599
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision ff0edadf0c6f161a0a092ddaf94d1940d64f7d5e)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 604c63782c972bef41038d2d0eaaa282595d3599)
@@ -168,17 +168,8 @@
 //    }
     if ( TRUE == pendingStartDDPreGenRequest )
     {
-       // wait for IOFP GENP mode and when IOFP manual control is not set
-       if ( ( ( FP_MODE_GENP == fpMode ) ||  ( FP_MODE_DEGP == fpMode ) ) && ( getTestConfigStatus( TEST_CONFIG_DD_RUN_SOLO ) == FALSE ) )
-       {
            pendingStartDDPreGenRequest = FALSE;
            requestNewOperationMode( DD_MODE_PREG );
-       }
-       else if ( getTestConfigStatus( TEST_CONFIG_DD_RUN_SOLO ) == TRUE )
-       {
-           pendingStartDDPreGenRequest = FALSE;
-           requestNewOperationMode( DD_MODE_PREG );
-       }
     }
 //    else if ( TRUE == pendingStartDDFlushRequest )
 //    {
Index: firmware/App/Services/TDInterface.c
===================================================================
diff -u -rbd522c8ffdf75130571e5b6a79d1b1d6acd78b1c -r604c63782c972bef41038d2d0eaaa282595d3599
--- firmware/App/Services/TDInterface.c	(.../TDInterface.c)	(revision bd522c8ffdf75130571e5b6a79d1b1d6acd78b1c)
+++ firmware/App/Services/TDInterface.c	(.../TDInterface.c)	(revision 604c63782c972bef41038d2d0eaaa282595d3599)
@@ -483,22 +483,9 @@
         // Process the pre-gen dialysate delivery request message
         if ( ( DD_MODE_STAN == ddMode ) && ( TRUE == startPreGenRequest.start ) )
         {
-            // Start FP Pre-Generate Permeate
-            if ( ( FP_MODE_STAN == fpMode ) && ( getTestConfigStatus( TEST_CONFIG_DD_RUN_SOLO ) == FALSE ) )
-            {
-                fpReason = signalStartGenPermeate();
-            }
-            else
-            {
-                fpReason = REQUEST_REJECT_REASON_NOT_ALLOWED_IN_CURRENT_MODE;
-            }
             // start pre-gen dialysate
             result = requestDDPreGenStart();
 
-            if ( REQUEST_REJECT_REASON_NONE != fpReason )
-            {
-                result = FALSE;
-            }
             // Update Temperature, Acid/Bicarb type and dialysate rate for pregen process.
             setTDDialysateFlowrate( startPreGenRequest.dialRate );
             setTDTargetDialysateTemperature( startPreGenRequest.dialTemp );