Index: firmware/App/Modes/Dialysis.c
===================================================================
diff -u -r5e2d30dcbd02f5eb737aee7ec45c63d868daf252 -rf6b78d1fe6741043de38707211710ab0e8a08483
--- firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision 5e2d30dcbd02f5eb737aee7ec45c63d868daf252)
+++ firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision f6b78d1fe6741043de38707211710ab0e8a08483)
@@ -1,14 +1,14 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2022 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2020-2022 Diality Inc. - All Rights Reserved.
 *
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
 *
 * @file    Dialysis.c
 *
-* @author  (last)      Dara Navaei
-* @date    (last)      04-Jan-2022
+* @author  (last)      Hung Nguyen
+* @date    (last)      15-Feb-2022
 *
 * @author  (original)  Sean
 * @date    (original)  15-Jan-2020
@@ -254,22 +254,13 @@
     // Do not run syringe pump if no Heparin included in prescription or it was paused or if Heparin should be stopped at this stage of treatment
     if ( ( minRem > (F32)preStop ) && ( HEPARIN_STATE_STOPPED == currentHeparinState ) )
     {
-        // If not done with bolus, start/resume bolus
-        if ( ( bolusVol > 0.0 ) && ( getSyringePumpVolumeDelivered() < bolusVol ) )
+        if ( hepRate > 0.0 )
         {
-            startHeparinBolus();  // TODO - check return status or have function trigger alarm if not successful
+            startHeparinContinuous();  // TODO - check return status
         }
-        // Otherwise, start/resume continuous delivery
         else
         {
-            if ( hepRate > 0.0 )
-            {
-                startHeparinContinuous();  // TODO - check return status
-            }
-            else
-            {
-                setHeparinCompleted();
-            }
+           setHeparinCompleted();
         }
     }
     else