Index: firmware/App/Drivers/ConductivityTeensy.c
===================================================================
diff -u -r4dd3ecab3dfd82b339e4e8575e672b6dd88554e7 -r614a58c1d55d79e47329adb7e191d8cc9c681c72
--- firmware/App/Drivers/ConductivityTeensy.c	(.../ConductivityTeensy.c)	(revision 4dd3ecab3dfd82b339e4e8575e672b6dd88554e7)
+++ firmware/App/Drivers/ConductivityTeensy.c	(.../ConductivityTeensy.c)	(revision 614a58c1d55d79e47329adb7e191d8cc9c681c72)
@@ -103,8 +103,8 @@
 static COND_EEPROM_DATA_T eePromDataTX;                                                ///< Transmitted EEPROM data to Teensy for update EEPROM cmd.
 static COND_MEASUREMENT_SETTINGS_T measurementSettingsTX;                              ///< Transmitted measurement settings to Teensy for update measurement settings cmd.
 static COND_MEASUREMENT_SETTINGS_T measurementSettingsRX;                              ///< Received measurement settings by get measurement settings cmd.
-static COND_MODELS_T currentConductivityModel;
-static BOOL eepromInit;
+static COND_MODELS_T currentConductivityModel;                                         ///< Current Conductivity Model selected.
+static BOOL eepromInit;                                                                ///< Boolean to determine if we are loading eeprom data from sensors.
 
 // Command Map
 static const COND_CMD_DATA_T teensyCmdMap[] = {
@@ -497,7 +497,7 @@
             state = txSelectSensor();
             break;
         default:
-            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_TEENSY_CONDUCTIVITY_SENOR_INVALID_STATE, currentCmd )
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_CONDUCTIVITY_SENOR_INVALID_STATE, currentCmd )
             break;
     }
 
@@ -553,7 +553,7 @@
             state = rxSelectSensor();
             break;
         default:
-            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_TEENSY_CONDUCTIVITY_SENOR_INVALID_STATE, currentCmd )
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_CONDUCTIVITY_SENOR_INVALID_STATE, currentCmd )
             break;
 
     }
@@ -598,7 +598,7 @@
         case TEENSY_CMD_SELECT_SENSOR:
             break;
         default:
-            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_TEENSY_CONDUCTIVITY_SENOR_INVALID_STATE, currentCmd )
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_CONDUCTIVITY_SENOR_INVALID_STATE, currentCmd )
             break;
     }
 
Index: firmware/App/Drivers/ConductivityTeensy.h
===================================================================
diff -u -r4dd3ecab3dfd82b339e4e8575e672b6dd88554e7 -r614a58c1d55d79e47329adb7e191d8cc9c681c72
--- firmware/App/Drivers/ConductivityTeensy.h	(.../ConductivityTeensy.h)	(revision 4dd3ecab3dfd82b339e4e8575e672b6dd88554e7)
+++ firmware/App/Drivers/ConductivityTeensy.h	(.../ConductivityTeensy.h)	(revision 614a58c1d55d79e47329adb7e191d8cc9c681c72)
@@ -121,6 +121,7 @@
     COND_MST_STATUS_SUCCESS
 } COND_UPDATE_MST_STATUS_T;
 
+/// Enumeration of Conductivity models
 typedef enum Conductivity_Models
 {
     STANDARD,                                         ///< standard equation for conductivity
Index: firmware/App/Monitors/Conductivity.c
===================================================================
diff -u -rff82c2f697e729f16098416acad3d98e337a38cd -r614a58c1d55d79e47329adb7e191d8cc9c681c72
--- firmware/App/Monitors/Conductivity.c	(.../Conductivity.c)	(revision ff82c2f697e729f16098416acad3d98e337a38cd)
+++ firmware/App/Monitors/Conductivity.c	(.../Conductivity.c)	(revision 614a58c1d55d79e47329adb7e191d8cc9c681c72)
@@ -102,8 +102,11 @@
 {
     CONDUCTIVITY_SENSORS_T sensor;
 
-    //initConductivitySensors();
+#ifdef __TEENSY_CONDUCTIVITY_DRIVER__
     initConductivityTeensy();
+#else
+    initConductivitySensors();
+#endif
 
     ddConductivityPublishTimerCounter = DATA_PUBLISH_COUNTER_START_COUNT;
     fpConductivityPublishTimerCounter = DATA_PUBLISH_COUNTER_START_COUNT;
@@ -176,7 +179,6 @@
     execConductivityTeensy();
 #else
     readConductivitySensors();
-
 #endif
     //control conductivity sensor
     // TODO : need more clarity on why and when to execute following control.
Index: firmware/App/Services/AlarmMgmtSWFaults.h
===================================================================
diff -u -r4dd3ecab3dfd82b339e4e8575e672b6dd88554e7 -r614a58c1d55d79e47329adb7e191d8cc9c681c72
--- firmware/App/Services/AlarmMgmtSWFaults.h	(.../AlarmMgmtSWFaults.h)	(revision 4dd3ecab3dfd82b339e4e8575e672b6dd88554e7)
+++ firmware/App/Services/AlarmMgmtSWFaults.h	(.../AlarmMgmtSWFaults.h)	(revision 614a58c1d55d79e47329adb7e191d8cc9c681c72)
@@ -148,7 +148,7 @@
     SW_FAULT_ID_VOLTAGES_INVALID_SIGNAL = 117,
     SW_FAULT_ID_RINSE_PUMP_INVALID_EXEC_STATE = 118,
     SW_FAULT_ID_RINSE_PUMP_INVALID_STATE1 = 119,
-    SW_FAULT_ID_TEENSY_CONDUCTIVITY_SENOR_INVALID_STATE = 120,
+    SW_FAULT_ID_CONDUCTIVITY_SENOR_INVALID_STATE = 120,
     NUM_OF_SW_FAULT_IDS
 } DD_SW_FAULT_ID_T;