Index: dialin/common/hd_defs.py
===================================================================
diff -u -r680ab4c35b3902a5397513ef93c97f8b7a6daca8 -r62df70b019fa433c8f345d2e1699e6c8f204af2c
--- dialin/common/hd_defs.py	(.../hd_defs.py)	(revision 680ab4c35b3902a5397513ef93c97f8b7a6daca8)
+++ dialin/common/hd_defs.py	(.../hd_defs.py)	(revision 62df70b019fa433c8f345d2e1699e6c8f204af2c)
@@ -17,24 +17,47 @@
 from ..utils.base import DialinEnum
 
 @unique
-class HDDefs(DialinEnum):
-    MODE_FAUL = 0     # Fault mode
-    MODE_SERV = 1     # Service mode
-    MODE_INIT = 2     # Initialization & POST mode
-    MODE_STAN = 3     # Standby mode
-    MODE_TPAR = 4     # Treatment Parameters mode
-    MODE_PRET = 5     # Pre-Treatment mode
-    MODE_TREA = 6     # Treatment mode
-    MODE_POST = 7     # Post-Treatment mode
-    MODE_NLEG = 8     # Not legal - an illegale mode transition occurred
-    NUM_OF_MODES = 9  # Number of HD operation modes
+class HDOpModes(DialinEnum):
+    MODE_FAUL = 0                                   # Fault mode
+    MODE_SERV = 1                                   # Service mode
+    MODE_INIT = 2                                   # Initialization & POST mode
+    MODE_STAN = 3                                   # Standby mode
+    MODE_TPAR = 4                                   # Treatment Parameters mode
+    MODE_PRET = 5                                   # Pre-Treatment mode
+    MODE_TREA = 6                                   # Treatment mode
+    MODE_POST = 7                                   # Post-Treatment mode
+    NUM_OF_MODES = 8                                # Number of HD operation modes
 
+# Heparin states
 @unique
 class HeparinStates(DialinEnum):
-    HEPARIN_STATE_OFF = 0               # Heparin treatment parameters set to zero or not yet set
-    HEPARIN_STATE_STOPPED = 1           # Heparin delivery is stopped because treatment paused or not yet started
-    HEPARIN_STATE_PAUSED = 2            # Heparin delivery is paused by user
-    HEPARIN_STATE_INITIAL_BOLUS = 3     # Heparin bolus is currently being delivered
-    HEPARIN_STATE_DISPENSING = 4        # Heparin continuous delivery is in progress
-    HEPARIN_STATE_COMPLETED = 5         # Heparin delivery is completed
-    HEPARIN_STATE_EMPTY = 6             # Heparin syringe is empty
+    HEPARIN_STATE_OFF = 0                           # Heparin treatment parameters set to zero or not yet set
+    HEPARIN_STATE_STOPPED = 1                       # Heparin delivery is stopped because treatment paused or not yet started
+    HEPARIN_STATE_PAUSED = 2                        # Heparin delivery is paused by user
+    HEPARIN_STATE_INITIAL_BOLUS = 3                 # Heparin bolus is currently being delivered
+    HEPARIN_STATE_DISPENSING = 4                    # Heparin continuous delivery is in progress
+    HEPARIN_STATE_COMPLETED = 5                     # Heparin delivery is completed
+    HEPARIN_STATE_EMPTY = 6                         # Heparin syringe is empty
+
+# Syringe pump states
+@unique
+class SyringePumpStates(DialinEnum):
+    SYRINGE_PUMP_INIT_STATE = 0                     # Syringe pump initialize state
+    SYRINGE_PUMP_OFF_STATE = 1                      # Syringe pump off state
+    SYRINGE_PUMP_RETRACT_STATE = 2                  # Syringe pump retract state
+    SYRINGE_PUMP_SEEK_STATE = 3                     # Syringe pump seek state
+    SYRINGE_PUMP_PRIME_STATE = 4                    # Syringe pump prime state
+    SYRINGE_PUMP_HEP_BOLUS_STATE = 5                # Syringe pump bolus state
+    SYRINGE_PUMP_HEP_CONTINUOUS_STATE = 6           # Syringe pump continuous state
+    SYRINGE_PUMP_CONFIG_FORCE_SENSOR_STATE = 7      # Syringe pump configure force sensor state
+
+# Syringe pump operations
+@unique
+class SyringePumpOperations(DialinEnum):
+    SYRINGE_PUMP_OP_STOP = 0                        # Stop syringe pump
+    SYRINGE_PUMP_OP_RETRACT = 1                     # Retract syringe pump
+    SYRINGE_PUMP_OP_SEEK = 2                        # Seek plunger
+    SYRINGE_PUMP_OP_PRIME = 3                       # Prime Heparin line
+    SYRINGE_PUMP_OP_BOLUS = 4                       # Deliver Heparin bolus of set volume over 5 minutes
+    SYRINGE_PUMP_OP_CONTINUOUS = 5                  # Continuous dispense of Heparin at set rate
+
Index: dialin/hd/alarms.py
===================================================================
diff -u -r1ab15a50a984c98b85eb63b7dd843fda51f4a412 -r62df70b019fa433c8f345d2e1699e6c8f204af2c
--- dialin/hd/alarms.py	(.../alarms.py)	(revision 1ab15a50a984c98b85eb63b7dd843fda51f4a412)
+++ dialin/hd/alarms.py	(.../alarms.py)	(revision 62df70b019fa433c8f345d2e1699e6c8f204af2c)
@@ -254,7 +254,6 @@
 
         alarm_id = struct.unpack('<H', bytearray(message['message'][self.START_POS_ALARM_ID:self.END_POS_ALARM_ID]))
         self.alarm_conditions[alarm_id[0]] = False
