Index: sources/gui/GuiGlobals.h
===================================================================
diff -u -rbdf090c85ac9b272d1c693025542e8a5fac5a7e5 -rac290dfdbd332fafc7a70ad7f78a21ef15e7f82e
--- sources/gui/GuiGlobals.h	(.../GuiGlobals.h)	(revision bdf090c85ac9b272d1c693025542e8a5fac5a7e5)
+++ sources/gui/GuiGlobals.h	(.../GuiGlobals.h)	(revision ac290dfdbd332fafc7a70ad7f78a21ef15e7f82e)
@@ -187,8 +187,8 @@
             ID_AdjustUltrafiltrationInitReq             = 0x4F0F, // 79  //// ----- @CRAPIZED: had to change to avoid duplication
             ID_AdjustUltrafiltrationInitRsp             = 0x5000, // 80
             // Pre-Treatment Patient Connection Confirm
-            ID_AdjustPatientConnectionConfirmReq        = 0x660F, // 102 //// ----- @CRAPIZED: had to change to avoid duplication
-            ID_AdjustPatientConnectionConfirmRsp        = 0x670F, // 103 //// ----- @CRAPIZED: had to change to avoid duplication
+            ID_AdjustPatientConnectionConfirmReq        = 0xD600, // 214    //// ----- @LEAHIZED
+            ID_AdjustPatientConnectionConfirmRsp        = 0xD700, // 215    //// ----- @LEAHIZED
             // Pre-Treatment Start Treatment
             ID_AdjustStartTreatmentReq                  = 0xA100, // 161
             ID_AdjustStartTreatmentRsp                  = 0xA200, // 162
Index: sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustPatientConnectionConfirmResponse.h
===================================================================
diff -u -ra58f91b077c8131bea3dbde0fc338adb113fc9f3 -rac290dfdbd332fafc7a70ad7f78a21ef15e7f82e
--- sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustPatientConnectionConfirmResponse.h	(.../MPreTreatmentAdjustPatientConnectionConfirmResponse.h)	(revision a58f91b077c8131bea3dbde0fc338adb113fc9f3)
+++ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustPatientConnectionConfirmResponse.h	(.../MPreTreatmentAdjustPatientConnectionConfirmResponse.h)	(revision ac290dfdbd332fafc7a70ad7f78a21ef15e7f82e)
@@ -32,7 +32,7 @@
  *
  * | MSG  | CAN ID | M.Box | Type | Ack | Src | Dest | Description |
  * |:----:|:------:|:-----:|:----:|:---:|:---:|:----:|:-----------:|
- * |0x6700| 0x020  | 6     | Rsp  | Y   | HD  | UI   | PatientConnectionConfirm Response |
+ * |0xD700| 0x020  | 6     | Rsp  | Y   | TD  | UI   | PatientConnectionConfirm Response |
  *
  * | Payload  ||
  * |          ||
@@ -47,7 +47,7 @@
  * |              ||
  * |              ||
  * | typeText     | Event           |
- * | unitText     | HD              |
+ * | unitText     | TD              |
  * | infoText     | AdjustPatientConnectionConfirm |
  *
  */
Index: sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustRequests.h
===================================================================
diff -u -rc70815ad2b3beadf61832f2e4d12eb90d476e020 -rac290dfdbd332fafc7a70ad7f78a21ef15e7f82e
--- sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustRequests.h	(.../MPreTreatmentAdjustRequests.h)	(revision c70815ad2b3beadf61832f2e4d12eb90d476e020)
+++ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustRequests.h	(.../MPreTreatmentAdjustRequests.h)	(revision ac290dfdbd332fafc7a70ad7f78a21ef15e7f82e)
@@ -295,7 +295,7 @@
  *
  * | MSG  | CAN ID | M.Box | Type | Ack | Src | Dest | Description                        |
  * |:----:|:------:|:-----:|:----:|:---:|:---:|:----:|:----------------------------------:|
- * |0x6600| 0x100  |    9  | Req  | Y   | UI  | HD   | Patient Connection Confirm Request |
+ * |0xD600| 0x100  |    9  | Req  | Y   | UI  | TD   | Patient Connection Confirm Request |
  *
  * | Payload  ||
  * |          ||
