Index: firmware/App/Controllers/PresOccl.c
===================================================================
diff -u -re5878b491140f3c370932723c5e9b126a0c9dac4 -rf874efc76625e3d3aa5de4c13ba01a9d7e651216
--- firmware/App/Controllers/PresOccl.c	(.../PresOccl.c)	(revision e5878b491140f3c370932723c5e9b126a0c9dac4)
+++ firmware/App/Controllers/PresOccl.c	(.../PresOccl.c)	(revision f874efc76625e3d3aa5de4c13ba01a9d7e651216)
@@ -81,6 +81,7 @@
 
 #define PSI_TO_MMHG                         ( 51.7149F )                                    ///< Conversion factor for converting PSI to mmHg.
 
+// The new arterial pressure sensor is the same as the venous pressure sensor
 #define VENOUS_PRESSURE_NORMAL_OP           0                                               ///< Venous pressure status bits indicate normal operation.
 #define VENOUS_PRESSURE_CMD_MODE            1                                               ///< Venous pressure status bits indicate sensor in command mode.
 #define VENOUS_PRESSURE_STALE_DATA          2                                               ///< Venous pressure status bits indicate data is stale (no new data since last fpga read).
@@ -817,7 +818,6 @@
                 }
             }
         }
-
         // Check for occlusion in Treatment modes where pumps are moving
         else if ( MODE_TREA == getCurrentOperationMode() )
         {
Index: firmware/App/Modes/ModePostTreat.c
===================================================================
diff -u -r85bacfb730f23f5ad75c4b2a01e599719b76af83 -rf874efc76625e3d3aa5de4c13ba01a9d7e651216
--- firmware/App/Modes/ModePostTreat.c	(.../ModePostTreat.c)	(revision 85bacfb730f23f5ad75c4b2a01e599719b76af83)
+++ firmware/App/Modes/ModePostTreat.c	(.../ModePostTreat.c)	(revision f874efc76625e3d3aa5de4c13ba01a9d7e651216)
@@ -153,7 +153,7 @@
     signalBloodPumpHardStop();
     signalDialOutPumpHardStop();
     signalDialInPumpHardStop();
-    setCurrentSubState( currentPostTreatmentState );
+    setCurrentSubState( NO_SUB_STATE );
     collectTreatmentLogData();
 
     exitBloodLeakNormalState();
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r1b2d508e6c5fb1aed6c538874689681ca41bf962 -rf874efc76625e3d3aa5de4c13ba01a9d7e651216
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 1b2d508e6c5fb1aed6c538874689681ca41bf962)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision f874efc76625e3d3aa5de4c13ba01a9d7e651216)
@@ -7,8 +7,8 @@
 *
 * @file    SystemCommMessages.c
 *
-* @author  (last)      Sean Nash
-* @date    (last)      24-May-2023
+* @author  (last)      Dara Navaei
+* @date    (last)      20-May-2023
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  05-Nov-2019
@@ -5354,6 +5354,7 @@
     if ( sizeof( TEST_OVERRIDE_PAYLOAD_T ) == message->hdr.payloadLen )
     {
         memcpy( &payload, message->payload, sizeof( TEST_OVERRIDE_PAYLOAD_T ) );
+
         if ( FALSE == payload.reset )
         {
             result = testSetBatteryRemainingCapacityOverride( payload.state.f32 );