diff --git a/mission/devices/HeaterHandler.cpp b/mission/devices/HeaterHandler.cpp
index 3c25eb6a..17bdf640 100644
--- a/mission/devices/HeaterHandler.cpp
+++ b/mission/devices/HeaterHandler.cpp
@@ -321,6 +321,10 @@ HeaterHandler::SwitchState HeaterHandler::checkSwitchState(heater::Switchers swi
   return heaterVec.at(switchNr).switchState;
 }
 
+ReturnValue_t HeaterHandler::switchHeater(heater::Switchers heater, ReturnValue_t onOff) {
+	return sendSwitchCommand(heater, onOff);
+}
+
 bool HeaterHandler::allSwitchesOff() {
   bool allSwitchesOrd = false;
   MutexGuard mg(heaterMutex);
diff --git a/mission/devices/HeaterHandler.h b/mission/devices/HeaterHandler.h
index b63f4dfe..dce6454a 100644
--- a/mission/devices/HeaterHandler.h
+++ b/mission/devices/HeaterHandler.h
@@ -40,6 +40,7 @@ class HeaterHandler : public ExecutableObjectIF,
                       public PowerSwitchIF,
                       public SystemObject,
                       public HasActionsIF {
+	friend class ThermalController;
  public:
   static const uint8_t INTERFACE_ID = CLASS_ID::HEATER_HANDLER;
 
@@ -59,6 +60,8 @@ class HeaterHandler : public ExecutableObjectIF,
 
   virtual ~HeaterHandler();
 
+protected:
+  ReturnValue_t switchHeater(heater::Switchers heater, ReturnValue_t onOff);
   ReturnValue_t performOperation(uint8_t operationCode = 0) override;
 
   ReturnValue_t sendSwitchCommand(uint8_t switchNr, ReturnValue_t onOff) override;
diff --git a/tmtc b/tmtc
index 66a1362e..d5813e1a 160000
--- a/tmtc
+++ b/tmtc
@@ -1 +1 @@
-Subproject commit 66a1362e7e977e427a66fd3176a9e7b6bc1b5998
+Subproject commit d5813e1a422beae7d0cb092a885e0956e9f1ddc1