Index: firmware/App/Controllers/Heaters.c
===================================================================
diff -u -re8cd5cfca4acc41b33c012e4d8aa6e76f0c3c661 -r647ed0beef9e4aeefb3a0bc0267254dd36cfe685
--- firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision e8cd5cfca4acc41b33c012e4d8aa6e76f0c3c661)
+++ firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 647ed0beef9e4aeefb3a0bc0267254dd36cfe685)
@@ -390,7 +390,7 @@
         {
             startPrimaryHeater();
             state = PRIMARY_HEATERS_EXEC_STATE_CONTROL_TO_TARGET;
-            //temporaryStartROPump();
+            temporaryStartROPump();
             temporaryStartFan();
         }
         //state = PRIMARY_HEATERS_EXEC_STATE_CONTROL_TO_TARGET;
@@ -465,15 +465,15 @@
     state = TRIMMER_HEATER_EXEC_STATE_OFF;
     if ( TOGGLEPRIMAYHEATER() )
     {
-        setTrimmerHeaterTargetTemperature ( 37 );
+        setTrimmerHeaterTargetTemperature ( 38 );
         if ( getTemperatureValue ( TEMPSENSORS_OUTLET_REDUNDANCY_TEMP_SENSOR ) > 0 )
         {
             startTrimmerHeater();
             state = TRIMMER_HEATER_EXEC_STATE_CONTROL_TO_TARGET;
-            temporaryStartROPump();
-            temporaryStartFan();
+            //temporaryStartROPump();
+            //temporaryStartFan();
         }
-        state = TRIMMER_HEATER_EXEC_STATE_CONTROL_TO_TARGET;
+        //state = TRIMMER_HEATER_EXEC_STATE_CONTROL_TO_TARGET;
     }
     // TODO remove this code for testing
 
Index: firmware/App/Services/PIControllers.c
===================================================================
diff -u -rf068446fdb7889d320ddb6ffbd58f347ce0501e7 -r647ed0beef9e4aeefb3a0bc0267254dd36cfe685
--- firmware/App/Services/PIControllers.c	(.../PIControllers.c)	(revision f068446fdb7889d320ddb6ffbd58f347ce0501e7)
+++ firmware/App/Services/PIControllers.c	(.../PIControllers.c)	(revision 647ed0beef9e4aeefb3a0bc0267254dd36cfe685)
@@ -56,7 +56,8 @@
 {   // Kp   Ki  uMax  uMin  ref meas  err  esw esum ctrl
     { 0.0, 0.0,  1.0,  0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0 },  // PI_CONTROLLER_ID_ULTRAFILTRATION
     { 0.0, 0.0, 0.90, 0.10, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0 },  // PI_CONTROLLER_ID_BLOOD_FLOW
-    { 0.0, 0.0, 0.90, 0.10, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0 }   // PI_CONTROLLER_ID_DIALYSATE_FLOW
+    { 0.0, 0.0, 0.89, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0 },  // PI_CONTROLLER_ID_PRIMARY_HEATER
+    { 0.0, 0.0, 0.50, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0 }   // PI_CONTROLLER_ID_TRIMMER_HEATER
 };
 
 /**@}*/
Index: firmware/App/Tasks/TaskGeneral.c
===================================================================
diff -u -re8cd5cfca4acc41b33c012e4d8aa6e76f0c3c661 -r647ed0beef9e4aeefb3a0bc0267254dd36cfe685
--- firmware/App/Tasks/TaskGeneral.c	(.../TaskGeneral.c)	(revision e8cd5cfca4acc41b33c012e4d8aa6e76f0c3c661)
+++ firmware/App/Tasks/TaskGeneral.c	(.../TaskGeneral.c)	(revision 647ed0beef9e4aeefb3a0bc0267254dd36cfe685)
@@ -53,7 +53,7 @@
     execPrimaryHeaters();
 
     // Trimmer heater state machine
-    //execTrimmerHeater();
+    execTrimmerHeater();
 
     // toggle GPIO to indicate general task has executed
 //    gioToggleBit( gioPORTB, 1 );
Index: firmware/source/sys_main.c
===================================================================
diff -u -ref5ef16518466c92687b869cabfa16eaf3365dc0 -r647ed0beef9e4aeefb3a0bc0267254dd36cfe685
--- firmware/source/sys_main.c	(.../sys_main.c)	(revision ef5ef16518466c92687b869cabfa16eaf3365dc0)
+++ firmware/source/sys_main.c	(.../sys_main.c)	(revision 647ed0beef9e4aeefb3a0bc0267254dd36cfe685)
@@ -76,6 +76,7 @@
 #include "TemperatureSensors.h"
 #include "Timers.h"
 #include "WatchdogMgmt.h"
+#include "Heaters.h"
 
 static void initProcessor( void );
 static void initSoftware( void );
@@ -167,6 +168,7 @@
     initReservoirs();
     initOperationModes();
     initTemperatureSensors();
+    initHeaters();
 }
 
 /*************************************************************************