Index: firmware/App/Modes/ModeTreatment.c
===================================================================
diff -u -r6f876554db45a19590eaf2122ef47e33f7a7d69b -r1abc0349c736a70fb56db6895947abfbba0eee22
--- firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision 6f876554db45a19590eaf2122ef47e33f7a7d69b)
+++ firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision 1abc0349c736a70fb56db6895947abfbba0eee22)
@@ -8,7 +8,7 @@
 * @file    ModeTreatment.c
 *
 * @author  (last)      Raghu Kallala
-* @date    (last)      17-Apr-2026
+* @date    (last)      04-May-2026
 *
 * @author  (original)  Sean Nash
 * @date    (original)  21-Apr-2025
@@ -71,8 +71,8 @@
 static BOOL treatmentCompleted;                                 ///< Flag indicates whether the treatment has completed.
 
 static U32  presTreatmentTimeSecs;                              ///< Prescribed treatment time (in seconds).
-static F32  presUFVolumeL;                                      ///< Prescribed ultrafiltration volume (in L).
-static F32  presUFRateLHr;                                      ///< Prescribed ultrafiltration rate (in L/hr).
+static F32  presUFVolumeMl;                                      ///< Prescribed ultrafiltration volume (in L).
+static F32  presUFRateMlMin;                                    ///< Prescribed ultrafiltration rate (in mL/Min).
 
 static U32  treatmentTimeMS;                                    ///< Elapsed treatment time (in ms).
 static U32  lastTreatmentTimeStamp;                             ///< Last time elapsed treatment time was recorded (a timestamp in ms).
@@ -109,7 +109,6 @@
 static TREATMENT_STATE_T handleTreatmentDialysisState( void );
 static TREATMENT_STATE_T handleTreatmentIsoUFState( void );
 static TREATMENT_STATE_T handleTreatmentDialysatePausedState( void );
-static TREATMENT_STATE_T handleTreatmentSalineBolusState( void );
 static TREATMENT_STATE_T handleTreatmentPausedState( void );
 static TREATMENT_STATE_T handleTreatmentRinsebackState( void );
 static TREATMENT_STATE_T handleTreatmentRecircState( void );
@@ -154,8 +153,8 @@
     ultrafiltrationBroadcastTimerCtr = ULTRAFILTRATION_DATA_PUB_INTERVAL;             // So we send ultrafiltration immediately when we begin treatment mode
 
     presTreatmentTimeSecs = 0;
-    presUFVolumeL = 0.0F;
-    presUFRateLHr = 0.0F;
+    presUFVolumeMl = 0.0F;
+    presUFRateMlMin = 0.0F;
 
     resetSignalFlags();
     resetAlarmSignalFlags();
@@ -204,13 +203,13 @@
 
     // Set treatment parameters
     presTreatmentTimeSecs = getTreatmentParameterU32( TREATMENT_PARAM_TREATMENT_DURATION ) * SEC_PER_MIN;
-    presUFVolumeL = getTreatmentParameterF32( TREATMENT_PARAM_UF_VOLUME );
-    presUFRateLHr = presUFVolumeL / ( (F32)getTreatmentParameterU32( TREATMENT_PARAM_TREATMENT_DURATION ) / (F32)MIN_PER_HOUR );
-    setDialysisDDParams( getTreatmentParameterU32( TREATMENT_PARAM_DIALYSATE_FLOW ), presUFVolumeL, presUFRateLHr );
+    presUFVolumeMl = getTreatmentParameterF32( TREATMENT_PARAM_UF_VOLUME ) * (F32)ML_PER_LITER;
+    presUFRateMlMin = presUFVolumeMl / (F32)getTreatmentParameterU32( TREATMENT_PARAM_TREATMENT_DURATION );
+    setDialysisDDParams( getTreatmentParameterU32( TREATMENT_PARAM_DIALYSATE_FLOW ), presUFVolumeMl, presUFRateMlMin );
     bicarbConvFactor = BICARBONATE_CONVERSION_FACTOR;
 
     // Direct DD to generate dialysate and bypass while priming blood
