Index: firmware/App/Drivers/ConductivityTeensy.c
===================================================================
diff -u -re78ed64da7270eb6c814db811e98d7f91f01e2ad -r37e25a996fb9e77c50979ae9007be54040376957
--- firmware/App/Drivers/ConductivityTeensy.c	(.../ConductivityTeensy.c)	(revision e78ed64da7270eb6c814db811e98d7f91f01e2ad)
+++ firmware/App/Drivers/ConductivityTeensy.c	(.../ConductivityTeensy.c)	(revision 37e25a996fb9e77c50979ae9007be54040376957)
@@ -2054,7 +2054,7 @@
                                ( B1 * ( ( 100 * log( Z ) ) / R ) ) +
                                  B0
                              );
-
+    calculatedConductivity = calculatedConductivity * COND_CONVERSION_SM_TO_USCM;
     condCalculatedMeasurement[ sensorNum ].Conductivity.data = calculatedConductivity;
 }
 
@@ -2087,9 +2087,9 @@
     calculateResistance( sensorNum, isFPSensor );
     calculateTemperature( sensorNum );
 
-    calculatedConductivity = ( ( k / getTeensyConductivityResistanceValue( sensorNum ) ) *
-                               ( 1 + alpha * ( COND_TEMP_OFFSET - getTeensyConductivityTemperatureValue( sensorNum ) ) ) );
-    condCalculatedMeasurement[ sensorNum ].Conductivity.data = calculatedConductivity;
+    calculatedConductivity = ( ( k / condCalculatedMeasurement[ sensorNum ].Resistance.data ) *
+                               ( 1 + ( alpha * ( COND_TEMP_OFFSET - condCalculatedMeasurement[ sensorNum ].Temperature.data ) ) ) );
+    calculatedConductivity = calculatedConductivity * COND_CONVERSION_SM_TO_USCM;
 }
 
 /*********************************************************************//**
@@ -2130,7 +2130,7 @@
     calculateTemperature( sensorNum );
 
     calculatedConductivity = ( ( k / R ) *
-                               ( 1 + alpha * ( COND_TEMP_OFFSET - getTeensyConductivityTemperatureValue( sensorNum ) ) ) );
+                               ( 1 + ( alpha * ( COND_TEMP_OFFSET - condCalculatedMeasurement[ sensorNum ].Temperature.data ) ) ) );
 
     calculatedConductivity = calculatedConductivity * COND_CONVERSION_SM_TO_USCM;
     condCalculatedMeasurement[ sensorNum ].Conductivity.data = calculatedConductivity;