Index: firmware/App/Modes/ModePostTreat.c
===================================================================
diff -u -rf63f470a02e5584d107becc6d6ffcacaac88b19e -r4e9b962e7cb3c0b477462756a32214118b10fc16
--- firmware/App/Modes/ModePostTreat.c	(.../ModePostTreat.c)	(revision f63f470a02e5584d107becc6d6ffcacaac88b19e)
+++ firmware/App/Modes/ModePostTreat.c	(.../ModePostTreat.c)	(revision 4e9b962e7cb3c0b477462756a32214118b10fc16)
@@ -8,7 +8,7 @@
 * @file    ModePostTreat.c
 *
 * @author  (last)      Sean Nash
-* @date    (last)      12-Apr-2023
+* @date    (last)      01-Jun-2023
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  05-Nov-2019
@@ -139,7 +139,7 @@
     setAlarmUserActionEnabled( ALARM_USER_ACTION_RINSEBACK, FALSE );
     setAlarmUserActionEnabled( ALARM_USER_ACTION_END_TREATMENT, FALSE );
 
-    doorClosedRequired( FALSE, FALSE );
+    doorClosedRequired( TRUE, TRUE );
 
     cmdStopDGTrimmerHeater();
 
@@ -153,7 +153,7 @@
     signalBloodPumpHardStop();
     signalDialOutPumpHardStop();
     signalDialInPumpHardStop();
-
+    setCurrentSubState( currentPostTreatmentState );
     collectTreatmentLogData();
 
     exitBloodLeakNormalState();
@@ -369,7 +369,8 @@
     {
         // Done with draining the reservoirs
         state = HD_POST_TREATMENT_PATIENT_DISCONNECTION_STATE;
-        doorClosedRequired( TRUE, TRUE );
+        doorClosedRequired( FALSE, FALSE );
+        setCurrentSubState( NO_SUB_STATE );
     }
 
     return state;
@@ -385,10 +386,6 @@
  *************************************************************************/
 static HD_POST_TREATMENT_STATE_T handlePostTreatmentPatientDisconnectionState( void )
 {
-    VALVE_T valve;
-
-    F32 bolusVol                    = getTreatmentParameterF32( TREATMENT_PARAM_HEPARIN_BOLUS_VOLUME );
-    F32 hepRate                     = getTreatmentParameterF32( TREATMENT_PARAM_HEPARIN_DISPENSE_RATE );
     HD_POST_TREATMENT_STATE_T state = HD_POST_TREATMENT_PATIENT_DISCONNECTION_STATE;
     OPN_CLS_STATE_T frontDoor       = getSwitchStatus( FRONT_DOOR );
     OPN_CLS_STATE_T pumpTrack       = getSwitchStatus( PUMP_TRACK_SWITCH );
@@ -406,22 +403,6 @@
         {
             patientDisconnectionConfirmed = FALSE;
             state                         = HD_POST_TREATMENT_DISPOSABLE_REMOVAL_STATE;
-
-            for ( valve = VDI; valve < NUM_OF_VALVES; valve++ )
-            {
-                setValvePosition( valve, VALVE_POSITION_A_INSERT_EJECT );
-            }
-
-            homeBloodPump();
-            homeDialInPump();
-            homeDialOutPump();
-
-            doorClosedRequired( FALSE, FALSE );
-
-            if ( ( bolusVol > 0.0 ) || ( hepRate > 0.0 ) )
-            {
-                retractSyringePump();
-            }
         }
     }
 
@@ -550,6 +531,7 @@
 
     if ( priorSubState != currentDrainReservoirState )
     {
+        setCurrentSubState( (U32)currentDrainReservoirState );
         SEND_EVENT_WITH_2_U32_DATA( HD_EVENT_SUB_STATE_CHANGE, priorSubState, currentDrainReservoirState );
     }
 }
@@ -582,6 +564,8 @@
         // Thereafter, check for time elapsed
         if ( TRUE == didTimeout( drainDGDePrimeStarttime, DIP_DRAIN_DG_RUNTIME_MS ) )
         {
+            VALVE_T valve;
+
             drainDGDePrimeActive = FALSE;
             signalDialInPumpHardStop( );
             if ( getDGOpMode() != DG_MODE_FAUL )
@@ -592,6 +576,19 @@
             {
                 state = DRAIN_RESERVOIR_COMPLETE_STATE;
             }
+            // home valves and pumps while front door is still closed.
+            homeBloodPump();
+            homeDialInPump();
+            homeDialOutPump();
+            for ( valve = VDI; valve < NUM_OF_VALVES; valve++ )
+            {
+                setValvePosition( valve, VALVE_POSITION_A_INSERT_EJECT );
+            }
+            if ( ( getTreatmentParameterF32( TREATMENT_PARAM_HEPARIN_BOLUS_VOLUME ) > 0.0 ) ||
+                 ( getTreatmentParameterF32( TREATMENT_PARAM_HEPARIN_DISPENSE_RATE ) > 0.0 ) )
+            {
+                retractSyringePump();
+            }
         }
     }