Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -rd1abd0eba39f6eb00e7d1022628605cd45a63b32 -r70fb1119ed5b0d4f7825cfd648c0457c0ce4517f
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision d1abd0eba39f6eb00e7d1022628605cd45a63b32)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 70fb1119ed5b0d4f7825cfd648c0457c0ce4517f)
@@ -146,13 +146,13 @@
 {
     BOOL paramsValid                       = getValidTreatParamsReceived();
     BOOL paramsConfirmed                   = getTreatParamsConfirmed();
-    TD_PRE_TREATMENT_MODE_STATE_T state    = TD_PRE_TREATMENT_CONFIRM_RX_STATE;
-    DD_OP_MODE_T ddOpMode                  = getDDOpMode();
-    DD_PRE_GEN_DIALYSATE_STATE_T ddSubMode = (DD_PRE_GEN_DIALYSATE_STATE_T)getDDSubMode();
     BOOL isDialysateGoodToDeliver          = getDialysateGoodToDeliverStatus();
     F32 bicarbConvFactor                   = BICARBONATE_CONVERSION_FACTOR;
     F32 presUFVolumeL                      = 0.0F;
     F32 presUFRateLHr                      = 0.0F;
+    TD_PRE_TREATMENT_MODE_STATE_T state    = TD_PRE_TREATMENT_CONFIRM_RX_STATE;
+    DD_OP_MODE_T ddOpMode                  = getDDOpMode();
+    DD_PRE_GEN_DIALYSATE_STATE_T ddSubMode = (DD_PRE_GEN_DIALYSATE_STATE_T)getDDSubMode();
 
     // Valid + confirmed – move to next state: Patient Connection
     if ( ( TRUE == paramsValid ) && ( TRUE == paramsConfirmed ) )