Index: sources/view/VWaterSampleModel.cpp
===================================================================
diff -u -r0bb5f08eb3570de6bff3ce67ca502db129b59096 -rb110ee732fe1306669f71d9c17ed4714e1f03ee2
--- sources/view/VWaterSampleModel.cpp	(.../VWaterSampleModel.cpp)	(revision 0bb5f08eb3570de6bff3ce67ca502db129b59096)
+++ sources/view/VWaterSampleModel.cpp	(.../VWaterSampleModel.cpp)	(revision b110ee732fe1306669f71d9c17ed4714e1f03ee2)
@@ -5,7 +5,8 @@
 View::VWaterSampleModel::VWaterSampleModel(QObject *parent)
 {
     Q_UNUSED(parent)
-    ACTION_VIEW_CONNECTION(SettingsData);
+    ACTION_VIEW_CONNECTION(RoWaterModeResponseData)
+
     _model.setRoleNames({   { eRole_Text           , "text"         },
                             { eRole_Visible        , "visible"      },
                             });
@@ -19,10 +20,8 @@
     _model.insertRow( eDialysateChecks   , {{  eRole_Text, tr("Dialysate Checks")},  { eRole_Visible, true           }});
 }
 
-void View::VWaterSampleModel::onActionReceive(const SettingsData &)
+void View::VWaterSampleModel::onActionReceive(const RoWaterModeResponseData &vData)
 {
-    QString mCategory = Storage::Settings_Category_SettingsSystem;
-    FROMVARIANT( roWaterMode        , "Feature Configurations", "RoWaterMode"       , UInt );
-
+    roWaterMode                 ( vData.mValue         );
     initModel();
 }