Index: sources/gui/qml/main.qml
===================================================================
diff -u -r914308e6f87b8074bff379371379d238e7781ed3 -re1816d3c0bcda6e4810d634a02160c1aab41e643
--- sources/gui/qml/main.qml	(.../main.qml)	(revision 914308e6f87b8074bff379371379d238e7781ed3)
+++ sources/gui/qml/main.qml	(.../main.qml)	(revision e1816d3c0bcda6e4810d634a02160c1aab41e643)
@@ -120,6 +120,10 @@
 import VTreatmentAdjustmentBolusVolume                      0.1
 import VTreatmentAdjustmentDurationEdit                     0.1
 import VTreatmentAdjustmentDurationConfirm                  0.1
+import VTreatmentAdjustmentsSetPoints                       0.1
+import VTreatmentAdjustmentsBloodFlowRate                   0.1
+import VTreatmentAdjustmentsDialysateFlowRate               0.1
+import VTreatmentAdjustmentsDialysateTemperature            0.1
 import VTreatmentAdjustmentFlows                            0.1
 import VTreatmentAdjustmentUltrafiltrationState             0.1
 import VTreatmentAdjustmentUltrafiltrationEdit              0.1
@@ -271,6 +275,10 @@
     // ---
     VTreatmentAdjustmentDurationEdit                    { id: vTreatmentAdjustmentDurationEdit                      }
     VTreatmentAdjustmentDurationConfirm                 { id: vTreatmentAdjustmentDurationConfirm                   }
+    VTreatmentAdjustmentSetPoints                       { id: vTreatmentAdjustmentSetPoints                         }
+    VTreatmentAdjustmentBloodFlowRate                   { id: vTreatmentAdjustmentBloodFlowRate                     }
+    VTreatmentAdjustmentDialysateFlowRate               { id: vTreatmentAdjustmentDialysateFlowRate                 }
+    VTreatmentAdjustmentDialysateTemperature            { id: vTreatmentAdjustmentDialysateTemperature              }
     VTreatmentAdjustmentFlows                           { id: vTreatmentAdjustmentFlows                             }
     VTreatmentCreate                                    { id: vTreatmentCreate                                      }
 
Index: sources/gui/qml/pages/treatment/TreatmentStack.qml
===================================================================
diff -u -r62797b3c6e0539e22a04404e16daa7c4465e178f -re1816d3c0bcda6e4810d634a02160c1aab41e643
--- sources/gui/qml/pages/treatment/TreatmentStack.qml	(.../TreatmentStack.qml)	(revision 62797b3c6e0539e22a04404e16daa7c4465e178f)
+++ sources/gui/qml/pages/treatment/TreatmentStack.qml	(.../TreatmentStack.qml)	(revision e1816d3c0bcda6e4810d634a02160c1aab41e643)
@@ -95,9 +95,12 @@
 
     Connections                 { target:   _treatmentAdjustmentSetPoints
         function onConfirmClicked                   ( vValue ) {
-            vTreatmentAdjustmentSetPointss.doAdjustment(
-                _treatmentAdjustmentSetPoints.bloodFlowRateValue     ,
-                _treatmentAdjustmentSetPoints.dialysateFlowRateValue
+            vTreatmentAdjustmentSetPoints.doAdjustment(
+                _treatmentAdjustmentSetPoints.bloodFlowRate         ,
+                _treatmentAdjustmentSetPoints.dialysateFlowRate     ,
+                _treatmentAdjustmentSetPoints.dialysateTemperature  ,
+                _treatmentAdjustmentSetPoints.acidConcentrate       ,
+                _treatmentAdjustmentSetPoints.bicarbConcentrate
             )
         }
     }
@@ -144,6 +147,17 @@
         }
     }
 
+    Connections { target: vTreatmentAdjustmentSetPoints
+        function onAdjustmentTriggered              ( vValue ) {
+            if (vTreatmentAdjustmentSetPoints.adjustment_Accepted) {
+                _treatmentAdjustmentSetPoints.close()
+            }
+            else {
+                _treatmentAdjustmentSetPoints.notification.text = vTreatmentAdjustmentSetPoints.adjustment_ReasonText
+            }
+        }
+    }
+
     Connections { target: vTDOpMode
         // The initail screen should be the Blood Prime, since that one is the earlier state in the list.
         // also since it is being used in two stacks In-Treatment and also in End-Treatmet is has been defined in the MainStack.
Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentSetPoints.qml
===================================================================
diff -u -r62797b3c6e0539e22a04404e16daa7c4465e178f -re1816d3c0bcda6e4810d634a02160c1aab41e643
--- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentSetPoints.qml	(.../TreatmentAdjustmentSetPoints.qml)	(revision 62797b3c6e0539e22a04404e16daa7c4465e178f)
+++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentSetPoints.qml	(.../TreatmentAdjustmentSetPoints.qml)	(revision e1816d3c0bcda6e4810d634a02160c1aab41e643)
@@ -29,7 +29,13 @@
  */
 TreatmentAdjustmentBase { id: _root
     objectName: "_TreatmentAdjustmentFlow"  // SquishQt testability
-    
+
+    readonly property alias bloodFlowRate           : _bloodFlowRate.value
+    readonly property alias dialysateFlowRate       : _dialysateFlowRate.value
+    readonly property alias dialysateTemperature    : _dialysateTemperature.value
+    readonly property alias acidConcentrate         : _acidConcentrateComboBox.currentIndex
+    readonly property alias bicarbConcentrate       : _bicarbConcentrateComboBox.currentIndex
+
     QtObject { id: _private
         objectName: "_private"
         readonly property int containerWidth: (_root.width - (Variables.defaultMargin * 5))/2
@@ -170,16 +176,16 @@
                         }
                     }
 
-                    LabelUnitContainer { id: _bicarbonateConcentrate
-                        objectName          : "_bicarbonateConcentrate"
+                    LabelUnitContainer { id: _bicarbConcentrate
+                        objectName          : "_bicarbConcentrate"
                         width               : _private.containerWidth
                         height              : Variables.adjustmentLabelUnitContainerHeight
                         text                : qsTr("Bicarbonate Concentrate")
                         titleFontPixelSize  : _private.titleFontPixelSize
                         unitFontPixelSize   : _private.unitFontPixelSize
 
-                        contentItem: BaseComboBox { id: _bicarbonateConcentrateComboBox
-                            objectName          : "_bicarbonateConcentrateComboBox"
+                        contentItem: BaseComboBox { id: _bicarbConcentrateComboBox
+                            objectName          : "_bicarbConcentrateComboBox"
                             anchors {
                                 topMargin   : Variables.defaultMargin / 2
                                 bottomMargin: anchors.topMargin
@@ -192,8 +198,8 @@
                             model               : vTreatmentRanges.bicarbonateConcentrateOptions
                             onClear             : vTreatmentCreate.bicarbonateConcentrateSet = false
                             onActivated         : {
-                                if ( ! _bicarbonateConcentrate.valid ) { vTreatmentCreate.bicarbonateConcentrateRejectReason = Variables.noRejectReason }
-                                vTreatmentCreate.bicarbonateConcentrate    = _bicarbonateConcentrateComboBox.currentIndex
+                                if ( ! _bicarbConcentrate.valid ) { vTreatmentCreate.bicarbonateConcentrateRejectReason = Variables.noRejectReason }
+                                vTreatmentCreate.bicarbonateConcentrate    = _bicarbConcentrateComboBox.currentIndex
                                 vTreatmentCreate.bicarbonateConcentrateSet = true
                             }
                         }