Index: firmware/App/Tasks/TaskGeneral.c
===================================================================
diff -u -ra504d6899e709d7432af9c055db1bd1fe340d032 -r3cc737c39b4440e18abab95ef2f8b6aef13acba9
--- firmware/App/Tasks/TaskGeneral.c	(.../TaskGeneral.c)	(revision a504d6899e709d7432af9c055db1bd1fe340d032)
+++ firmware/App/Tasks/TaskGeneral.c	(.../TaskGeneral.c)	(revision 3cc737c39b4440e18abab95ef2f8b6aef13acba9)
@@ -53,11 +53,14 @@
     // manage drain pump
     execDrainPumpController();
 
-    // manage heaters
-    execPrimaryHeaters();
-
     // manage time-based reservoir tasks
     execReservoirs();
+
+    // Primary heaters state machine
+    execPrimaryHeaters();
+
+    // Trimmer heater state machine
+    execTrimmerHeater();
 #endif
     // run operation mode state machine
     execOperationModes();
@@ -84,12 +87,6 @@
     // manage data to be transmitted to other sub-systems
     execSystemCommTx();
 
-    // Primary heaters state machine
-    execPrimaryHeaters();
-
-    // Trimmer heater state machine
-    execTrimmerHeater();
-
     // toggle GPIO to indicate general task has executed
 //    gioToggleBit( gioPORTB, 1 );
 }