Index: firmware/App/Drivers/ConductivitySensors.c
===================================================================
diff -u -r8f59899872dd14f91e1cf07c1c51f24335287ad6 -rff3abe5d9c85e6c0431be7310ab771aebd9a8823
--- firmware/App/Drivers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision 8f59899872dd14f91e1cf07c1c51f24335287ad6)
+++ firmware/App/Drivers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision ff3abe5d9c85e6c0431be7310ab771aebd9a8823)
@@ -52,7 +52,7 @@
 
 #define MAX_CONDUCTIVITY_SENSOR_FAILURES                    2                                           ///< Number of failures before alarming in timed window count.
 #define MAX_CONDUCTIVITY_SENSOR_FAILURE_WINDOW_MS           ( 60 * MS_PER_SECOND )                      ///< Set time for timed window count.
-#define MAX_ALLOWED_UNCHANGED_CONDUCTIVITY_READS            ( 500 / TASK_PRIORITY_INTERVAL )            ///< New reading every 333ms, expect to get valid new reading in 500ms.
+#define MAX_ALLOWED_UNCHANGED_CONDUCTIVITY_READS            ( 800 / TASK_PRIORITY_INTERVAL )            ///< New reading every 333ms, expect to get valid new reading in 500ms.
 #define COND_SENSORS_FPGA_ERROR_TIMEOUT_MS                  ( 2 * MS_PER_SECOND )                       ///< Conductivity sensors FPGA error timeout in milliseconds.
 #define COND_SENSORS_READ_ERR_MAX_CNT                       255                                         ///< Conductivity sensors read and error count max value.
 
@@ -124,7 +124,6 @@
  *************************************************************************/
 void initConductivitySensors( void )
 {
-    /// TODO: Revert back to init state.
     currentConductivityState = CONDUCTIVITY_INIT_STATE;
     CONDUCTIVITY_SENSORS_T sensor;
 
@@ -195,6 +194,7 @@
     initFPGAPersistentAlarm( FPGA_PERS_ERROR_D74_COND_SENSOR, ALARM_ID_DD_D74_COND_SENSOR_FPGA_FAULT, COND_SENSORS_FPGA_ERROR_TIMEOUT_MS, COND_SENSORS_FPGA_ERROR_TIMEOUT_MS );
     initFPGAPersistentAlarm( FPGA_PERS_ERROR_P9_COND_SENSOR, ALARM_ID_FP_P9_COND_SENSOR_FPGA_FAULT, COND_SENSORS_FPGA_ERROR_TIMEOUT_MS, COND_SENSORS_FPGA_ERROR_TIMEOUT_MS );
     initFPGAPersistentAlarm( FPGA_PERS_ERROR_P18_COND_SENSOR, ALARM_ID_FP_P18_COND_SENSOR_FPGA_FAULT, COND_SENSORS_FPGA_ERROR_TIMEOUT_MS, COND_SENSORS_FPGA_ERROR_TIMEOUT_MS );
+
 }
 
 /*********************************************************************//**
@@ -980,6 +980,7 @@
         alpha = conductivitySensorCoefficients[ sensorNum ].alpha_high;
         k = conductivitySensorCoefficients[ sensorNum ].K_high;
     }
+
     calculateResistance( sensorNum, isFPSensor );
     calculateTemperature( sensorNum );
 
@@ -1295,4 +1296,5 @@
     return result;
 }
 
+
 /**@}*/
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.