Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -r50f4b79164155c1bc375dd3ff0e8588f934dc729 -rf90801d4a4f5cd1276b4a54175d101710b4096f2
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 50f4b79164155c1bc375dd3ff0e8588f934dc729)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision f90801d4a4f5cd1276b4a54175d101710b4096f2)
@@ -16,15 +16,17 @@
 ***************************************************************************/
 
 #include "AirTrap.h"
+#include "BloodFlow.h"
 #include "Buttons.h"
 #include "DDInterface.h"
 #include "Messaging.h"
+#include "ModePreTreat.h"
 #include "ModeTreatment.h"
-#include "ModeTxParams.h"
 #include "ModeStandby.h"
 #include "OperationModes.h"
 #include "Switches.h"
 #include "SystemCommTD.h"
+#include "TxParams.h"
 
 /**
  *  @addtogroup TDStandbyMode
@@ -247,8 +249,7 @@
 //        PRESSURE_LIMIT_CHANGE_RESPONSE_T respRecord = { TRUE, REQUEST_REJECT_REASON_NONE, 0, 0, 0 };
 
         // Initialize treatment modes before starting a new treatment
-        initTreatParamsMode();
-//        initPreTreatmentMode();
+        initPreTreatmentMode();
         initTreatmentMode();
 //        initPostTreatmentMode();
         resetAirTrap();
@@ -258,7 +259,7 @@
 //        respRecord.venPresLimitAsymmetricmmHg = getTreatmentParameterS32DefaultValue( TREATMENT_PARAM_VEN_PRES_LIMIT_ASYMMETRIC );
 //        sendPressureLimitsChangeResponse( &respRecord );
         // Start treatment workflow with treatment parameters mode
-        requestNewOperationMode( MODE_TPAR );
+        requestNewOperationMode( MODE_PRET );
         treatStartReqReceived = FALSE;
     }
 
@@ -295,6 +296,7 @@
             {
                 rejReason = REQUEST_REJECT_REASON_NOT_ALLOWED_IN_CURRENT_MODE;
             }
+#ifndef TEST_UI_ONLY
             // Verify DD is communicating with HD
             else if ( isDDCommunicating() != TRUE )
             {
@@ -305,6 +307,7 @@
             {
                 rejReason = REQUEST_REJECT_REASON_DD_NOT_IN_STANDBY_IDLE_STATE;
             }
+#endif
             else
             {
                 // If request to start treatment not rejected, set flag to initiate treatment workflow
@@ -314,7 +317,7 @@
         }
         else if ( USER_COMMAND_CANCEL == cmd )
         {
-            result = signalUserCancelTreatment();
+            //result = signalUserCancelTreatment();
             if ( result != TRUE )
             {
                 rejReason = REQUEST_REJECT_REASON_NOT_ALLOWED_IN_CURRENT_MODE;