-        self.alarm_conditions[alarm_id[0]] = False
 
     def cmd_clear_all_alarms(self):
         """
Index: dialin/hd/hemodialysis_device.py
===================================================================
diff -u -r5b8814a19b1691f263de795014f30cda2e8d72eb -r62df70b019fa433c8f345d2e1699e6c8f204af2c
--- dialin/hd/hemodialysis_device.py	(.../hemodialysis_device.py)	(revision 5b8814a19b1691f263de795014f30cda2e8d72eb)
+++ dialin/hd/hemodialysis_device.py	(.../hemodialysis_device.py)	(revision 62df70b019fa433c8f345d2e1699e6c8f204af2c)
@@ -36,6 +36,7 @@
 from ..utils.base import _AbstractSubSystem, _publish, _LogManager
 from .constants import NO_RESET
 from ..common.msg_defs import MsgIds, MsgFieldPositions
+from ..common.hd_defs import HDOpModes
 
 
 class HD(_AbstractSubSystem):
@@ -47,16 +48,6 @@
     # HD login password
     HD_LOGIN_PASSWORD = '123'
 
-    # HD operation modes
-    HD_OP_MODE_FAULT = 0
-    HD_OP_MODE_SERVICE = 1
-    HD_OP_MODE_INIT_POST = 2
-    HD_OP_MODE_STANDBY = 3
-    HD_OP_MODE_TREATMENT_PARAMS = 4
-    HD_OP_MODE_PRE_TREATMENT = 6
-    HD_OP_MODE_TREATMENT = 7
-    HD_OP_MODE_POST_TREATMENT = 8
-
     def __init__(self, can_interface="can0", log_level=None):
         """
         HD object provides test/service commands for the HD sub-system.
@@ -90,7 +81,7 @@
                                                                        self._handler_hd_op_mode_sync)
 
         # create properties
-        self.hd_operation_mode = self.HD_OP_MODE_INIT_POST
+        self.hd_operation_mode = HDOpModes.MODE_INIT.value
         self.hd_operation_sub_mode = 0
 
         # Create command groups
