Index: firmware/App/Modes/ModeTreatment.c
===================================================================
diff -u -ra4d76e86bb3d374373b531c5b794e1270c004167 -rb13018664f3d4fe4786a0c4200304f84a6e742ca
--- firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision a4d76e86bb3d374373b531c5b794e1270c004167)
+++ firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision b13018664f3d4fe4786a0c4200304f84a6e742ca)
@@ -7,8 +7,8 @@
 *
 * @file    ModeTreatment.c
 *
-* @author  (last)      Sean Nash
-* @date    (last)      06-May-2024
+* @author  (last)      Vinayakam Mani
+* @date    (last)      10-May-2024
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  05-Nov-2019
@@ -28,6 +28,7 @@
 #include "NVDataMgmt.h"
 #include "OperationModes.h"
 #include "PersistentAlarm.h"
+#include "PresOccl.h"
 #include "Reservoirs.h"
 #include "Rinseback.h"
 #include "RTC.h"
@@ -761,6 +762,8 @@
                 sendTreatmentLogEventData( UF_START_RESUME_EVENT, 0.0, presUFRate );
             }
             transitionToDialysis();
+            // To update partial blood pump occlusion baseline - start of treatment
+            signalBloodPumpPressureOcclBaseline();
             result = TREATMENT_DIALYSIS_STATE;
         }
     }
@@ -1315,6 +1318,8 @@
                 // Set to new rate
                 result &= setTreatmentParameterU32( TREATMENT_PARAM_BLOOD_FLOW, bloodRate );
                 setDialysisBloodPumpFlowRate( getTreatmentParameterU32( TREATMENT_PARAM_BLOOD_FLOW ) );
+                // Update partial occlusion baseline when blood flow rate changes
+                signalBloodPumpPressureOcclBaseline();
             }
 
             // Handle dialysate flow rate changes
@@ -1325,6 +1330,8 @@
                 // Set to new rate
                 result &= setTreatmentParameterU32( TREATMENT_PARAM_DIALYSATE_FLOW, dialRate );
                 setDialysisDialInFlowAndUFRate( getTreatmentParameterU32( TREATMENT_PARAM_DIALYSATE_FLOW ), presMaxUFVolumeML, presUFRate );
+                // Update partial occlusion baseline when dialysate flow rate changes
+                signalBloodPumpPressureOcclBaseline();
             }
         }
         else