Index: sources/view/td/data/treatment/VTDTreatmentStatesData.cpp
===================================================================
diff -u -rabe8e7cfe31d4ac42a9d85f8e5d93fa809025ea9 -r61a9a75c5b5ed003dc326ec3cc138a8f0e78c1e0
--- sources/view/td/data/treatment/VTDTreatmentStatesData.cpp	(.../VTDTreatmentStatesData.cpp)	(revision abe8e7cfe31d4ac42a9d85f8e5d93fa809025ea9)
+++ sources/view/td/data/treatment/VTDTreatmentStatesData.cpp	(.../VTDTreatmentStatesData.cpp)	(revision 61a9a75c5b5ed003dc326ec3cc138a8f0e78c1e0)
@@ -57,13 +57,29 @@
 void VTDTreatmentStates::onActionReceive(const TreatmentStatesData &vData)
 {
     subMode                 ( vData.mSubMode            );
-    ufState                 ( vData.mIsolatedUFState    );
+    isoUfState              ( vData.mIsolatedUFState    );
     salineState             ( vData.mSalineState        );
 
-    salineState             ( vData.mSalineState        );
+    // Isolated Ultrafiltration states
+    bool mIsoUf             = vData.mSubMode            == GuiTreatmentStates   ::TREATMENT_ISO_UF_STATE     ;
+    /// *********** UPDATE FOR REAL STATES ********************
+    isoUfRunning(_isoUfState==0);
+    isoUfPaused (_isoUfState==1);
+    ///******************  END UPDATE FOR REAL STATES *********
 
-    // Ultrafiltration states
+//    if ( mIsoUf ) {
+//        ENUM_CHECK_O( GuiDialysisState, vData.mIsolatedUFState                                                            ) {
+//                                                             ENUM_CHECK  ( GuiDialysisState, DIALYSIS_UF_STATE                                                               )
+//                                                             ENUM_CHECK  ( GuiDialysisState, DIALYSIS_UF_PAUSED_STATE                                                        )
+//                                                             ENUM_CHECK  ( GuiDialysisState, DIALYSIS_UF_FLUID_BOLUS_STATE                                                   )
+//                                                             ENUM_CHECK_C( GuiDialysisState, NUM_OF_DIALYSIS_STATES                                                          ) }
+//        ENUM_READ   ( GuiDialysisState, DIALYSIS_UF_STATE                                   , dyUltrafiltration         );
+//        ENUM_READ   ( GuiDialysisState, DIALYSIS_UF_PAUSED_STATE                            , dyUltrafiltrationPaused   );
+//        ENUM_READ   ( GuiDialysisState, DIALYSIS_UF_FLUID_BOLUS_STATE                       , dyFluidBolus              );
+//    }
+    txIsolatedUF  ( mIsoUf ); // it's the main dialysis event so moved last to have all the sub-dialysis-states updated prior to.
 
+
     // Saline Bolus states
     ENUM_CHECK_O( GuiSalineStates, vData.mSalineState                                               ) {
     ENUM_CHECK  ( GuiSalineStates, FLUID_BOLUS_IDLE_STATE                                           )