Index: firmware/App/Controllers/SyringePump.c
===================================================================
diff -u -r898f53e09092ab452b518c737c3c8381641d3d2d -r8e08352e9e7d8749d8f093c6bc57e6dbc32605d5
--- firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision 898f53e09092ab452b518c737c3c8381641d3d2d)
+++ firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision 8e08352e9e7d8749d8f093c6bc57e6dbc32605d5)
@@ -351,6 +351,7 @@
                     accepted = TRUE;
                     heparinDeliveryState = HEPARIN_STATE_PAUSED;
                     stopSyringePump();
+                    sendTreatmentLogEventData( HEPARIN_PAUSE_RESUME_EVENT, HEPARIN_STATE_DISPENSING, HEPARIN_STATE_PAUSED );
                 }
                 else
                 {
@@ -363,6 +364,7 @@
                 {
                     accepted = TRUE;
                     startHeparinContinuous();
+                    sendTreatmentLogEventData( HEPARIN_PAUSE_RESUME_EVENT, HEPARIN_STATE_PAUSED, HEPARIN_STATE_DISPENSING );
                 }
                 else
                 {
Index: firmware/App/Modes/Dialysis.c
===================================================================
diff -u -rbd0ae373570f7f224bb9a6a4e86f805be77de192 -r8e08352e9e7d8749d8f093c6bc57e6dbc32605d5
--- firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision bd0ae373570f7f224bb9a6a4e86f805be77de192)
+++ firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision 8e08352e9e7d8749d8f093c6bc57e6dbc32605d5)
@@ -963,9 +963,10 @@
         signalBloodPumpHardStop();
         signalDialInPumpHardStop();
         // Send last saline bolus data
-        bolusSalineVolumeDelivered = 0.0;
         salineBolusBroadcastTimerCtr = SALINE_BOLUS_DATA_PUB_INTERVAL;
         publishSalineBolusData();
+        sendTreatmentLogEventData( SALINE_BOLUSES_CHANGE_EVENT, bolusSalineVolumeDelivered, totalSalineVolumeDelivered );
+        bolusSalineVolumeDelivered = 0.0;
         // Dialysis back to UF state
         *dialysisState = DIALYSIS_UF_STATE;
         // End dialyzer bypass and resume dialysis if no alarms triggered
Index: firmware/App/Modes/ModeTreatment.c
===================================================================
diff -u -rbd0ae373570f7f224bb9a6a4e86f805be77de192 -r8e08352e9e7d8749d8f093c6bc57e6dbc32605d5
--- firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision bd0ae373570f7f224bb9a6a4e86f805be77de192)
+++ firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision 8e08352e9e7d8749d8f093c6bc57e6dbc32605d5)
@@ -803,6 +803,7 @@
              ( uFVolume <= MAX_UF_VOLUME_ML ) )
         {
             result = TRUE;
+            sendTreatmentLogEventData( TREATMENT_DURATION_CHANGE_EVENT, ( presTreatmentTimeSecs / SEC_PER_MIN ), treatmentTime );
             presMaxUFVolumeML = uFVolume;
             presTreatmentTimeSecs = treatmentTime * SEC_PER_MIN;
             setDialysisParams( presBloodFlowRate, presDialysateFlowRate, presMaxUFVolumeML, presUFRate );
@@ -1048,6 +1049,8 @@
              ( dialVolume <= MAX_DIALYSATE_VOLUME_ML ) )
         {
             result = TRUE;
+            sendTreatmentLogEventData( BLOOD_FLOW_RATE_CHANGE_EVENT, presBloodFlowRate, bloodRate );
+            sendTreatmentLogEventData( DIALYSATE_FLOW_RATE_CHANGE_EVENT, presDialysateFlowRate, dialRate );
             // Set to new rates
             presBloodFlowRate = bloodRate;
             presDialysateFlowRate = dialRate;
Index: firmware/App/Modes/Rinseback.c
===================================================================
diff -u -r44a100f8e5210a02c23b8fcc4527d8e96d577381 -r8e08352e9e7d8749d8f093c6bc57e6dbc32605d5
--- firmware/App/Modes/Rinseback.c	(.../Rinseback.c)	(revision 44a100f8e5210a02c23b8fcc4527d8e96d577381)
+++ firmware/App/Modes/Rinseback.c	(.../Rinseback.c)	(revision 8e08352e9e7d8749d8f093c6bc57e6dbc32605d5)
@@ -309,6 +309,7 @@
         // From moment we start rinseback, we consider blood side of dialyzer no longer fully primed
         setBloodIsPrimed( FALSE );
         result = RINSEBACK_RUN_STATE;
+        sendTreatmentLogEventData( MID_TREATMENT_RINSE_BACK_EVENT, RINSEBACK_STOP_INIT_STATE, RINSEBACK_RUN_STATE );
     }
     // Has user requested to return to treatment?
     else if ( TRUE == backToTreatmentRequested )