Index: sources/drydemo/StateController.h
===================================================================
diff -u -rbf271a558491a83b39eb30748784f1b744736dd2 -r4d0fc455e6307639e72db490721c7768a487c014
--- sources/drydemo/StateController.h	(.../StateController.h)	(revision bf271a558491a83b39eb30748784f1b744736dd2)
+++ sources/drydemo/StateController.h	(.../StateController.h)	(revision 4d0fc455e6307639e72db490721c7768a487c014)
@@ -86,9 +86,15 @@
         quint32         bicartDepresInProgress;
     };
 
-    struct HDF_vars {
-        float           hdfManualRateMLPM;
-        float           hdfCurrentVolumeML;
+    struct Treatment_HDF_vars {
+        float               hdfManualRateMLPM;
+        float               hdfCurrentVolumeML;
+        HDF_Control_States  hdfControlState;
+        float               hdfMaxFiltrationFraction;
+        float               hdfCurrentRateMLPM;
+        quint32             hdfControlTimeCtr;
+        bool                hdfHasMaxVolumeBeenReached;
+        bool                hdfIsRequested;
     };
 
     struct Pressure_Vars {
@@ -154,7 +160,7 @@
         quint32 rinsebackVolumeML;
         quint32 hepatitisBStatus;
         quint32 acidConcentrate;
-        float   substitutionFluidVolumeL;
+        float   hdfSubstitutionFluidVolumeL;
         float   heparinBolusVolumeML;
         float   heparinDeliveryRateMLHR;
         float   dialysateTemperatureC;
@@ -175,6 +181,7 @@
     Treatment_Params                         _treatmentParams;
     Treatment_Status_Vars                    _treatmentStatus;
     Treatment_Sub_State_Vars                 _treatmentSubStates;
+    Treatment_HDF_vars                       _treatmentHDFVars;
     bool                                     _isBroadcastListReady;  // TODO use a mutex?
     bool                                     _isSendListReady;       // Todo use a mutex?
     quint32                                  _elapsedTimeCtr;
@@ -259,8 +266,11 @@
     void handleVitalsDataRquest();
 
     // HDF Treatment methods
+    void initializeTreatmentHDFVariables();
+    float handleCheckHDFRate(const float proposedRateMLPM);
     void handleTreatmentHDF();
     void handleHemodialfiltrationBroadcastData(const Broadcast_Type BCType);
+    void handleHDFAdjustmentRequestMessage();
 
     // Treatment pause methods
     void handleDryBicartBroadcastData(const Broadcast_Type BCType);