Index: firmware/.cproject
===================================================================
diff -u -r838bd7060d127e6967559bc2b3998eac201bf738 -r6bd5b453f642257421e27d2f14cea5de3c3f6750
--- firmware/.cproject	(.../.cproject)	(revision 838bd7060d127e6967559bc2b3998eac201bf738)
+++ firmware/.cproject	(.../.cproject)	(revision 6bd5b453f642257421e27d2f14cea5de3c3f6750)
@@ -45,6 +45,7 @@
 									<listOptionValue builtIn="false" value="${workspace_loc:/${ProjName}/App/Controllers}"/>
 									<listOptionValue builtIn="false" value="${workspace_loc:/${ProjName}/App/Monitors}"/>
 									<listOptionValue builtIn="false" value="${workspace_loc:/${ProjName}/App/Services}"/>
+									<listOptionValue builtIn="false" value="${workspace_loc:/${ProjName}/App/Services/StateServices}"/>
 									<listOptionValue builtIn="false" value="${PROJECT_ROOT}"/>
 									<listOptionValue builtIn="false" value="${workspace_loc:/${ProjName}/include}"/>
 									<listOptionValue builtIn="false" value="${CG_TOOL_ROOT}/include"/>
@@ -126,6 +127,7 @@
 								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.12.compilerID.ENUM_TYPE.717487680" name="Designate enum type (--enum_type)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.12.compilerID.ENUM_TYPE" value="com.ti.ccstudio.buildDefinitions.TMS470_18.12.compilerID.ENUM_TYPE.packed" valueType="enumerated"/>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.ti.ccstudio.buildDefinitions.TMS470_18.12.compilerID.INCLUDE_PATH.637384198" name="Add dir to #include search path (--include_path, -I)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.12.compilerID.INCLUDE_PATH" valueType="includePath">
 									<listOptionValue builtIn="false" value="${workspace_loc:/${ProjName}/FWCommon/FlashDrvr}"/>
+									<listOptionValue builtIn="false" value="${workspace_loc:/${ProjName}/App/Services/StateServices}"/>
 									<listOptionValue builtIn="false" value="${workspace_loc:/${ProjName}/App}"/>
 									<listOptionValue builtIn="false" value="${workspace_loc:/${ProjName}/FWCommon}"/>
 									<listOptionValue builtIn="false" value="${workspace_loc:/${ProjName}/Common}"/>
Index: firmware/App/Modes/OperationModes.c
===================================================================
diff -u -r05d1dea95ddc57c416a1bbf80ac442fc2e972d54 -r6bd5b453f642257421e27d2f14cea5de3c3f6750
--- firmware/App/Modes/OperationModes.c	(.../OperationModes.c)	(revision 05d1dea95ddc57c416a1bbf80ac442fc2e972d54)
+++ firmware/App/Modes/OperationModes.c	(.../OperationModes.c)	(revision 6bd5b453f642257421e27d2f14cea5de3c3f6750)
@@ -7,8 +7,8 @@
 *
 * @file    OperationModes.c
 *
-* @author  (last)      Raghu Kallala
-* @date    (last)      07-May-2026
+* @author  (last)      Praneeth Bunne
+* @date    (last)      19-May-2026
 *
 * @author  (original)  Sean Nash
 * @date    (original)  01-Aug-2024
@@ -25,7 +25,7 @@
 #include "ModePreTreat.h"
 #include "ModeTreatment.h"
 #include "ModeUpdate.h"
-//#include "ModePostTreat.h"
+#include "ModePostTreat.h"
 //#include "NVDataMgmt.h"
 #include "OperationModes.h"
 #include "TaskGeneral.h"
@@ -127,7 +127,7 @@
     initPreTreatmentMode();
     initTreatmentMode();
     initUpdateMode();
