Index: sources/view/hd/data/VHDTreatmentStatesData.cpp
===================================================================
diff -u -r2d2917978a4e25eb79a0fb71851b6124171d8072 -rbd01334f257c35b96b7b232beacbcd7fae60c852
--- sources/view/hd/data/VHDTreatmentStatesData.cpp	(.../VHDTreatmentStatesData.cpp)	(revision 2d2917978a4e25eb79a0fb71851b6124171d8072)
+++ sources/view/hd/data/VHDTreatmentStatesData.cpp	(.../VHDTreatmentStatesData.cpp)	(revision bd01334f257c35b96b7b232beacbcd7fae60c852)
@@ -55,8 +55,6 @@
     ufStart                 ( vData.mUFState            == GuiUFStates         ::UF_START_STATE                             );
     ufPaused                ( vData.mUFState            == GuiUFStates         ::UF_PAUSED_STATE                            );
     ufRunning               ( vData.mUFState            == GuiUFStates         ::UF_RUNNING_STATE                           );
-    ufOff                   ( vData.mUFState            == GuiUFStates         ::UF_OFF_STATE                               );
-    ufCompleted             ( vData.mUFState            == GuiUFStates         ::UF_COMPLETED_STATE                         );
 
     // Saline Bolus states
     sbIdle                  ( vData.mSalineState        == GuiSalineStates     ::SALINE_BOLUS_STATE_IDLE                    );
@@ -66,6 +64,7 @@
 
     // Heparin States
     hpOff                   ( vData.mHeparinState       == GuiHeparinStates    ::HEPARIN_STATE_OFF                          );
+    hpStopped               ( vData.mHeparinState       == GuiHeparinStates    ::HEPARIN_STATE_STOPPED                      );
     hpPaused                ( vData.mHeparinState       == GuiHeparinStates    ::HEPARIN_STATE_PAUSED                       );
     hpInitial_bolus         ( vData.mHeparinState       == GuiHeparinStates    ::HEPARIN_STATE_INITIAL_BOLUS                );
     hpDispensing            ( vData.mHeparinState       == GuiHeparinStates    ::HEPARIN_STATE_DISPENSING                   );
@@ -145,8 +144,6 @@
     ufStart                 ( vData.mState          == GuiUFStates         ::UF_START_STATE                            );
     ufPaused                ( vData.mState          == GuiUFStates         ::UF_PAUSED_STATE                           );
     ufRunning               ( vData.mState          == GuiUFStates         ::UF_RUNNING_STATE                          );
-    ufOff                   ( vData.mState          == GuiUFStates         ::UF_OFF_STATE                              );
-    ufCompleted             ( vData.mState          == GuiUFStates         ::UF_COMPLETED_STATE                        );
 }
 
 /*!