Index: sources/model/hd/alarm/MAlarmMapping.cpp
===================================================================
diff -u -r1df84ec72872967e283b8979e14c2753b740064a -rac290dfdbd332fafc7a70ad7f78a21ef15e7f82e
--- sources/model/hd/alarm/MAlarmMapping.cpp	(.../MAlarmMapping.cpp)	(revision 1df84ec72872967e283b8979e14c2753b740064a)
+++ sources/model/hd/alarm/MAlarmMapping.cpp	(.../MAlarmMapping.cpp)	(revision ac290dfdbd332fafc7a70ad7f78a21ef15e7f82e)
@@ -233,7 +233,8 @@
 /*0197*/case GuiAlarmID::ALARM_ID_DD_D92_PUMP_RPM_OUT_OF_RANGE                 : { result = QObject::tr("DD D92 pump rpm out of range."                                                                         ); break; } /* 197*/
 /*0198*/case GuiAlarmID::ALARM_ID_TD_PRIME_COMPLETED_MEDIUM                    : { result = QObject::tr("TD prime completed medium priority alarm."                                                             ); break; } /* 198*/
 /*0199*/case GuiAlarmID::ALARM_ID_TD_REPEATED_AIR_TRAP_LOWER_EVENTS            : { result = QObject::tr("TD repeated air trap lower events."                                                                    ); break; } /* 199*/
-/*0200*/case GuiAlarmID::NUM_OF_ALARM_IDS                                      : { result = QObject::tr("Number of alarms."                                                                                     ); break; } /* 200*/
+/*0200*/case GuiAlarmID::ALARM_ID_TD_TUBE_SET_MISMATCH                         : { result = QObject::tr("TD tubeset mismatch alarm."                                                                            ); break; } /* 200*/
+/*0201*/case GuiAlarmID::NUM_OF_ALARM_IDS                                      : { result = QObject::tr("Number of alarms."                                                                                     ); break; } /* 201*/
                                                                                    
     default:                                                                       
         result = QObject::tr("ALARM_ID_UNDEFINED [%1]").arg(int(vAlarmID));      
Index: sources/view/td/data/treatment/VTDTreatmentStatesData.cpp
===================================================================
diff -u -r27a83d5f4e60279c58e3edcf0ed5730f70e3c1b5 -rac290dfdbd332fafc7a70ad7f78a21ef15e7f82e
--- sources/view/td/data/treatment/VTDTreatmentStatesData.cpp	(.../VTDTreatmentStatesData.cpp)	(revision 27a83d5f4e60279c58e3edcf0ed5730f70e3c1b5)
+++ sources/view/td/data/treatment/VTDTreatmentStatesData.cpp	(.../VTDTreatmentStatesData.cpp)	(revision ac290dfdbd332fafc7a70ad7f78a21ef15e7f82e)
@@ -68,13 +68,11 @@
     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;
Index: sources/view/td/data/treatment/VTDTreatmentStatesData.h
===================================================================
diff -u -r27a83d5f4e60279c58e3edcf0ed5730f70e3c1b5 -rac290dfdbd332fafc7a70ad7f78a21ef15e7f82e
--- sources/view/td/data/treatment/VTDTreatmentStatesData.h	(.../VTDTreatmentStatesData.h)	(revision 27a83d5f4e60279c58e3edcf0ed5730f70e3c1b5)
+++ sources/view/td/data/treatment/VTDTreatmentStatesData.h	(.../VTDTreatmentStatesData.h)	(revision ac290dfdbd332fafc7a70ad7f78a21ef15e7f82e)
@@ -75,7 +75,6 @@
     PROPERTY( bool   , sbIdle                   , true ) ///< SALINE_BOLUS_STATE_IDLE                   = 0  # No saline bolus delivery is in progress
     PROPERTY( bool   , sbWaitPump               , false) ///< SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP    = 1  # Wait for pumps to stop before starting bolus
     PROPERTY( bool   , sbRunning                , false) ///< SALINE_BOLUS_STATE_IN_PROGRESS            = 2  # A saline bolus delivery is in progress
-    PROPERTY( bool   , sbSubstitutionRunning    , false) ///< FLUID_BOLUS_SUBSITUTE_IN_PROGRESS_STATE   = 3  # A substitution delivery is in progress
 
     // ---- Heparin states
     PROPERTY( bool   , hpOff                    , true ) ///< HEPARIN_STATE_OFF                         = 0  # No heparin delivery is in progress