Index: sources/gui/qml/dialogs/diagnostics/DiagnosticsDD.qml
===================================================================
diff -u -rc253d3ca9ef234e04747565e500faf88b07fc04e -r036d378b4b89db03c812584c1d0f682494d81568
--- sources/gui/qml/dialogs/diagnostics/DiagnosticsDD.qml	(.../DiagnosticsDD.qml)	(revision c253d3ca9ef234e04747565e500faf88b07fc04e)
+++ sources/gui/qml/dialogs/diagnostics/DiagnosticsDD.qml	(.../DiagnosticsDD.qml)	(revision 036d378b4b89db03c812584c1d0f682494d81568)
@@ -17,6 +17,8 @@
 import QtQuick 2.12
 
 // Project
+import Gui.Actions      0.1
+
 //  Qml imports
 import "qrc:/globals"
 import "qrc:/components"
Index: sources/gui/qml/dialogs/diagnostics/DiagnosticsTD.qml
===================================================================
diff -u -r9143dd9055ada50b3ec13e7ce0671727a784f38f -r036d378b4b89db03c812584c1d0f682494d81568
--- sources/gui/qml/dialogs/diagnostics/DiagnosticsTD.qml	(.../DiagnosticsTD.qml)	(revision 9143dd9055ada50b3ec13e7ce0671727a784f38f)
+++ sources/gui/qml/dialogs/diagnostics/DiagnosticsTD.qml	(.../DiagnosticsTD.qml)	(revision 036d378b4b89db03c812584c1d0f682494d81568)
@@ -17,6 +17,8 @@
 import QtQuick 2.12
 
 // Project
+import Gui.Actions      0.1
+
 //  Qml imports
 import "qrc:/globals"
 import "qrc:/components"
Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml
===================================================================
diff -u -r1a614320ec16b956d14c644ac2e90833f5cbdbcf -r036d378b4b89db03c812584c1d0f682494d81568
--- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml	(.../PreTreatmentCreate.qml)	(revision 1a614320ec16b956d14c644ac2e90833f5cbdbcf)
+++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml	(.../PreTreatmentCreate.qml)	(revision 036d378b4b89db03c812584c1d0f682494d81568)
@@ -221,19 +221,8 @@
             Connections { target: _duration
                 function onValueChanged     ( ) {
                     if ( _heparinDispensingRateSwitch.checked ) {
-
-                        // FIXME: LEAHI
-                        ////////////////////////////////////////////////////////////////
-                        // depending on the feedback the approach could be differnet. //
-                        ////////////////////////////////////////////////////////////////
-
-                        //A: Deactive the hheparin stop time and let the usere re-set the value
                         _heparinStopTime.active = false
-
-                        //B: Leave the set value on heparin stop time and just fix if exceeds max.
-                        if ( _heparinStopTime.value > _duration.value ) {
-                            _heparinStopTime.reset( _duration.value )
-                        }
+                        _heparinStopTime.reset( _duration.value )
                     }
                 }
             }
@@ -256,10 +245,10 @@
                     let mObject  = _heparinStopTime
 
                     mObject.enabled     = mActive && mChecked
-                    mObject.active      = mActive && ! mChecked
+                    mObject.active      = false
                     mObject.adjustable  = mChecked
 
-                    if ( ! mChecked ) mObject.reset ( 0 )
+                    mObject.reset ( _duration.value )
                 }
             }
 
@@ -428,9 +417,10 @@
                 flickable   : _flickable
                 unit        : Variables.unitTextDuration
                 minimum     : vTreatmentRanges.heparinStopTimeMin
-                maximum     : _duration.value   // vTreatmentRanges.heparinStopTimeMax  // this maximum depends on the Treatment Duration Value.
-                step        : _duration.step    // vTreatmentRanges.heparinStopTimeRes
-                defaultValue: vTreatmentRanges.heparinStopTimeDef
+                maximum     : _duration.value   // LEAHI-SRS-300
+                step        : _duration.step    // LEAHI-SRS-300
+                defaultValue: _duration.value   // LEAHI-SRS-300
+                inActiveZero: false
                 valid       : !vTreatmentCreate.heparinStopTimeRejectReason
                 enabled         : false // this switch depends on the heparin dispencing
                 adjustable      : false // this switch depends on the heparin dispencing
