diff --git a/bsp_q7s/ObjectFactory.cpp b/bsp_q7s/ObjectFactory.cpp
index 71e758b1..c3aa3781 100644
--- a/bsp_q7s/ObjectFactory.cpp
+++ b/bsp_q7s/ObjectFactory.cpp
@@ -401,54 +401,53 @@ void ObjectFactory::produce(){
 #if Q7S_ADD_RTD_DEVICES == 1
     GpioCookie* rtdGpioCookie = new GpioCookie;
 
-    gpioCallbacks::initTcsBoardDecoder(gpioComIF);
     GpioCallback* gpioRtdIc3 = new GpioCallback(std::string("Chip select RTD IC3"), gpio::OUT, 1,
-            &gpioCallbacks::tcsBoardDecoderCallback, gpioComIF);
+            &gpioCallbacks::spiCsDecoderCallback, gpioComIF);
     rtdGpioCookie->addGpio(gpioIds::RTD_IC3, gpioRtdIc3);
     GpioCallback* gpioRtdIc4 = new GpioCallback(std::string("Chip select RTD IC4"), gpio::OUT, 1,
-            &gpioCallbacks::tcsBoardDecoderCallback, gpioComIF);
+            &gpioCallbacks::spiCsDecoderCallback, gpioComIF);
     rtdGpioCookie->addGpio(gpioIds::RTD_IC4, gpioRtdIc4);
     GpioCallback* gpioRtdIc5 = new GpioCallback(std::string("Chip select RTD IC5"), gpio::OUT, 1,
-            &gpioCallbacks::tcsBoardDecoderCallback, gpioComIF);
+            &gpioCallbacks::spiCsDecoderCallback, gpioComIF);
     rtdGpioCookie->addGpio(gpioIds::RTD_IC5, gpioRtdIc5);
     GpioCallback* gpioRtdIc6 = new GpioCallback(std::string("Chip select RTD IC6"), gpio::OUT, 1,
-            &gpioCallbacks::tcsBoardDecoderCallback, gpioComIF);
+            &gpioCallbacks::spiCsDecoderCallback, gpioComIF);
     rtdGpioCookie->addGpio(gpioIds::RTD_IC6, gpioRtdIc6);
     GpioCallback* gpioRtdIc7 = new GpioCallback(std::string("Chip select RTD IC7"), gpio::OUT, 1,
-            &gpioCallbacks::tcsBoardDecoderCallback, gpioComIF);
+            &gpioCallbacks::spiCsDecoderCallback, gpioComIF);
     rtdGpioCookie->addGpio(gpioIds::RTD_IC7, gpioRtdIc7);
     GpioCallback* gpioRtdIc8 = new GpioCallback(std::string("Chip select RTD IC8"), gpio::OUT, 1,
-            &gpioCallbacks::tcsBoardDecoderCallback, gpioComIF);
+            &gpioCallbacks::spiCsDecoderCallback, gpioComIF);
     rtdGpioCookie->addGpio(gpioIds::RTD_IC8, gpioRtdIc8);
     GpioCallback* gpioRtdIc9 = new GpioCallback(std::string("Chip select RTD IC9"), gpio::OUT, 1,
-            &gpioCallbacks::tcsBoardDecoderCallback, gpioComIF);
+            &gpioCallbacks::spiCsDecoderCallback, gpioComIF);
     rtdGpioCookie->addGpio(gpioIds::RTD_IC9, gpioRtdIc9);
     GpioCallback* gpioRtdIc10 = new GpioCallback(std::string("Chip select RTD IC10"), gpio::OUT, 1,
-            &gpioCallbacks::tcsBoardDecoderCallback, gpioComIF);
+            &gpioCallbacks::spiCsDecoderCallback, gpioComIF);
     rtdGpioCookie->addGpio(gpioIds::RTD_IC10, gpioRtdIc10);
     GpioCallback* gpioRtdIc11 = new GpioCallback(std::string("Chip select RTD IC11"), gpio::OUT, 1,
-            &gpioCallbacks::tcsBoardDecoderCallback, gpioComIF);
+            &gpioCallbacks::spiCsDecoderCallback, gpioComIF);
     rtdGpioCookie->addGpio(gpioIds::RTD_IC11, gpioRtdIc11);
     GpioCallback* gpioRtdIc12 = new GpioCallback(std::string("Chip select RTD IC12"), gpio::OUT, 1,
-            &gpioCallbacks::tcsBoardDecoderCallback, gpioComIF);
+            &gpioCallbacks::spiCsDecoderCallback, gpioComIF);
     rtdGpioCookie->addGpio(gpioIds::RTD_IC12, gpioRtdIc12);
     GpioCallback* gpioRtdIc13 = new GpioCallback(std::string("Chip select RTD IC13"), gpio::OUT, 1,
-            &gpioCallbacks::tcsBoardDecoderCallback, gpioComIF);
+            &gpioCallbacks::spiCsDecoderCallback, gpioComIF);
     rtdGpioCookie->addGpio(gpioIds::RTD_IC13, gpioRtdIc13);
     GpioCallback* gpioRtdIc14 = new GpioCallback(std::string("Chip select RTD IC14"), gpio::OUT, 1,
-            &gpioCallbacks::tcsBoardDecoderCallback, gpioComIF);
+            &gpioCallbacks::spiCsDecoderCallback, gpioComIF);
     rtdGpioCookie->addGpio(gpioIds::RTD_IC14, gpioRtdIc14);
     GpioCallback* gpioRtdIc15 = new GpioCallback(std::string("Chip select RTD IC15"), gpio::OUT, 1,
-            &gpioCallbacks::tcsBoardDecoderCallback, gpioComIF);
+            &gpioCallbacks::spiCsDecoderCallback, gpioComIF);
     rtdGpioCookie->addGpio(gpioIds::RTD_IC15, gpioRtdIc15);
     GpioCallback* gpioRtdIc16 = new GpioCallback(std::string("Chip select RTD IC16"), gpio::OUT, 1,
-            &gpioCallbacks::tcsBoardDecoderCallback, gpioComIF);
+            &gpioCallbacks::spiCsDecoderCallback, gpioComIF);
     rtdGpioCookie->addGpio(gpioIds::RTD_IC16, gpioRtdIc16);
     GpioCallback* gpioRtdIc17 = new GpioCallback(std::string("Chip select RTD IC17"), gpio::OUT, 1,
-            &gpioCallbacks::tcsBoardDecoderCallback, gpioComIF);
+            &gpioCallbacks::spiCsDecoderCallback, gpioComIF);
     rtdGpioCookie->addGpio(gpioIds::RTD_IC17, gpioRtdIc17);
     GpioCallback* gpioRtdIc18 = new GpioCallback(std::string("Chip select RTD IC18"), gpio::OUT, 1,
-            &gpioCallbacks::tcsBoardDecoderCallback, gpioComIF);
+            &gpioCallbacks::spiCsDecoderCallback, gpioComIF);
     rtdGpioCookie->addGpio(gpioIds::RTD_IC18, gpioRtdIc18);
 
     gpioComIF->addGpios(rtdGpioCookie);
