Index: firmware/App/Monitors/Conductivity.c
===================================================================
diff -u -r8f59899872dd14f91e1cf07c1c51f24335287ad6 -rff3abe5d9c85e6c0431be7310ab771aebd9a8823
--- firmware/App/Monitors/Conductivity.c	(.../Conductivity.c)	(revision 8f59899872dd14f91e1cf07c1c51f24335287ad6)
+++ firmware/App/Monitors/Conductivity.c	(.../Conductivity.c)	(revision ff3abe5d9c85e6c0431be7310ab771aebd9a8823)
@@ -38,8 +38,8 @@
 #define FP_CONDUCTIVITY_DATA_PUBLISH_COUNTER_START_COUNT    41                                                          ///< Data publish counter start count.
 #define RO_DATA_PUBLISH_COUNTER_START_COUNT                 42                                                          ///< Data publish counter start count.
 #define RESISTANCE_DATA_PUBLISH_COUNTER_START_COUNT         43                                                          ///< Data publish counter start count.
-#define CONDUCTIVITY_SAMPLE_FILTER_MS           ( 50 )                                                                  ///< Filter conductivity data for given time. Currently set to have 5 samples over 3.5s ( 700ms sample rate )
-#define CONDUCTIVITY_TEMP_SAMPLE_FILTER_MS      ( 50 )                                                                  ///< Filter conductivity temperature data for given time. Currently set to have 5 samples over 3.5s ( 700ms sample rate )
+#define CONDUCTIVITY_SAMPLE_FILTER_MS           ( 30 )                                                                  ///< Filter conductivity data for given time. Currently set to have 5 samples over 3.5s ( 700ms sample rate )
+#define CONDUCTIVITY_TEMP_SAMPLE_FILTER_MS      ( 30 )                                                                  ///< Filter conductivity temperature data for given time. Currently set to have 5 samples over 3.5s ( 700ms sample rate )
 #define SIZE_OF_COND_ROLLING_AVG                ( CONDUCTIVITY_SAMPLE_FILTER_MS / TASK_PRIORITY_INTERVAL )              ///< Filtered conductivity moving average sample count.
 #define SIZE_OF_COND_TEMP_ROLLING_AVG           ( CONDUCTIVITY_TEMP_SAMPLE_FILTER_MS / TASK_PRIORITY_INTERVAL )         ///< Filtered conductivity temprature moving average sample count.
 #define RO_RR_MOVING_AVG_NUM_OF_SAMPLES         30                                                                      ///< RO rejection ratio moving average number of samples.