Index: firmware/App/Modes/Dialysis.c
===================================================================
diff -u -rac6fc5b74e15c8925e4579c847ddfca8e1e361ad -r11fcffb18d94387a3301eb9ba3cc6bff6e9a5b56
--- firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision ac6fc5b74e15c8925e4579c847ddfca8e1e361ad)
+++ firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision 11fcffb18d94387a3301eb9ba3cc6bff6e9a5b56)
@@ -1234,29 +1234,34 @@
 {
     F32 loadCellPrimaryWeight, loadCellBackupWeight;
     F32 loadCellPreviousDrift, loadCellCurrentDrift;
-    F32 driftDiff = 0.0;
+    F32 driftDiff = 0.0F;
     U16 lcPrimaryIndex, lcBackupIndex;
+    HD_EVENT_ID_T event;
 
     if ( DG_RESERVOIR_1 == reservoirID )
     {
         lcPrimaryIndex = LOAD_CELL_RESERVOIR_1_PRIMARY;
-        lcBackupIndex = LOAD_CELL_RESERVOIR_1_BACKUP;
+        lcBackupIndex  = LOAD_CELL_RESERVOIR_1_BACKUP;
+        event          = ( RESERVOIR_STEADY_CYCLE_START == cycle ? HD_EVENT_RSRVR_1_LOAD_CELL_START_VALUES : HD_EVENT_RSRVR_1_LOAD_CELL_END_VALUES );
     }
     else
     {
         lcPrimaryIndex = LOAD_CELL_RESERVOIR_2_PRIMARY;
-        lcBackupIndex = LOAD_CELL_RESERVOIR_2_BACKUP;
+        lcBackupIndex  = LOAD_CELL_RESERVOIR_2_BACKUP;
+        event          = ( RESERVOIR_STEADY_CYCLE_START == cycle ? HD_EVENT_RSRVR_2_LOAD_CELL_START_VALUES : HD_EVENT_RSRVR_2_LOAD_CELL_END_VALUES );
     }
 
     loadCellPrimaryWeight = getReservoirWeightLargeFilter( reservoirID );
     loadCellBackupWeight  = getReservoirBackupWeightLargeFilter( reservoirID );
     loadCellCurrentDrift  = loadCellPrimaryWeight - loadCellBackupWeight;
 
+    SEND_EVENT_WITH_2_F32_DATA( event, loadCellPrimaryWeight, loadCellBackupWeight )
+
     if ( ( RESERVOIR_STEADY_CYCLE_FINAL == cycle ) && ( lcLastSteadyWeight[ RESERVOIR_STEADY_CYCLE_START ][ lcPrimaryIndex ] > ( LOAD_CELL_ILLEGAL_WEIGHT_VALUE + 1 ) ) )
     {
         // Start Weight has been previously saved, ok to test
         loadCellPreviousDrift = lcLastSteadyWeight[ RESERVOIR_STEADY_CYCLE_START ][ lcPrimaryIndex ] - lcLastSteadyWeight[ RESERVOIR_STEADY_CYCLE_START ][ lcBackupIndex ];
-        driftDiff = fabs ( loadCellCurrentDrift - loadCellPreviousDrift );
+        driftDiff             = fabs ( loadCellCurrentDrift - loadCellPreviousDrift );
     }
     // Save latest reading for next test time
     lcLastSteadyWeight[ cycle ][ lcPrimaryIndex ] = loadCellPrimaryWeight;
Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -r06eb4485aab0b6f160610358395d8a568f239ed1 -r11fcffb18d94387a3301eb9ba3cc6bff6e9a5b56
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 06eb4485aab0b6f160610358395d8a568f239ed1)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 11fcffb18d94387a3301eb9ba3cc6bff6e9a5b56)
@@ -1025,7 +1025,10 @@
     {
         if ( DG_CMD_REQUEST_REJECT_REASON_NONE == dgCmdResp.rejectCode )
         {
-            state = PRE_TREATMENT_RESERVOIR_MGMT_START_FILL_STATE;
+            if ( DG_MODE_DRAI == dgOpMode )
+            {
+                state = PRE_TREATMENT_RESERVOIR_MGMT_START_FILL_STATE;
+            }
         }
         else
         {