Index: sources/drydemo/StateController.cpp
===================================================================
diff -u -rc52253ab5fc73e9b59d9cd99eada3d526d799987 -r38521851fd3271aa9a8965067d15daaba0db4b2e
--- sources/drydemo/StateController.cpp	(.../StateController.cpp)	(revision c52253ab5fc73e9b59d9cd99eada3d526d799987)
+++ sources/drydemo/StateController.cpp	(.../StateController.cpp)	(revision 38521851fd3271aa9a8965067d15daaba0db4b2e)
@@ -277,6 +277,7 @@
         currBloodFlowMLPM                   = BLOOD_PRIME_START_FLOW_MLPM;
         resume                              = true;
         hasFlowChngeRequested               = false;
+        _treatmentStatus.isBloodPumpRunning = true;
         _treatmentSubStates.bloodPrimeState = BLOOD_PRIME_RAMP_STATE;
         _treatmentSubStates.txState         = TREAT_BLOOD_PRIME_STATE;
         handleTreatmentStatesBroadcastData(BC_IMMEDIATELY);
@@ -291,7 +292,8 @@
         handleBackToStandbyEvent(status);
         handleBloodPrimePauseResume(resume);
         handleSetPointBloodFlowChange(currBloodFlowMLPM, hasFlowChngeRequested);
-        handleTDPressureProcessAndBroadcastData(BC_DELAYED);
+        handleTDPressureBroadcastData(BC_DELAYED);
+        handlePressureLimitState();
         handleFluidBolusRequestMessage();
         if (_treatmentSubStates.fluidBolusState == FLUID_BOLUS_SALINE_IN_PROGRESS_STATE){
             handleFluidBolusFluidDelivery(currBloodFlowMLPM);
@@ -335,6 +337,7 @@
     auto onEntry = [=](){
         hasFlowChngeRequested                = false;
         _treatmentSubStates.txState          = TREAT_START_STATE;
+        _treatmentStatus.isBloodPumpRunning  = true;
         handleTreatmentStatesBroadcastData(BC_IMMEDIATELY);
         // Start with UF state in dialysis
         _treatmentSubStates.dialysisSubState = DIALYSIS_UF_STATE;
@@ -373,7 +376,9 @@
         handleDDConductivityBroadcastData(BC_DELAYED);
         handleSetPointDialysateFlowChange();
         handleSetPointDialysateTemperatureChange();
-        handleTDPressureProcessAndBroadcastData(BC_DELAYED);
+        handlePressureLimitState();
+        handleTDPressureBroadcastData(BC_DELAYED);
+        handleDeterminePressureLimits();
         // UF functions funcntios
         handleUltrafiltrationPauseResume();
         handleUltrafiltrationVolumeChangeValidation();
@@ -434,6 +439,7 @@
         handleBackToStandbyEvent(status);
         handleAlarmUserAction(status, true);
         handleTDOpModeTransitionBroadcastData(MODE_TREA, 0, BC_DELAYED);
+        handlePressureLimitState();
         handleTreatmentStatesBroadcastData(BC_DELAYED);
     };
 
@@ -474,7 +480,8 @@
         handleRinsebackRequestMessage();
         handleRinsebackDelivery();
         handleRinsebackBroadcastData(BC_DELAYED);
-        handleTDPressureProcessAndBroadcastData(BC_DELAYED);
+        handlePressureLimitState();
+        handleTDPressureBroadcastData(BC_DELAYED);
         handleUIConfirmMessage(GENERIC_CONFIRM_ID_TREATMENT_END, status);
         if (_treatmentStatus.hasRecircBeenRequested) {
             _treatmentStatus.stateTransitionEvent = "T_RB_2_RC";