Index: firmware/App/Modes/FPModes/ModeGenPermeate.c
===================================================================
diff -u -r4626638b758c6673c0a8a3cc8d008bb4a898cea9 -r10235e1fe9bc5e66ed87d799360f47d9a50cce3d
--- firmware/App/Modes/FPModes/ModeGenPermeate.c	(.../ModeGenPermeate.c)	(revision 4626638b758c6673c0a8a3cc8d008bb4a898cea9)
+++ firmware/App/Modes/FPModes/ModeGenPermeate.c	(.../ModeGenPermeate.c)	(revision 10235e1fe9bc5e66ed87d799360f47d9a50cce3d)
@@ -49,10 +49,10 @@
 #define MIN_SAMPLES_NEEDED_FOR_DUTY_CYCLE_AVG        10                                           ///< Minimum number for samples needed for calculating the average duty cycle
 #define MIN_RO_PUMP_DUTY_CYCLE                       0.5                                          ///< Minimum RO pump duty cycle to start in fill/full state
 #define PERMEATE_FLOW_OUT_OF_RANGE_TIMEOUT_MS        ( 12 * MS_PER_SECOND )                       ///< Permeate flow low tolerance out of range timeout
-#define PERMEATE_TANK_EMPTY_LEVEL_VOL_ML             0                                            ///< Permeate tank volume in empty level ( in ml )
-#define PERMEATE_TANK_LOW_LEVEL_VOL_ML               957                                          ///< Permeate tank volume in low level ( in ml )
-#define PERMEATE_TANK_HIGH_LEVEL_VOL_ML              1345                                         ///< Permeate tank volume in high level ( in ml )
-#define PERMEATE_TANK_FULL_LEVEL_VOL_ML              1532                                         ///< Permeate tank volume in full level ( in ml )
+#define PERMEATE_TANK_EMPTY_LEVEL_VOL_ML             1460                                         ///< Permeate tank volume in empty level ( in ml )
+#define PERMEATE_TANK_LOW_LEVEL_VOL_ML               1520                                         ///< Permeate tank volume in low level ( in ml )
+#define PERMEATE_TANK_HIGH_LEVEL_VOL_ML              2370                                         ///< Permeate tank volume in high level ( in ml )
+#define PERMEATE_TANK_FULL_LEVEL_VOL_ML              2580                                         ///< Permeate tank volume in full level ( in ml )
 #define RINSE_PUMP_TARGET_FLOW                       228.89                                       ///< Rinse pump rate
 
 // ********** private data **********
Index: firmware/App/Modes/FPModes/ModePreGenPermeateDefeatured.c
===================================================================
diff -u -r5514c6bf48facd532e58b0790d9f02aaa6776b28 -r10235e1fe9bc5e66ed87d799360f47d9a50cce3d
--- firmware/App/Modes/FPModes/ModePreGenPermeateDefeatured.c	(.../ModePreGenPermeateDefeatured.c)	(revision 5514c6bf48facd532e58b0790d9f02aaa6776b28)
+++ firmware/App/Modes/FPModes/ModePreGenPermeateDefeatured.c	(.../ModePreGenPermeateDefeatured.c)	(revision 10235e1fe9bc5e66ed87d799360f47d9a50cce3d)
@@ -36,7 +36,7 @@
 
 #define PRE_GEN_DEF_PERMEATE_DATA_PUBLISH_INTERVAL     ( MS_PER_SECOND / TASK_GENERAL_INTERVAL )   ///< Interval (ms/task time) at which the gen permeate mode data published.
 #define PRE_GEN_DEF_FLUSH_TIMEOUT_MS                   ( 30 * MS_PER_SECOND )
-#define PRE_GEN_DEF_WATER_CHECK_TIMEOUT_MS             ( 10 * MS_PER_SECOND )
+#define PRE_GEN_DEF_WATER_CHECK_TIMEOUT_MS             ( 15 * MS_PER_SECOND )
 
 // ********** private data **********
 
Index: firmware/App/Monitors/WaterQualityMonitor.c
===================================================================
diff -u -r64e076ffa5110ab19e71dc3d3e126ce13e3fe2b8 -r10235e1fe9bc5e66ed87d799360f47d9a50cce3d
--- firmware/App/Monitors/WaterQualityMonitor.c	(.../WaterQualityMonitor.c)	(revision 64e076ffa5110ab19e71dc3d3e126ce13e3fe2b8)
+++ firmware/App/Monitors/WaterQualityMonitor.c	(.../WaterQualityMonitor.c)	(revision 10235e1fe9bc5e66ed87d799360f47d9a50cce3d)
@@ -43,10 +43,10 @@
 
 #define MAX_INLET_RO_PUMP_PRESSURE_WARNING_HIGH_PSIG                 140.0F                                                  ///< Maximum allowed Input warning pressure to the RO membrane.
 #define MAX_INLET_RO_PUMP_PRESSURE_WARNING_LOW_PSIG                  88.0F                                                   ///< Minimum Input warning pressure to the RO membrane.
-#define MIN_INLET_WATER_PRESSURE_WARNING_LOW_PSIG                    25.0F                                                   ///< Minimum allowed M3 Input warning low pressure value in psig for RO featured.
+#define MIN_INLET_WATER_PRESSURE_WARNING_LOW_PSIG                    20.0F                                                   ///< Minimum allowed M3 Input warning low pressure value in psig for RO featured.
 #define MAX_INLET_WATER_PRESSURE_WARNING_HIGH_PSIG                   40.0F                                                   ///< Maximum allowed M3 Input warning high pressure value in psig for RO featured.
 #define MAX_INLET_WATER_PRESSURE_FAULT_HIGH_PSIG                     75.0F                                                   ///< Maximum allowed M3 Input fault high pressure value in psig for RO featured.
-#define MIN_INLET_WATER_PRESSURE_PSIG                                1.0F                                                    ///< Minimum allowed P8 Input fault pressure value in psig for RO featured.
+#define MIN_INLET_WATER_PRESSURE_PSIG                                -2.0F                                                   ///< Minimum allowed P8 Input fault pressure value in psig for RO featured.
 #define MIN_INLET_WATER_PRESSURE_DEFEATURED_WARNING_LOW_PSIG         5.0F                                                    ///< Minimum allowed M3 Input warning low pressure value in psig for RO Defeatured.
 #define MAX_INLET_WATER_PRESSURE_DEFEATURED_WARNING_HIGH_PSIG        10.0F                                                   ///< Maximum allowed M3 Input warning high pressure value in psig for RO Defeatured.
 #define MAX_INLET_WATER_PRESSURE_DEFEATURED_FAULT_HIGH_PSIG          40.0F                                                   ///< Maximum allowed M3 Input fault high pressure value in psig for RO Defeatured.