Index: firmware/App/Modes/ModePostTreat.c
===================================================================
diff -u -r6d500da57b7590f105f7b39261af4321998d2175 -rf5e2cabefb2f3d4757c150e9de136d5249b1e019
--- firmware/App/Modes/ModePostTreat.c	(.../ModePostTreat.c)	(revision 6d500da57b7590f105f7b39261af4321998d2175)
+++ firmware/App/Modes/ModePostTreat.c	(.../ModePostTreat.c)	(revision f5e2cabefb2f3d4757c150e9de136d5249b1e019)
@@ -75,8 +75,9 @@
 
 // ********** private function prototypes **********
 
-static HD_POST_TREATMENT_STATE_T handlePostTreatmentPatientDisconnectionState( void );
 static HD_POST_TREATMENT_STATE_T handlePostTreatmentDrainReservoirsState( void );
+static HD_POST_TREATMENT_STATE_T handlePostTreatmentPatientDisconnectionState( void );
+static HD_POST_TREATMENT_STATE_T handlePostTreatmentDisposableRemovalState( void );
 static HD_POST_TREATMENT_STATE_T handlePostTreatmentVerifyState( void );
 
 static void execDrainReservoirs( void );
@@ -157,12 +158,16 @@
 
     switch ( currentPostTreatmentState )
     {
+        case HD_POST_TREATMENT_DRAIN_RESERVOIRS_STATE:
+            currentPostTreatmentState = handlePostTreatmentDrainReservoirsState();
+            break;
+
         case HD_POST_TREATMENT_PATIENT_DISCONNECTION_STATE:
             currentPostTreatmentState = handlePostTreatmentPatientDisconnectionState();
             break;
 
-        case HD_POST_TREATMENT_DRAIN_RESERVOIRS_STATE:
-            currentPostTreatmentState = handlePostTreatmentDrainReservoirsState();
+        case HD_POST_TREATMENT_DISPOSABLE_REMOVAL_STATE:
+            currentPostTreatmentState = handlePostTreatmentDisposableRemovalState();
             break;
 
         case HD_POST_TREATMENT_VERIFY_STATE:
@@ -313,6 +318,28 @@
 
 /*********************************************************************//**
  * @brief
+ * The handlePostTreatmentDrainReservoirsState function executes drain reservoirs
+ * operation state machine and transition to next state once completed.
+ * @details Inputs: currentDrainReservoirState
+ * @details Outputs: executed drain reservoirs operation state machine.
+ * @return current state (sub-mode)
+ *************************************************************************/
+static HD_POST_TREATMENT_STATE_T handlePostTreatmentDrainReservoirsState( void )
+{
+    HD_POST_TREATMENT_STATE_T state = HD_POST_TREATMENT_DRAIN_RESERVOIRS_STATE;
+
+    execDrainReservoirs();
+
+    if ( DRAIN_COMPLETE_STATE == currentDrainReservoirState )
+    {
+        state = HD_POST_TREATMENT_PATIENT_DISCONNECTION_STATE;
+    }
+
+    return state;
+}
+
+/*********************************************************************//**
+ * @brief
  * The handlePostTreatmentPatientConnectionState function waits for user
  * confirms patient disconnection.
  * @details Inputs: none
@@ -334,12 +361,11 @@
         if ( TRUE == patientDisconnectionConfirmed )
         {
             patientDisconnectionConfirmed = FALSE;
-            state = HD_POST_TREATMENT_DRAIN_RESERVOIRS_STATE;
+            state = HD_POST_TREATMENT_DISPOSABLE_REMOVAL_STATE;
 
             for ( valve = VDI; valve < NUM_OF_VALVES; ++valve )
             {
                 setValvePosition( valve, VALVE_POSITION_A_INSERT_EJECT );
-                homeValve( valve );
             }
 
             homeBloodPump();
@@ -362,28 +388,24 @@
 
 /*********************************************************************//**
  * @brief
- * The handlePostTreatmentDrainReservoirsState function executes drain reservoirs
- * operation state machine and transition to next state once completed.
- * @details Inputs: currentDrainReservoirState
- * @details Outputs: executed drain reservoirs operation state machine.
+ * The handlePostTreatmentDisposableRemovalState function waits for user
+ * to confirm disposable removal.
+ * @details Inputs: disposableRemovalConfirmed
+ * @details Outputs: processed disposable removal confirmation
  * @return current state (sub-mode)
  *************************************************************************/
-static HD_POST_TREATMENT_STATE_T handlePostTreatmentDrainReservoirsState( void )
+static HD_POST_TREATMENT_STATE_T handlePostTreatmentDisposableRemovalState( void )
 {
-    HD_POST_TREATMENT_STATE_T state = HD_POST_TREATMENT_DRAIN_RESERVOIRS_STATE;
+    HD_POST_TREATMENT_STATE_T state = HD_POST_TREATMENT_DISPOSABLE_REMOVAL_STATE;
 
-    execDrainReservoirs();
-
-    if ( DRAIN_COMPLETE_STATE == currentDrainReservoirState )
-    {
 #ifdef SKIP_UI_INTERACTION
-        disposableRemovalConfirmed = TRUE;
+    disposableRemovalConfirmed = TRUE;
 #endif
-        if ( TRUE == disposableRemovalConfirmed )
-        {
-            disposableRemovalConfirmed = FALSE;
-            state = HD_POST_TREATMENT_VERIFY_STATE;
-        }
+
+    if ( TRUE == disposableRemovalConfirmed )
+    {
+        disposableRemovalConfirmed = FALSE;
+        state = HD_POST_TREATMENT_VERIFY_STATE;
     }
 
     return state;
@@ -509,8 +531,13 @@
 
     if ( ( DG_MODE_GENE == getDGOpMode() ) && ( DG_GEN_IDLE_MODE_STATE_FLUSH_WATER == getDGSubMode() ) )
     {
-        state = DRAIN_FIRST_RESERVOIR_STATE;
-        cmdStartDGDrain( DRAIN_RESERVOIR_TO_VOLUME_ML, TRUE );
+        cmdSetDGActiveReservoir( DG_RESERVOIR_1 );
+
+        if ( TRUE == hasDGCompletedReservoirSwitch() )
+        {
+            state = DRAIN_FIRST_RESERVOIR_STATE;
+            cmdStartDGDrain( DRAIN_RESERVOIR_TO_VOLUME_ML, TRUE );
+        }
     }
 
     return state;