diff --git a/ESPIron/heater.cpp b/ESPIron/heater.cpp
index 3a36417..6152aaf 100644
--- a/ESPIron/heater.cpp
+++ b/ESPIron/heater.cpp
@@ -94,7 +94,6 @@ void TipHeater::_evt_picker(esp_event_base_t base, int32_t id, void* data){
     case evt::iron_t::heaterTargetT : {
       // change heater temp
       setTargetTemp(*reinterpret_cast<int32_t*>(data));
-      LOGD(T_HEAT, printf, "set target T:%d\n", _t.target);
       return;
     }
 
@@ -127,6 +126,10 @@ void TipHeater::_evt_picker(esp_event_base_t base, int32_t id, void* data){
   }
 }
 
+void TipHeater::setTargetTemp(int32_t t){
+  _t.target = t;
+  LOGD(T_HEAT, printf, "set target T:%d\n", _t.target);
+};
 
 void TipHeater::_start_runner(){
   // Prepare and then apply the LEDC PWM timer configuration
diff --git a/ESPIron/heater.hpp b/ESPIron/heater.hpp
index aa51fd0..f2d4cd0 100644
--- a/ESPIron/heater.hpp
+++ b/ESPIron/heater.hpp
@@ -121,7 +121,7 @@ class TipHeater {
    * 
    * @param t 
    */
-  void setTargetTemp(int32_t t){ _t.target = t; };
+  void setTargetTemp(int32_t t);
 
   /**
    * @brief Get the Target heater temperature
diff --git a/ESPIron/hid.cpp b/ESPIron/hid.cpp
index b3ff7a4..a5a97e5 100644
--- a/ESPIron/hid.cpp
+++ b/ESPIron/hid.cpp
@@ -325,6 +325,9 @@ ViSet_MainScreen::ViSet_MainScreen(GPIOButton<ESPEventPolicy> &button, PseudoRot
   encdr.setCounter(TEMP_DEFAULT, TEMP_STEP, TEMP_MIN, TEMP_MAX);
   encdr.setMultiplyFactor(2);
 
+  // load configured temperatures
+  nvs_blob_read(T_IRON, T_temperatures, static_cast<void*>(&_temp), sizeof(Temperatures));
+
   // request working temperature from IronController
   EVT_POST(IRON_GET_EVT, e2int(iron_t::workTemp));
 }
@@ -491,12 +494,14 @@ void ViSet_MainScreen::_evt_notify(int32_t id, void* data){
 }
 
 void ViSet_MainScreen::_evt_cmd(int32_t id, void* data){
+/*  not used currently
   switch(static_cast<evt::iron_t>(id)){
     case evt::iron_t::workTemp :
       _temp.working = *reinterpret_cast<int32_t*>(data);
       encdr.setCounter(_temp.working, TEMP_STEP, TEMP_MIN, TEMP_MAX);
     break;
   }
+*/
 }
 
 void ViSet_MainScreen::_evt_state(int32_t id, void* data){
diff --git a/ESPIron/ironcontroller.cpp b/ESPIron/ironcontroller.cpp
index d7527c6..f2a14fc 100644
--- a/ESPIron/ironcontroller.cpp
+++ b/ESPIron/ironcontroller.cpp
@@ -142,7 +142,7 @@ void IronController::_mode_switcher(){
         _state = ironState_t::standby;
         LOGI(T_CTRL, printf, "Engage standby mode due to sleep timeout of %u ms. Temp:%u\n", _timeout.standby, _temp.standby);
         // switch heater temperature to standby value
-        EVT_POST_DATA(IRON_SET_EVT, e2int(iron_t::heaterTargetT), &_temp.standby, sizeof(_temp.standby));
+        EVT_POST_DATA(IRON_HEATER, e2int(iron_t::heaterTargetT), &_temp.standby, sizeof(_temp.standby));
         // notify other componets that we are switching to 'standby' mode
         EVT_POST(IRON_NOTIFY, e2int(iron_t::stateStandby));
       }
@@ -156,13 +156,18 @@ void IronController::_mode_switcher(){
         LOGI(T_CTRL, printf, "Engage idle mode due to idle timeout of %u ms\n", _timeout.idle);
         // notify other componets that we are switching to 'idle' mode
         EVT_POST(IRON_NOTIFY, e2int(iron_t::stateIdle));
+        // disable heater
+        EVT_POST(IRON_HEATER, e2int(iron_t::heaterDisable));
       } else if (pdTICKS_TO_MS(xTaskGetTickCount()) - pdTICKS_TO_MS(_xTicks.motion) < _timeout.standby){
         // standby cancelled
         _state = ironState_t::working;
         LOGI(T_CTRL, println, "cancel Standby mode");
         // notify other componets that we are switching to 'work' mode
         EVT_POST(IRON_NOTIFY, e2int(iron_t::stateWorking));
-        EVT_POST_DATA(IRON_SET_EVT, e2int(iron_t::heaterTargetT), &_temp.working, sizeof(_temp.working));
+        // switch on heater
+        EVT_POST(IRON_HEATER, e2int(iron_t::heaterEnable));
+        // set target T for heater
+        EVT_POST_DATA(IRON_HEATER, e2int(iron_t::heaterTargetT), &_temp.working, sizeof(_temp.working));
       }
       return;
     }
@@ -197,6 +202,8 @@ void IronController::_mode_switcher(){
         // notify other componets that we are switching to 'working' mode
         EVT_POST(IRON_NOTIFY, e2int(iron_t::stateWorking));
         LOGI(T_CTRL, printf, "Engage work mode due to boost timeout of %u ms\n", _timeout.boost);
+        // set target T for heater
+        EVT_POST_DATA(IRON_HEATER, e2int(iron_t::heaterTargetT), &_temp.working, sizeof(_temp.working));
       } else {
         // send notification with time left till boost is disabled (in seconds)
         unsigned time_left = _timeout.boost - t; 
@@ -287,7 +294,7 @@ void IronController::_evt_commands(esp_event_base_t base, int32_t id, void* data
           EVT_POST_DATA(IRON_NOTIFY, e2int(iron_t::stateBoost), &_timeout.boost, sizeof(_timeout.boost));
           // set heater to boost temperature
           int32_t t = _temp.working + _temp.boost;
-          EVT_POST_DATA(IRON_SET_EVT, e2int(iron_t::heaterTargetT), &t, sizeof(t));
+          EVT_POST_DATA(IRON_HEATER, e2int(iron_t::heaterTargetT), &t, sizeof(t));
           _xTicks.boost = xTaskGetTickCount();
           break;
         }
@@ -298,7 +305,7 @@ void IronController::_evt_commands(esp_event_base_t base, int32_t id, void* data
           // notify other components
           LOGI(T_CTRL, println, "switch to Work mode");
           EVT_POST(IRON_NOTIFY, e2int(iron_t::stateWorking));
-          EVT_POST_DATA(IRON_SET_EVT, e2int(iron_t::heaterTargetT), &_temp.working, sizeof(_temp.working));
+          EVT_POST_DATA(IRON_HEATER, e2int(iron_t::heaterTargetT), &_temp.working, sizeof(_temp.working));
           break;
       }
       break;
@@ -327,7 +334,7 @@ void IronController::_evt_commands(esp_event_base_t base, int32_t id, void* data
           nvs_blob_write(T_IRON, T_temperatures, static_cast<void*>(&_temp), sizeof(Temperatures));
       }
       if (_state == ironState_t::working)
-        EVT_POST_DATA(IRON_SET_EVT, e2int(iron_t::heaterTargetT), &_temp.working, sizeof(_temp.working));
+        EVT_POST_DATA(IRON_HEATER, e2int(iron_t::heaterTargetT), &_temp.working, sizeof(_temp.working));
       break;
     }