diff --git a/fsfw b/fsfw
index 81955876..692be9df 160000
--- a/fsfw
+++ b/fsfw
@@ -1 +1 @@
-Subproject commit 8195587604c5f14f04bf25b16a514cf3c771284b
+Subproject commit 692be9df8d06beb3bfc83aad77cefd727d8f7c35
diff --git a/mission/devices/ScexDeviceHandler.cpp b/mission/devices/ScexDeviceHandler.cpp
index b4aca88d..730c8a5a 100644
--- a/mission/devices/ScexDeviceHandler.cpp
+++ b/mission/devices/ScexDeviceHandler.cpp
@@ -97,7 +97,7 @@ ReturnValue_t ScexDeviceHandler::buildCommandFromCommand(DeviceCommandId_t devic
       prepareScexCmd(cmdTyped, {cmdBuf.data(), cmdBuf.size()}, rawPacketLen,
                      {commandData + 1, commandDataLen - 1}, tempCheck);
       updatePeriodicReply(true, deviceCommand);
-      actionHelper.finish(true, getCommanderQueueId(deviceCommand), deviceCommand, OK);
+      finishAction(true, deviceCommand, OK);
       break;
     }
     case (ONE_CELL): {
@@ -107,7 +107,7 @@ ReturnValue_t ScexDeviceHandler::buildCommandFromCommand(DeviceCommandId_t devic
       prepareScexCmd(cmdTyped, {cmdBuf.data(), cmdBuf.size()}, rawPacketLen,
                      {commandData + 1, commandDataLen - 1}, tempCheck);
       updatePeriodicReply(true, deviceCommand);
-      actionHelper.finish(true, getCommanderQueueId(deviceCommand), deviceCommand, OK);
+      finishAction(true, deviceCommand, OK);
       break;
     }
     case (ALL_CELLS_CMD): {
@@ -116,7 +116,7 @@ ReturnValue_t ScexDeviceHandler::buildCommandFromCommand(DeviceCommandId_t devic
       finishCountdown.resetTimer();
       prepareScexCmd(cmdTyped, {cmdBuf.data(), cmdBuf.size()}, rawPacketLen,
                      {commandData + 1, commandDataLen - 1}, tempCheck);
-      actionHelper.finish(true, getCommanderQueueId(deviceCommand), deviceCommand, OK);
+      finishAction(true, deviceCommand, OK);
       updatePeriodicReply(true, deviceCommand);
       break;
     }
@@ -130,10 +130,10 @@ ReturnValue_t ScexDeviceHandler::buildCommandFromCommand(DeviceCommandId_t devic
 }
 
 void ScexDeviceHandler::fillCommandAndReplyMap() {
-  insertInCommandAndReplyMap(scex::Cmds::PING, 5);
-  insertInCommandAndReplyMap(scex::Cmds::ION_CMD, 3);
-  insertInCommandAndReplyMap(scex::Cmds::TEMP_CMD, 3);
-  insertInCommandAndReplyMap(scex::Cmds::EXP_STATUS_CMD, 3);
+  insertInCommandAndReplyMap(scex::Cmds::PING, 5, nullptr, 0, false, false, 0, &finishCountdown);
+  insertInCommandAndReplyMap(scex::Cmds::ION_CMD, 3, nullptr, 0, false, false, 0, &finishCountdown);
+  insertInCommandAndReplyMap(scex::Cmds::TEMP_CMD, 3, nullptr, 0, false, false, 0, &finishCountdown);
+  insertInCommandAndReplyMap(scex::Cmds::EXP_STATUS_CMD, 3, nullptr, 0, false, false, 0, &finishCountdown);
 
   insertInCommandAndReplyMap(scex::Cmds::ALL_CELLS_CMD, 0, nullptr, 0, true, false,
                              scex::Cmds::ALL_CELLS_CMD, &finishCountdown);
diff --git a/mission/devices/ScexDeviceHandler.h b/mission/devices/ScexDeviceHandler.h
index 0c02ded8..eba813be 100644
--- a/mission/devices/ScexDeviceHandler.h
+++ b/mission/devices/ScexDeviceHandler.h
@@ -20,7 +20,7 @@ class ScexDeviceHandler : public DeviceHandlerBase {
 
  private:
   static constexpr uint32_t LONG_CD = 180 * 1000;
-  static constexpr uint32_t SHORT_CD = 7000;
+  static constexpr uint32_t SHORT_CD = 18000;
   std::array<uint8_t, 64> cmdBuf = {};
 
   std::optional<power::Switch_t> switchId;
diff --git a/tmtc b/tmtc
index edb6ded6..b2d65442 160000
--- a/tmtc
+++ b/tmtc
@@ -1 +1 @@
-Subproject commit edb6ded6176bf3152b58563a27ecda5e30cd95b0
+Subproject commit b2d65442fe513db51128d953bc805c05d5f68e07