@@ -518,10 +517,10 @@ void ObjectFactory::produce(){
     Max31865PT1000Handler* rtdIc16 = new Max31865PT1000Handler(objects::RTD_IC16, objects::SPI_COM_IF, spiRtdIc16, 0);
     Max31865PT1000Handler* rtdIc17 = new Max31865PT1000Handler(objects::RTD_IC17, objects::SPI_COM_IF, spiRtdIc17, 0);
     Max31865PT1000Handler* rtdIc18 = new Max31865PT1000Handler(objects::RTD_IC18, objects::SPI_COM_IF, spiRtdIc18, 0);
-//    rtdIc10->setStartUpImmediately();
+    rtdIc3->setStartUpImmediately();
 //    rtdIc4->setStartUpImmediately();
 
-    (void) rtdIc3;
+//    (void) rtdIc3;
     (void) rtdIc4;
     (void) rtdIc5;
     (void) rtdIc6;
diff --git a/bsp_q7s/boardconfig/q7s_config.h b/bsp_q7s/boardconfig/q7s_config.h
index 782ecf4f..73cf2225 100644
--- a/bsp_q7s/boardconfig/q7s_config.h
+++ b/bsp_q7s/boardconfig/q7s_config.h
@@ -1,7 +1,7 @@
 #ifndef BSP_Q7S_BOARDCONFIG_Q7S_CONFIG_H_
 #define BSP_Q7S_BOARDCONFIG_Q7S_CONFIG_H_
 
-#define Q7S_ADD_RTD_DEVICES 			0
+#define Q7S_ADD_RTD_DEVICES 			1
 
 /* Only one of those 2 should be enabled! */
 /* Add code for ACS board */
diff --git a/fsfw b/fsfw
index e7d24563..e9adaf67 160000
--- a/fsfw
+++ b/fsfw
@@ -1 +1 @@
-Subproject commit e7d245635047439ca4b5a46d05bf58437a5aa33a
+Subproject commit e9adaf672f7bfac9aaa03c284410b318142431ff
diff --git a/fsfwconfig/OBSWConfig.h b/fsfwconfig/OBSWConfig.h
index 1aa08764..72f9165e 100644
--- a/fsfwconfig/OBSWConfig.h
+++ b/fsfwconfig/OBSWConfig.h
@@ -26,7 +26,7 @@ debugging. */
 #define TEST_CCSDS_BRIDGE               1
 #define PERFORM_PTME_TEST               1
 
-#define TE0720                      1
+#define TE0720                      0
 #define TE0720_HEATER_TEST          0
 
 #define P60DOCK_DEBUG               0