Index: sources/view/hd/data/VTreatmentRanges.cpp
===================================================================
diff -u -rca5a17d5abaae0982922faca123d6f189135d413 -r036d378b4b89db03c812584c1d0f682494d81568
--- sources/view/hd/data/VTreatmentRanges.cpp	(.../VTreatmentRanges.cpp)	(revision ca5a17d5abaae0982922faca123d6f189135d413)
+++ sources/view/hd/data/VTreatmentRanges.cpp	(.../VTreatmentRanges.cpp)	(revision 036d378b4b89db03c812584c1d0f682494d81568)
@@ -87,10 +87,7 @@
     FROMVARIANT_WITHRETURN              ( heparinBolusVolumeMax             , "Heparin Bolus Volume Ranges"             , "Heparin_Bolus_Volume_Max"            , Float , isConfigsOk );
     FROMVARIANT_WITHRETURN              ( heparinBolusVolumeRes             , "Heparin Bolus Volume Ranges"             , "Heparin_Bolus_Volume_Res"            , Float , isConfigsOk );
 
-    FROMVARIANT_WITHRETURN              ( heparinStopTimeDef                , "Heparin Stop Time Ranges"                , "Heparin_Stop_Time_Def"               , UInt  , isConfigsOk );
     FROMVARIANT_WITHRETURN              ( heparinStopTimeMin                , "Heparin Stop Time Ranges"                , "Heparin_Stop_Time_Min"               , UInt  , isConfigsOk );
-    FROMVARIANT_WITHRETURN              ( heparinStopTimeMax                , "Heparin Stop Time Ranges"                , "Heparin_Stop_Time_Max"               , UInt  , isConfigsOk );
-    FROMVARIANT_WITHRETURN              ( heparinStopTimeRes                , "Heparin Stop Time Ranges"                , "Heparin_Stop_Time_Res"               , UInt  , isConfigsOk );
 
     FROMVARIANT_WITHRETURN              ( salineBolusVolumeDef              , "Saline Bolus Volume Ranges"              , "Saline_Bolus_Volume_Def"             , UInt  , isConfigsOk );
     FROMVARIANT_WITHRETURN              ( salineBolusVolumeMin              , "Saline Bolus Volume Ranges"              , "Saline_Bolus_Volume_Min"             , UInt  , isConfigsOk );
Index: sources/view/td/data/treatment/VTDTreatmentStatesData.cpp
===================================================================
diff -u -r43ae56f762e6f3e1416d39e3d16f9103fc597e41 -r036d378b4b89db03c812584c1d0f682494d81568
--- sources/view/td/data/treatment/VTDTreatmentStatesData.cpp	(.../VTDTreatmentStatesData.cpp)	(revision 43ae56f762e6f3e1416d39e3d16f9103fc597e41)
+++ sources/view/td/data/treatment/VTDTreatmentStatesData.cpp	(.../VTDTreatmentStatesData.cpp)	(revision 036d378b4b89db03c812584c1d0f682494d81568)
@@ -69,12 +69,10 @@
     ENUM_CHECK  ( GuiSalineStates, SALINE_BOLUS_STATE_IDLE                                  )
     ENUM_CHECK  ( GuiSalineStates, SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP                   )
     ENUM_CHECK  ( GuiSalineStates, SALINE_BOLUS_STATE_IN_PROGRESS                           )
-    ENUM_CHECK  ( GuiSalineStates, SALINE_BOLUS_STATE_MAX_DELIVERED                         )
     ENUM_CHECK_C( GuiSalineStates, NUM_OF_SALINE_BOLUS_STATES                               ) }
     ENUM_READ   ( GuiSalineStates, SALINE_BOLUS_STATE_IDLE                  , sbIdle        );
     ENUM_READ   ( GuiSalineStates, SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP   , sbWaitPump    );
     ENUM_READ   ( GuiSalineStates, SALINE_BOLUS_STATE_IN_PROGRESS           , sbRunning     );
-    ENUM_READ   ( GuiSalineStates, SALINE_BOLUS_STATE_MAX_DELIVERED         , sbMaxReached  );
 
     // Heparin States
     _heparin                = false;