Index: dialin/hd/syringe_pump.py
===================================================================
diff -u -r680ab4c35b3902a5397513ef93c97f8b7a6daca8 -r62df70b019fa433c8f345d2e1699e6c8f204af2c
--- dialin/hd/syringe_pump.py	(.../syringe_pump.py)	(revision 680ab4c35b3902a5397513ef93c97f8b7a6daca8)
+++ dialin/hd/syringe_pump.py	(.../syringe_pump.py)	(revision 62df70b019fa433c8f345d2e1699e6c8f204af2c)
@@ -20,7 +20,7 @@
 from ..protocols.CAN import (DenaliMessage,
                              DenaliChannels)
 from ..utils.base import _AbstractSubSystem, _publish
-from ..common.hd_defs import HeparinStates
+from ..common.hd_defs import HeparinStates, SyringePumpStates, SyringePumpOperations
 from logging import Logger
 
 class HDSyringePump(_AbstractSubSystem):
@@ -30,24 +30,6 @@
     Hemodialysis Delivery (HD) Dialin API sub-class for syringe pump related commands.
     """
 
-    # Syringe pump states
-    SYRINGE_PUMP_INIT_STATE = 0
-    SYRINGE_PUMP_OFF_STATE = 1
-    SYRINGE_PUMP_RETRACT_STATE = 2
-    SYRINGE_PUMP_SEEK_STATE = 3
-    SYRINGE_PUMP_PRIME_STATE = 4
-    SYRINGE_PUMP_HEP_BOLUS_STATE = 5
-    SYRINGE_PUMP_HEP_CONTINUOUS_STATE = 6
-    SYRINGE_PUMP_CONFIG_FORCE_SENSOR_STATE = 7
-
-    # Syringe pump operations
-    SYRINGE_PUMP_OP_STOP = 0
-    SYRINGE_PUMP_OP_RETRACT = 1
-    SYRINGE_PUMP_OP_SEEK = 2
-    SYRINGE_PUMP_OP_PRIME = 3
-    SYRINGE_PUMP_OP_BOLUS = 4
-    SYRINGE_PUMP_OP_CONTINUOUS = 5
-
     def __init__(self, can_interface, logger: Logger):
         """
 
@@ -63,12 +45,13 @@
             self.can_interface.register_receiving_publication_function(channel_id, msg_id,
                                                                        self._handler_syringe_pump_data)
 
-        self.syringe_pump_state = self.SYRINGE_PUMP_INIT_STATE
+        self.syringe_pump_state = SyringePumpStates.SYRINGE_PUMP_INIT_STATE.value
         self.heparin_state = HeparinStates.HEPARIN_STATE_OFF.value
         self.syringe_pump_set_rate_ml_hr = 0.0
         self.syringe_pump_meas_rate_ml_hr = 0.0
         self.syringe_pump_position = 0
         self.syringe_pump_volume_ml = 0.0
+        self.syringe_pump_safety_volume_ml = 0.0
         self.syringe_pump_home_v = 0.0
         self.syringe_pump_switch_v = 0.0
         self.syringe_pump_force_v = 0.0
@@ -163,7 +146,8 @@
     @_publish(["syringe_pump_state", "syringe_pump_set_rate_ml_hr",
                "syringe_pump_meas_rate_ml_hr","syringe_pump_position",
                "syringe_pump_volume_ml","syringe_pump_home_v",
-               "syringe_pump_switch_v","syringe_pump_force_v","heparin_state"])
+               "syringe_pump_switch_v","syringe_pump_force_v",
+               "heparin_state","syringe_pump_safety_volume_ml"])
     def _handler_syringe_pump_data(self, message):
         """
         Handles published syringe pump data messages.  Syringe pump data are captured
@@ -191,6 +175,8 @@
             message['message'][MsgFieldPositions.START_POS_FIELD_8:MsgFieldPositions.END_POS_FIELD_8]))
         frc = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_9:MsgFieldPositions.END_POS_FIELD_9]))
+        saf = struct.unpack('f', bytearray(
+            message['message'][MsgFieldPositions.START_POS_FIELD_10:MsgFieldPositions.END_POS_FIELD_10]))
 
         self.syringe_pump_state = sta[0]
         self.heparin_state = hep[0]
@@ -201,8 +187,9 @@
         self.syringe_pump_home_v = hom[0]
         self.syringe_pump_switch_v = det[0]
         self.syringe_pump_force_v = frc[0]
+        self.syringe_pump_safety_volume_ml = saf[0]
 
-    def cmd_syringe_pump_operation(self, operation=SYRINGE_PUMP_OP_STOP, rate=0.0, volume=0.0):
+    def cmd_syringe_pump_operation(self, operation=SyringePumpOperations.SYRINGE_PUMP_OP_STOP.value, rate=0.0, volume=0.0):
         """
         Constructs and sends the syringe pump operation command
         Constraints:
Index: dialin/hd/treatment.py
===================================================================
diff -u -rcff98df963746b055cac8e59ceb899da1903027c -r62df70b019fa433c8f345d2e1699e6c8f204af2c
--- dialin/hd/treatment.py	(.../treatment.py)	(revision cff98df963746b055cac8e59ceb899da1903027c)
+++ dialin/hd/treatment.py	(.../treatment.py)	(revision 62df70b019fa433c8f345d2e1699e6c8f204af2c)
@@ -66,8 +66,6 @@
     UF_START_STATE = 0                                  # Start state of the ultrafiltration state machine
     UF_PAUSED_STATE = 1                                 # Paused state of the ultrafiltration state machine
     UF_RUNNING_STATE = 2                                # Running state of the ultrafiltration state machine
-    UF_OFF_STATE = 3                                    # Completed/off state of the ultrafiltration state machine
-    UF_COMPLETED_STATE = 4                              # Completed state of ultrafiltration state machine
 
     # Saline bolus states
     SALINE_BOLUS_STATE_IDLE = 0                         # No saline bolus delivery is in progress
@@ -261,7 +259,7 @@
     @_publish([
         "treatment_state",
         "treatment_uf_state",
-        "saline_bolus_in_progress",
+        "saline_bolus_state",
         "heparin_state",
         "rinseback_state",
         "treatment_recirculate_state",
Index: tests/test_syringe.py
===================================================================
diff -u -r680ab4c35b3902a5397513ef93c97f8b7a6daca8 -r62df70b019fa433c8f345d2e1699e6c8f204af2c
--- tests/test_syringe.py	(.../test_syringe.py)	(revision 680ab4c35b3902a5397513ef93c97f8b7a6daca8)
+++ tests/test_syringe.py	(.../test_syringe.py)	(revision 62df70b019fa433c8f345d2e1699e6c8f204af2c)
@@ -42,7 +42,7 @@
     # create log file
     with open("syringe_test.log", "w") as f:
         # write column header labels to log file
-        header = "PumpState, Hep.State, SetRate, MeasRate, Position, Volume, HomeV, SwitchV, ForceV\n"
+        header = "PumpState, Hep.State, SetRate, MeasRate, Position, Volume, HomeV, SwitchV, ForceV, SafetyVol\n"
         f.write(header)
 
         # write syringe pump related data from HD to log file
@@ -56,7 +56,8 @@
                 ", " + '{:12.9f}'.format(hd.syringe_pump.syringe_pump_volume_ml) + \
                 ", " + '{:5.3f}'.format(hd.syringe_pump.syringe_pump_home_v) + \
                 ", " + '{:5.3f}'.format(hd.syringe_pump.syringe_pump_switch_v) + \
-                ", " + '{:5.3f}'.format(hd.syringe_pump.syringe_pump_force_v) + "\n"
+                ", " + '{:5.3f}'.format(hd.syringe_pump.syringe_pump_force_v) + \
+                          ", " + '{:12.9}'.format(hd.syringe_pump.syringe_pump_safety_volume_ml) + "\n"
 
             # log data
             f.write(syringeData)