-//    initPostTreatmentMode();
+    initPostTreatmentMode();
 }
 
 /*********************************************************************//**
@@ -211,9 +211,9 @@
             currentSubMode = execTreatmentMode();
             break;
 
-//        case MODE_POST:
-//            currentSubMode = execPostTreatmentMode();
-//            break;
+        case MODE_POST:
+            currentSubMode = execPostTreatmentMode();
+            break;
 
         case MODE_UPDT:
             currentSubMode = execUpdateMode();
@@ -415,12 +415,14 @@
         case MODE_TREA:
             currentSubMode = transitionToTreatmentMode();
             break;
-//        case MODE_POST:
-//            currentSubMode = transitionToPostTreatmentMode();
-//            break;
+
         case MODE_UPDT:
             currentSubMode = transitionToUpdateMode();
             break;
+
+        case MODE_POST:
+            currentSubMode = transitionToPostTreatmentMode();
+            break;
         default:
             SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_OP_MODES_INVALID_MODE_TO_TRANSITION_TO, newMode )
             break;
Index: firmware/App/Services/AlarmMgmtSWFaults.h
===================================================================
diff -u -rc37161ede44498a31daddc9a309a963a0bed4ded -r6bd5b453f642257421e27d2f14cea5de3c3f6750
--- firmware/App/Services/AlarmMgmtSWFaults.h	(.../AlarmMgmtSWFaults.h)	(revision c37161ede44498a31daddc9a309a963a0bed4ded)
+++ firmware/App/Services/AlarmMgmtSWFaults.h	(.../AlarmMgmtSWFaults.h)	(revision 6bd5b453f642257421e27d2f14cea5de3c3f6750)
@@ -7,8 +7,8 @@
 *
 * @file    AlarmMgmtSWFaults.h
 *
-* @author  (last)      Arpita Srivastava
-* @date    (last)      12-May-2026
+* @author  (last)      Praneeth Bunne
+* @date    (last)      21-May-2026
 *
 * @author  (original)  Sean Nash
 * @date    (original)  01-Aug-2024
@@ -191,6 +191,11 @@
     SW_FAULT_ID_TD_SYRINGE_INVALID_CONT_CMD = 160,
     SW_FAULT_ID_TD_SYRINGE_INVALID_STATE = 161,
     SW_FAULT_ID_TD_SYRINGE_INVALID_VREF = 162,
+    SW_FAULT_ID_MODE_PRE_TX_INSTALL_INVALID_STATE = 163,
+    SW_FAULT_ID_MODE_POST_TREATMENT_INVALID_STATE = 164,
+    SW_FAULT_ID_MODE_POST_TREATMENT_INVALID_STATE1 = 165,
+    SW_FAULT_ID_MODE_POST_TX_AUTO_EJECT_INVALID_STATE = 166,
+    SW_FAULT_ID_INVALID_MESSAGE_PAYLOAD_LENGTH = 167,
     NUM_OF_SW_FAULT_IDS
 } SW_FAULT_ID_T;
 
Index: firmware/App/Services/Messaging.c
===================================================================
diff -u -rc37161ede44498a31daddc9a309a963a0bed4ded -r6bd5b453f642257421e27d2f14cea5de3c3f6750
--- firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision c37161ede44498a31daddc9a309a963a0bed4ded)
+++ firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 6bd5b453f642257421e27d2f14cea5de3c3f6750)
@@ -7,8 +7,8 @@
 *
 * @file    Messaging.c
 *
-* @author  (last)      Arpita Srivastava
-* @date    (last)      18-May-2026
+* @author  (last)      Praneeth Bunne
+* @date    (last)      21-May-2026
 *
 * @author  (original)  Sean Nash
 * @date    (original)  01-Aug-2024
@@ -42,6 +42,8 @@
 #include "SyringePump.h"
 #include "SystemCommTD.h"
 #include "Temperatures.h"
+#include "TubeSetAutoEject.h"
+#include "TubeSetInstall.h"
 #include "TxParams.h"
 #include "Utilities.h"
 #include "Valve3Way.h"
@@ -116,6 +118,8 @@
     { MSG_ID_UI_PRESSURE_LIMIT_WIDEN_REQUEST,                           &pressureLimitHandleWidenRequest },
     { MSG_ID_UI_BLOOD_PRIME_CMD_REQUEST,                                &bloodPrimeHandleCmdRequest },
     { MSG_ID_UI_TREATMENT_SET_POINT_BLOOD_FLOW_CHANGE_REQUEST,          &bloodPrimeHandleBloodFlowChangeRequest },
+    { MSG_ID_UI_ADJUST_DISPOSABLES_CONFIRM_REQUEST,                     &handleAutoLoadRequest },
+    { MSG_ID_UI_ADJUST_DISPOSABLES_REMOVAL_CONFIRM_REQUEST,             &handleAutoEjectRequest },
     { MSG_ID_TD_SOFTWARE_RESET_REQUEST,                                 &testTDSoftwareResetRequest },
     { MSG_ID_TD_BUBBLE_OVERRIDE_REQUEST,                                &testBubbleDetectOverride },
     { MSG_ID_TD_BUBBLE_PUBLISH_INTERVAL_OVERRIDE_REQUEST,               &testBubblesDataPublishIntervalOverride },