Index: firmware/App/Services/TxParams.c
===================================================================
diff -u -rc9e30d4b11056ff1fe0080d0278cbd457f17d58e -r3a0f0f1abc53e6e8ba17c77838bf223cceb79b74
--- firmware/App/Services/TxParams.c	(.../TxParams.c)	(revision c9e30d4b11056ff1fe0080d0278cbd457f17d58e)
+++ firmware/App/Services/TxParams.c	(.../TxParams.c)	(revision 3a0f0f1abc53e6e8ba17c77838bf223cceb79b74)
@@ -114,7 +114,12 @@
     { CRITICAL_DATA_TYPE_U32, {.uInt=0},    {.uInt=2},    {.uInt=0}    }, // TREATMENT_PARAM_HDF_DILUTION
     { CRITICAL_DATA_TYPE_U32, {.uInt=50},   {.uInt=500},  {.uInt=50}   }, // TREATMENT_PARAM_BLOOD_FLOW
     { CRITICAL_DATA_TYPE_U32, {.uInt=50},   {.uInt=600},  {.uInt=50}   }, // TREATMENT_PARAM_DIALYSATE_FLOW
+
+#if SIMULATION_TEST_RINSEBACK
+    { CRITICAL_DATA_TYPE_U32, {.uInt=5},   {.uInt=480},  {.uInt=60}   }, // TREATMENT_PARAM_TREATMENT_DURATION
+#else
     { CRITICAL_DATA_TYPE_U32, {.uInt=60},   {.uInt=480},  {.uInt=60}   }, // TREATMENT_PARAM_TREATMENT_DURATION
+#endif
     { CRITICAL_DATA_TYPE_U32, {.uInt=0},    {.uInt=480},  {.uInt=0}    }, // TREATMENT_PARAM_HEPARIN_DELIVERY_DURATION
     { CRITICAL_DATA_TYPE_U32, {.uInt=0},    {.uInt=0},    {.uInt=0}    }, // TREATMENT_PARAM_HEPARIN_TYPE
     { CRITICAL_DATA_TYPE_U32, {.uInt=0},    {.uInt=5},    {.uInt=0}    }, // TREATMENT_PARAM_DRY_BICARB_CART_SIZE
@@ -2215,7 +2220,14 @@
         if ( TRUE == isTreatmentParamInRange( TREATMENT_PARAM_BLOOD_FLOW, requestedValue ) )
         {
             setTreatmentParameterU32( TREATMENT_PARAM_BLOOD_FLOW, request.flowRate );
-            setDialysisBloodPumpFlowRate( request.flowRate );
+            if(TREATMENT_DIALYSIS_STATE == getTreatmentState()  )
+            {
+            	setDialysisBloodPumpFlowRate( request.flowRate );
+            }
+            else if( TREATMENT_END_STATE ==getTreatmentState() )
+            {
+            	setDialysisBloodPumpFlowRateEndTx( request.flowRate );
+            }
 
             response.accepted = TRUE;
             response.rejectionReason = REQUEST_REJECT_REASON_NONE;