Index: firmware/App/Modes/Dialysis.c
===================================================================
diff -u -r483ca73d0161e139b9cc8c0ba3813f8be5f04204 -r1223d5caafbd260f9a62e922cbf54165b1254ff9
--- firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision 483ca73d0161e139b9cc8c0ba3813f8be5f04204)
+++ firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision 1223d5caafbd260f9a62e922cbf54165b1254ff9)
@@ -7,8 +7,8 @@
 *
 * @file    Dialysis.c
 *
-* @author  (last)      Sean Nash
-* @date    (last)      11-Jul-2023
+* @author  (last)      Dara Navaei
+* @date    (last)      26-Jul-2023
 *
 * @author  (original)  Sean
 * @date    (original)  15-Jan-2020
@@ -860,10 +860,13 @@
     {
         salineBolusStartRequested = FALSE;
         // Cmd all pumps to stop
-        setBloodPumpTargetFlowRate( 0, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
-        setDialInPumpTargetFlowRate( 0, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
-        setDialOutPumpTargetRate( 0, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
-        stopSyringePump();
+        stopDialysis();
+/*
+ *       setBloodPumpTargetFlowRate( 0, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_CLOSED_LOOP );
+ *       setDialInPumpTargetFlowRate( 0, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_CLOSED_LOOP );
+ *       setDialOutPumpTargetRate( 0, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_CLOSED_LOOP );
+ *       stopSyringePump();
+ */
         // Begin saline bolus
         result = SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP;
     }
@@ -888,7 +891,6 @@
         // Reset bolus data before we start
         bolusSalineVolumeDelivered_mL = 0.0;
         bolusSalineLastVolumeTimeStamp = getMSTimerCount();
-
         // Bypass dialyzer
         setValvePosition( VDI, VALVE_POSITION_C_CLOSE );
         setValvePosition( VDO, VALVE_POSITION_C_CLOSE );
@@ -965,8 +967,6 @@
         // Hard stop blood and dialysate pumps
         signalBloodPumpHardStop();
         signalDialInPumpHardStop();
-        // Tell DG to stop heating dialysate
-        cmdStopDGTrimmerHeater();
         // Send last saline bolus data
         salineBolusBroadcastTimerCtr = SALINE_BOLUS_DATA_PUB_INTERVAL;
         publishSalineBolusData();