Index: firmware/App/DGCommon.h
===================================================================
diff -u -r97eb7ff2d2b3640ec1d8c80d3749a2741c2b308c -r860338e37f347cfd051bfe9dce0e42d9dac25c66
--- firmware/App/DGCommon.h	(.../DGCommon.h)	(revision 97eb7ff2d2b3640ec1d8c80d3749a2741c2b308c)
+++ firmware/App/DGCommon.h	(.../DGCommon.h)	(revision 860338e37f347cfd051bfe9dce0e42d9dac25c66)
@@ -25,7 +25,7 @@
 #define DG_VERSION_MAJOR        0
 #define DG_VERSION_MINOR        6
 #define DG_VERSION_MICRO        0
-#define DG_VERSION_BUILD        18
+#define DG_VERSION_BUILD        129
 
 // ********** build switches **********
 
Index: firmware/App/Modes/ModeFlush.c
===================================================================
diff -u -r8d6dcaa7735630d964c57be69dc0e7616559d2c6 -r860338e37f347cfd051bfe9dce0e42d9dac25c66
--- firmware/App/Modes/ModeFlush.c	(.../ModeFlush.c)	(revision 8d6dcaa7735630d964c57be69dc0e7616559d2c6)
+++ firmware/App/Modes/ModeFlush.c	(.../ModeFlush.c)	(revision 860338e37f347cfd051bfe9dce0e42d9dac25c66)
@@ -49,13 +49,13 @@
 #define DRAIN_WEIGHT_UNCHANGE_TIMEOUT               ( 6 * MS_PER_SECOND )                             ///< Time period of unchanged weight during draining before timeout.
 
 // Flush drain path state defines
-#define FLUSH_DRAIN_WAIT_TIME_MS                    ( 2 * MS_PER_SECOND )                             ///< Flush Drain path wait time in milliseconds. TODo it was 2 minutes
+#define FLUSH_DRAIN_WAIT_TIME_MS                    ( 2 * 60 * MS_PER_SECOND )                        ///< Flush Drain path wait time in milliseconds.
 
 // Flush dialysate state defines
-#define FLUSH_DIALYSATE_WAIT_TIME_MS                ( 0.5 * 60 * MS_PER_SECOND )                      ///< Flush dialysate wait time in milliseconds.
+#define FLUSH_DIALYSATE_WAIT_TIME_MS                ( 1 * 60 * MS_PER_SECOND )                        ///< Flush dialysate wait time in milliseconds.
 
 // Flush concentrate straws state defines
-#define FLUSH_CONCENTRATE_STRAWS_TIME_MS            ( 0.5 * 60 * MS_PER_SECOND )                      ///< Flush concentrate straws wait time in milliseconds. todo was 3 minutes
+#define FLUSH_CONCENTRATE_STRAWS_TIME_MS            ( 3 * 60 * MS_PER_SECOND )                        ///< Flush concentrate straws wait time in milliseconds.
 #define ACID_PUMP_SPEED_ML_PER_MIN                  -30.0                                             ///< Acid pump speed in mL/min.
 // The bicarb pump is 2% faster than the acid pump to create a flow from acid to bicarb line during flush
 #define BICARB_PUMP_SPEED_ML_PER_MIN                30.6                                              ///< Bicarb pump speed in mL/min.
@@ -302,6 +302,7 @@
 
     // Close VPi to prevent wasting water
     setValveState( VPI, VALVE_STATE_CLOSED );
+
     // Set the actuators to drain R1
     setValveState( VRD1, VALVE_STATE_OPEN );