Index: sources/view/td/data/treatment/VTDTreatmentStatesData.cpp
===================================================================
diff -u -r27a83d5f4e60279c58e3edcf0ed5730f70e3c1b5 -r602f68c5f860173c069994b27416cb030447c434
--- sources/view/td/data/treatment/VTDTreatmentStatesData.cpp	(.../VTDTreatmentStatesData.cpp)	(revision 27a83d5f4e60279c58e3edcf0ed5730f70e3c1b5)
+++ sources/view/td/data/treatment/VTDTreatmentStatesData.cpp	(.../VTDTreatmentStatesData.cpp)	(revision 602f68c5f860173c069994b27416cb030447c434)
@@ -57,24 +57,31 @@
 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     ;
+    if ( mIsoUf ) {
+        ENUM_CHECK_O( GuiIsoUfState, vData.mIsolatedUFState                                 ) {
+        ENUM_CHECK  ( GuiIsoUfState, ISOALTED_UF_RUNNING_STATE                              )
+        ENUM_CHECK  ( GuiIsoUfState, ISOLATED_UF_PAUSE_STATE                                )
+        ENUM_CHECK_C( GuiIsoUfState, NUM_OF_ISOLATED_UF_STATES                              ) }
+        ENUM_READ   ( GuiIsoUfState, ISOALTED_UF_RUNNING_STATE      , isoUfRunning          );
+        ENUM_READ   ( GuiIsoUfState, ISOLATED_UF_PAUSE_STATE        , isoUfPaused           );
+    }
+    txIsolatedUF  ( mIsoUf ); // it's the main dialysis event so moved last to have all the sub-dialysis-states updated prior to.
 
-    // Ultrafiltration states
 
     // Saline Bolus states
     ENUM_CHECK_O( GuiSalineStates, vData.mSalineState                                               ) {
     ENUM_CHECK  ( GuiSalineStates, FLUID_BOLUS_IDLE_STATE                                           )
     ENUM_CHECK  ( GuiSalineStates, FLUID_BOLUS_WAIT_FOR_PUMPS_STOP_STATE                            )
-    ENUM_CHECK  ( GuiSalineStates, FLUID_BOLUS_SALINE_IN_PROGRESS_STATE                             )
-    ENUM_CHECK  ( GuiSalineStates, FLUID_BOLUS_SUBSITUTE_IN_PROGRESS_STATE                          )
+    ENUM_CHECK  ( GuiSalineStates, FLUID_BOLUS_IN_PROGRESS_STATE                             )
     ENUM_CHECK_C( GuiSalineStates, NUM_OF_FLUID_BOLUS_STATES                                        ) }
     ENUM_READ   ( GuiSalineStates, FLUID_BOLUS_IDLE_STATE                   , sbIdle                );
     ENUM_READ   ( GuiSalineStates, FLUID_BOLUS_WAIT_FOR_PUMPS_STOP_STATE    , sbWaitPump            );
-    ENUM_READ   ( GuiSalineStates, FLUID_BOLUS_SALINE_IN_PROGRESS_STATE     , sbRunning             );
-    ENUM_READ   ( GuiSalineStates, FLUID_BOLUS_SUBSITUTE_IN_PROGRESS_STATE  , sbSubstitutionRunning );
+    ENUM_READ   ( GuiSalineStates, FLUID_BOLUS_IN_PROGRESS_STATE            , sbRunning             );
 
     // Heparin States
     _heparin                = false;
@@ -149,14 +156,12 @@
         ENUM_CHECK  ( GuiRinsebackStates, RINSEBACK_PAUSED_STATE                                                    )
         ENUM_CHECK  ( GuiRinsebackStates, RINSEBACK_STOP_STATE                                                      )
         ENUM_CHECK  ( GuiRinsebackStates, RINSEBACK_RUN_ADDITIONAL_STATE                                            )
-        ENUM_CHECK  ( GuiRinsebackStates, RINSEBACK_RECONNECT_PATIENT_STATE                                         )
         ENUM_CHECK_C( GuiRinsebackStates, NUM_OF_RINSEBACK_STATES                                                   ) }
         ENUM_READ   ( GuiRinsebackStates, RINSEBACK_STOP_INIT_STATE                         , rbInit                );
         ENUM_READ   ( GuiRinsebackStates, RINSEBACK_RUN_STATE                               , rbRun                 );
         ENUM_READ   ( GuiRinsebackStates, RINSEBACK_PAUSED_STATE                            , rbPaused              );
         ENUM_READ   ( GuiRinsebackStates, RINSEBACK_STOP_STATE                              , rbStop                );
         ENUM_READ   ( GuiRinsebackStates, RINSEBACK_RUN_ADDITIONAL_STATE                    , rbAdditional          );
-        ENUM_READ   ( GuiRinsebackStates, RINSEBACK_RECONNECT_PATIENT_STATE                 , rbReconnect           );
     }
     txRinseback ( mRinseback ); // it's the main rinseback event so moved last to have all the sub-rinseback-states updated prior to.