Index: leahi.qrc
===================================================================
diff -u -r600b6707b102919d981f3b1d18611834e23eae60 -r9cc47cf817b3236812926e3a92373db89932fe72
--- leahi.qrc	(.../leahi.qrc)	(revision 600b6707b102919d981f3b1d18611834e23eae60)
+++ leahi.qrc	(.../leahi.qrc)	(revision 9cc47cf817b3236812926e3a92373db89932fe72)
@@ -53,6 +53,12 @@
         <file alias="HeaderbarPrescription.qml">sources/gui/qml/dialogs/headerbar/HeaderbarPrescription.qml</file>
         <file alias="HeaderbarInformation.qml">sources/gui/qml/dialogs/headerbar/HeaderbarInformation.qml</file>
     </qresource>
+    <qresource prefix="/dialogs/watersample">
+        <file alias="WaterSampleDialog.qml">sources/gui/qml/dialogs/watersample/WaterSampleDialog.qml</file>
+        <file alias="WaterSampleBase.qml">sources/gui/qml/dialogs/watersample/WaterSampleBase.qml</file>
+        <file alias="WaterSamplePage.qml">sources/gui/qml/dialogs/watersample/WaterSamplePage.qml</file>
+        <file alias="WaterSampleDialysatePage.qml">sources/gui/qml/dialogs/watersample/WaterSampleDialysatePage.qml</file>
+    </qresource>
     <qresource prefix="/images">
         <file alias="iLogoD">resources/images/Logo d.png</file>
         <file alias="iLogoDiality">resources/images/Logo DialityT.png</file>
@@ -112,6 +118,7 @@
         <file alias="iVolume">resources/images/Volume.png</file>
         <file alias="iWaterSampleFail">resources/images/water_sample_fail.png</file>
         <file alias="iWaterSamplePass">resources/images/water_sample_pass.png</file>
+        <file alias="iWaterSample">resources/images/water_sample.png</file>
     </qresource>
     <qresource prefix="/components">
         <file alias="MainMenu.qml">sources/gui/qml/components/MainMenu.qml</file>
@@ -253,11 +260,9 @@
     <qresource prefix="/pages/pretreatment">
         <file alias="PreTreatmentBase.qml">sources/gui/qml/pages/pretreatment/PreTreatmentBase.qml</file>
         <file alias="PreTreatmentStack.qml">sources/gui/qml/pages/pretreatment/PreTreatmentStack.qml</file>
-        <file alias="PreTreatmentWaterSample.qml">sources/gui/qml/pages/pretreatment/PreTreatmentWaterSample.qml</file>
         <file alias="PreTreatmentSelfTests.qml">sources/gui/qml/pages/pretreatment/PreTreatmentSelfTests.qml</file>
         <file alias="PreTreatmentPrime.qml">sources/gui/qml/pages/pretreatment/PreTreatmentPrime.qml</file>
         <file alias="PreTreatmentInstallStack.qml">sources/gui/qml/pages/pretreatment/PreTreatmentInstallStack.qml</file>
-        <file alias="PreTreatmentUltrafiltration.qml">sources/gui/qml/pages/pretreatment/PreTreatmentUltrafiltration.qml</file>
     </qresource>
     <qresource prefix="/pages/pretreatment/create">
         <file alias="PreTreatmentCreate.qml">sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml</file>
Index: sources/view/VTreatmentCreate.h
===================================================================
diff -u -r600b6707b102919d981f3b1d18611834e23eae60 -r9cc47cf817b3236812926e3a92373db89932fe72
--- sources/view/VTreatmentCreate.h	(.../VTreatmentCreate.h)	(revision 600b6707b102919d981f3b1d18611834e23eae60)
+++ sources/view/VTreatmentCreate.h	(.../VTreatmentCreate.h)	(revision 9cc47cf817b3236812926e3a92373db89932fe72)
@@ -105,6 +105,12 @@
     VALUESET(bool       , parametersValidated                           , 0)
     VALUESET(bool       , parametersConfirmed                           , 0)
 
+    VALUESET(qint32     , dryBicabCartridgeSize                         , 0)
+    VALUESET(qint32     , bicarbFinalDialysateComposition               , 0)
+    VALUESET(qint32     , sodiumFinalDialysateComposition               , 0)
+    VALUESET(qint32     , actualRORejectionPercentage                   , 0)
+
+
     PROPERTY(QString    , txCode                                        ,"")
 
     TRIGGER(quint32     , bloodFlowRateRejectReason                     , 0)