-    cmdStartGenerateDialysate( (F32)getTreatmentParameterU32( TREATMENT_PARAM_DIALYSATE_FLOW ), presUFRateLHr,
+    cmdStartGenerateDialysate( (F32)getTreatmentParameterU32( TREATMENT_PARAM_DIALYSATE_FLOW ), presUFRateMlMin,
                                getTreatmentParameterF32( TREATMENT_PARAM_DIALYSATE_TEMPERATURE ), TRUE,
                                getTreatmentParameterF32( TREATMENT_PARAM_ACID_CONCENTRATE_CONV_FACTOR ),
                                bicarbConvFactor,
@@ -437,7 +436,6 @@
     if ( ( TRUE == doesAlarmStatusIndicateStop() ) && ( TRUE == isFluidBolusActive() ) )
     {
         signalAbortFluidBolus();
-        execFluidBolus();
     }
 
     // Check if resume treatment blocked by alarm
@@ -471,10 +469,6 @@
 //            currentTreatmentState = handleTreatmentIsoUFState();
 //            break;
 //
-//        case TREATMENT_SALINE_BOLUS_STATE:
-//            currentTreatmentState = handleTreatmentSalineBolusState();
-//            break;
-//
 //        case TREATMENT_DIALYSATE_PAUSED_STATE:
 //            currentTreatmentState = handleTreatmentDialysatePausedState();
 //            break;
@@ -511,12 +505,13 @@
     broadcastTreatmentPeriodicData();
     // Publish ultrafiltration data at set interval (whether we are performing UF or not)
     publishUltrafiltrationData();
-    // Publish fluid bolus data at set interval (whether we are delivering one or not)
-    publishFluidBolusData();
 
     // Manage air trap control
     execAirTrapMonitorTreatment();
 
+    // Call fluid bolus
+    execFluidBolus();
+
     return currentTreatmentState;
 }
 
@@ -631,10 +626,15 @@
     U32 msSinceLast = calcTimeBetween( lastTreatmentTimeStamp, newTime );
     DIALYSIS_STATE_T dialysisState = getDialysisState();
 
-    // Update treatment time
-    treatmentTimeMS += msSinceLast;
+    // Always update timestamp to avoid time jump on bolus exit
     lastTreatmentTimeStamp = newTime;
 
+    // Only update treatment time when fluid bolus is not active
+    if ( FALSE == isFluidBolusActive() )
+    {
+        treatmentTimeMS += msSinceLast;
+    }
+
     // End treatment if treatment duration has been reached
     if ( CALC_ELAPSED_TREAT_TIME_IN_SECS() >= presTreatmentTimeSecs )
     {
@@ -953,7 +953,7 @@
         F32 minUFVol = 0.0F;  // TODO getUltrafiltrationReferenceVolume() + presUFRate;  // current UF volume + 1 min at current rate
         // Compute maximum UF volume (considering from adjustment of UF rate and time perspectives)
         F32 maxUFVol1 = minUFVol + ( (F32)( presTime - elapseTime ) * MAX_UF_RATE_ML_MIN );
-        F32 maxUFVol2 = ( presUFRateLHr > 0.0F ? minUFVol + ( (F32)( MAX_TREATMENT_TIME_MINUTES - elapseTime - 1 ) * presUFRateLHr ) : minUFVol );
+        F32 maxUFVol2 = ( presUFRateMlMin > 0.0F ? minUFVol + ( (F32)( MAX_TREATMENT_TIME_MINUTES - elapseTime - 1 ) * presUFRateMlMin ) : minUFVol );
         F32 maxUFVol = MAX( maxUFVol1, maxUFVol2 );
         // Set minimum dialysate flow rate
         U32 minDialRate = MIN_DIALYSATE_FLOW_RATE;
@@ -1108,7 +1108,7 @@
  * @brief
  * The publishUltrafiltrationData function publishes the ultrafiltration data
  * at the set time interval.
- * @details \b Inputs: presUFVolumeL, presUFRate
+ * @details \b Inputs: none
  * @details \b Outputs: none
  * @return none
  *************************************************************************/
@@ -1117,7 +1117,10 @@
     if ( ++ultrafiltrationBroadcastTimerCtr >= ULTRAFILTRATION_DATA_PUB_INTERVAL )
     {
         UF_DATA_PAYLOAD_T data;
+        F32 presUFRateLHr = 0.0F;
+        F32 presUFVolumeL = getTreatmentParameterF32( TREATMENT_PARAM_UF_VOLUME );
 
+        presUFRateLHr           = presUFVolumeL / ( (F32)getTreatmentParameterU32( TREATMENT_PARAM_TREATMENT_DURATION ) / (F32)MIN_PER_HOUR );
         data.setUFVolumeL       = presUFVolumeL;
         data.tgtUFRateLHr       = presUFRateLHr;
         data.ufVolumeDeliveredL = getUltrafiltrationVolumeDrawn();