Index: firmware/App/Monitors/Conductivity.c
===================================================================
diff -u -r61a53c2d8fea7cf4e7f2aa90bbe341edee8a69d9 -rd7abd9c0c214ec3b7704e7f89b6de83c341b9b0e
--- firmware/App/Monitors/Conductivity.c	(.../Conductivity.c)	(revision 61a53c2d8fea7cf4e7f2aa90bbe341edee8a69d9)
+++ firmware/App/Monitors/Conductivity.c	(.../Conductivity.c)	(revision d7abd9c0c214ec3b7704e7f89b6de83c341b9b0e)
@@ -178,17 +178,8 @@
 #ifdef __TEENSY_CONDUCTIVITY_DRIVER__
     execConductivityTeensy();
 #else
-    readConductivitySensorData();
+    execConductivitySensors();
 #endif
-    //control conductivity sensor
-    // TODO : need more clarity on why and when to execute following control.
-#if 0
-    handleConductivitySensorsReset();
-    handleConductivitySensorsInitProcedure();
-    execConductivitySensorWrite();
-    execConductivitySensorRead();
-#endif
-
     filterConductivitySensors();
     calcRORejectionRatio();     // TODO: should this be called here or inside filter function
     filterRORejectionRatioReadings();
@@ -276,8 +267,8 @@
         {
             filteredConductivityReadings[ sensor ].conductivityReadingsTotal -= filteredConductivityReadings[ sensor ].conductivityReadings[ filteredConductivityReadings[ sensor ].conductivityReadingsIdx ];
         }
-        filteredConductivityReadings[ sensor ].conductivityReadings[ filteredConductivityReadings[ sensor ].conductivityReadingsIdx ] = rawCond;
-        filteredConductivityReadings[ sensor ].conductivityReadingsTotal += rawCond;
+        filteredConductivityReadings[ sensor ].conductivityReadings[ filteredConductivityReadings[ sensor ].conductivityReadingsIdx ] = calculatedConductivity;
+        filteredConductivityReadings[ sensor ].conductivityReadingsTotal += calculatedConductivity;
         filteredConductivityReadings[ sensor ].conductivityReadingsIdx = INC_WRAP( filteredConductivityReadings[ sensor ].conductivityReadingsIdx, 0, SIZE_OF_FLOW_ROLLING_AVG - 1 );
         filteredConductivityReadings[ sensor ].conductivityReadingsCount = INC_CAP( filteredConductivityReadings[ sensor ].conductivityReadingsCount, SIZE_OF_FLOW_ROLLING_AVG );
         filteredcurrentConductivityReadings[ sensor ].data = filteredConductivityReadings[ sensor ].conductivityReadingsTotal / (F32)filteredConductivityReadings[ sensor ].conductivityReadingsCount;
@@ -348,8 +339,8 @@
         {
             filteredConductivityTemperatureReadings[sensor].conductivityTempReadingsTotal -= filteredConductivityTemperatureReadings[sensor].conductivityTempReadings[ filteredConductivityTemperatureReadings[sensor].conductivityTempReadingsIdx ];
         }
-        filteredConductivityTemperatureReadings[sensor].conductivityTempReadings[ filteredConductivityTemperatureReadings[sensor].conductivityTempReadingsIdx ] = rawTemp;
-        filteredConductivityTemperatureReadings[sensor].conductivityTempReadingsTotal += rawTemp;
+        filteredConductivityTemperatureReadings[sensor].conductivityTempReadings[ filteredConductivityTemperatureReadings[sensor].conductivityTempReadingsIdx ] = calculatedTemperature;
+        filteredConductivityTemperatureReadings[sensor].conductivityTempReadingsTotal += calculatedTemperature;
         filteredConductivityTemperatureReadings[sensor].conductivityTempReadingsIdx = INC_WRAP( filteredConductivityTemperatureReadings[sensor].conductivityTempReadingsIdx, 0, SIZE_OF_FLOW_ROLLING_AVG - 1 );
         filteredConductivityTemperatureReadings[sensor].conductivityTempReadingsCount = INC_CAP( filteredConductivityTemperatureReadings[sensor].conductivityTempReadingsCount, SIZE_OF_FLOW_ROLLING_AVG );
         filteredcurrentTemperatureReadings[sensor].data = filteredConductivityTemperatureReadings[sensor].conductivityTempReadingsTotal / (F32)filteredConductivityTemperatureReadings[sensor].conductivityTempReadingsCount;