Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -rc67def50892f9a7c2f1f22985b5351465a8f6773 -r1a685471524555a374854c0c9ec8e208e71fe2df
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision c67def50892f9a7c2f1f22985b5351465a8f6773)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 1a685471524555a374854c0c9ec8e208e71fe2df)
@@ -104,7 +104,7 @@
     DG_OP_MODE_T dgOpMode = getDGOpMode();  // TODO - the DG mode & sub-mode come as a pair at interval - they MUST be kept together.
     U32 dgSubMode = getDGSubMode();
 
-#ifdef UF_TEST_WITH_DG
+#ifndef RUN_WITHOUT_DG
     // state machine to get DG to prep a reservoir so we can start a treatment
     switch ( currentStandbyState )
     {
@@ -174,26 +174,28 @@
             break;
 
         case STANDBY_WAIT_FOR_TREATMENT_STATE:
-            if ( TRUE == treatStartReqReceived )
-            {
-                requestNewOperationMode( MODE_TPAR );
-                treatStartReqReceived = FALSE;
-            }
-#ifdef DISABLE_UI_TREATMENT_WORKFLOW
             // TODO - test code
+#ifdef DISABLE_UI_TREATMENT_WORKFLOW
             if ( TRUE == stop )
-#else
-            if ( TRUE == treatStartReqReceived )
 #endif
             {
-                treatStartReqReceived = FALSE;
                 if ( DG_MODE_CIRC == dgOpMode )
                 {
                     if ( DG_RECIRCULATE_MODE_STATE_RECIRC_WATER == dgSubMode )
                     {
+#ifndef DISABLE_UI_TREATMENT_WORKFLOW
+                        if ( TRUE == treatStartReqReceived )
+                        {
+                            setStartReservoirVolume();
+                            cmdSetDGActiveReservoir( DG_RESERVOIR_1 );
+                            requestNewOperationMode( MODE_TPAR );
+                            treatStartReqReceived = FALSE;
+                        }
+#else
                         setStartReservoirVolume();
                         cmdSetDGActiveReservoir( DG_RESERVOIR_1 );
                         requestNewOperationMode( MODE_TPAR );
+#endif
                     }
                 }
             }