Index: sources/drydemo/StateControllerTreatment.cpp
===================================================================
diff -u -rbf271a558491a83b39eb30748784f1b744736dd2 -r4d0fc455e6307639e72db490721c7768a487c014
--- sources/drydemo/StateControllerTreatment.cpp	(.../StateControllerTreatment.cpp)	(revision bf271a558491a83b39eb30748784f1b744736dd2)
+++ sources/drydemo/StateControllerTreatment.cpp	(.../StateControllerTreatment.cpp)	(revision 4d0fc455e6307639e72db490721c7768a487c014)
@@ -106,7 +106,7 @@
 
     _treatmentStatus.ufVolDeliveredL = UFVolLMS * _treatmentStatus.treatmentElapsedTimeMS;
 
-    qDebug() << "UF Init" << presUFRateLHR << UFVolLMS << _treatmentStatus.ufVolDeliveredL;
+    //qDebug() << "UF Init" << presUFRateLHR << UFVolLMS << _treatmentStatus.ufVolDeliveredL;
 }
 
 void StateController::handleFluidBolusRequestMessage()
@@ -120,7 +120,7 @@
 
         if (fluidBolusCmd == FLUID_BOLUS_START_CMD){
             _treatmentSubStates.fluidBolusState  = FLUID_BOLUS_SALINE_IN_PROGRESS_STATE;
-            _treatmentSubStates.dialysisSubState = DIALYSIS_UF_FLUID_BOLUS_STATE;
+            _treatmentSubStates.dialysisSubState = DIALYSIS_UF_PAUSED_STATE; //DIALYSIS_UF_FLUID_BOLUS_STATE;
         }
         else { _treatmentStatus.totalFluidBolusDeliveredML += _treatmentStatus.accumFluidBolusDeliveredML; }
 
@@ -200,6 +200,7 @@
     resp.append(0);
 
     GetValue(payload.toByteArray(), index, u32Var);
+    if (_treatmentParams.treatmentModality != u32Var.value) { triggerAnAlarm(ALARM_ID_TD_TREATMENT_MODALITY_CHANGE); }
     _treatmentParams.treatmentModality    = u32Var.value;
     resp.append(0);