diff --git a/fsfw b/fsfw
index 3782d8eb..d634bdb7 160000
--- a/fsfw
+++ b/fsfw
@@ -1 +1 @@
-Subproject commit 3782d8eb74171343dce845606f91885e87dc54f4
+Subproject commit d634bdb7753282f009bd2581945b861d9836c1a4
diff --git a/mission/devices/ACUHandler.cpp b/mission/devices/ACUHandler.cpp
index 321225f8..2594d0b8 100644
--- a/mission/devices/ACUHandler.cpp
+++ b/mission/devices/ACUHandler.cpp
@@ -13,7 +13,7 @@ ACUHandler::~ACUHandler() {}
 
 ReturnValue_t ACUHandler::buildNormalDeviceCommand(DeviceCommandId_t *id) {
   *id = GomspaceCommands::REQUEST_HK_TABLE;
-  return buildCommandFromCommand(*id, NULL, 0);
+  return requestHkTableAction.handle();
 }
 
 void ACUHandler::fillCommandAndReplyMap() { GomspaceDeviceHandler::fillCommandAndReplyMap(); }
diff --git a/mission/devices/GomspaceDeviceHandler.cpp b/mission/devices/GomspaceDeviceHandler.cpp
index 09dc9de7..1d7ef718 100644
--- a/mission/devices/GomspaceDeviceHandler.cpp
+++ b/mission/devices/GomspaceDeviceHandler.cpp
@@ -284,6 +284,7 @@ ReturnValue_t GomspaceDeviceHandler::handleAction(ParamGetAction* action) {
 }
 
 ReturnValue_t GomspaceDeviceHandler::handleAction(PingAction* action) {
+  action->pingData = 12;
   CspPingCommand cspPingCommand(&action->pingData.value, 1);  // TODO array
   size_t cspPacketLen = 0;
   uint8_t* buffer = cspPacket;
diff --git a/mission/devices/GomspaceDeviceHandler.h b/mission/devices/GomspaceDeviceHandler.h
index 4d908408..bf381891 100644
--- a/mission/devices/GomspaceDeviceHandler.h
+++ b/mission/devices/GomspaceDeviceHandler.h
@@ -123,6 +123,7 @@ class GomspaceDeviceHandler : public DeviceHandlerBase {
    * This command handles printing the HK table to the console. This is useful for debugging
    * purposes
    * @return
+   * TODO replace by overriding the handleAction()?
    */
   virtual ReturnValue_t printStatus(DeviceCommandId_t cmd);
 
diff --git a/mission/devices/P60DockHandler.cpp b/mission/devices/P60DockHandler.cpp
index 2e6e1a67..83c06cea 100644
--- a/mission/devices/P60DockHandler.cpp
+++ b/mission/devices/P60DockHandler.cpp
@@ -16,7 +16,7 @@ P60DockHandler::~P60DockHandler() {}
 
 ReturnValue_t P60DockHandler::buildNormalDeviceCommand(DeviceCommandId_t *id) {
   *id = GomspaceCommands::REQUEST_HK_TABLE;
-  return buildCommandFromCommand(*id, NULL, 0);
+  return requestHkTableAction.handle();
 }
 
 void P60DockHandler::letChildHandleHkReply(DeviceCommandId_t id, const uint8_t *packet) {
diff --git a/mission/devices/PDU1Handler.cpp b/mission/devices/PDU1Handler.cpp
index 82b84be8..3cf97679 100644
--- a/mission/devices/PDU1Handler.cpp
+++ b/mission/devices/PDU1Handler.cpp
@@ -16,7 +16,7 @@ PDU1Handler::~PDU1Handler() {}
 
 ReturnValue_t PDU1Handler::buildNormalDeviceCommand(DeviceCommandId_t *id) {
   *id = GomspaceCommands::REQUEST_HK_TABLE;
-  return buildCommandFromCommand(*id, NULL, 0);
+  return requestHkTableAction.handle();
 }
 
 void PDU1Handler::letChildHandleHkReply(DeviceCommandId_t id, const uint8_t *packet) {
diff --git a/mission/devices/PDU2Handler.cpp b/mission/devices/PDU2Handler.cpp
index f53e599e..7bd76f74 100644
--- a/mission/devices/PDU2Handler.cpp
+++ b/mission/devices/PDU2Handler.cpp
@@ -16,7 +16,7 @@ PDU2Handler::~PDU2Handler() {}
 
 ReturnValue_t PDU2Handler::buildNormalDeviceCommand(DeviceCommandId_t *id) {
   *id = GomspaceCommands::REQUEST_HK_TABLE;
-  return buildCommandFromCommand(*id, NULL, 0);
+  return requestHkTableAction.handle();
 }
 
 void PDU2Handler::letChildHandleHkReply(DeviceCommandId_t id, const uint8_t *packet) {
diff --git a/mission/devices/devicedefinitions/GomSpacePackets.h b/mission/devices/devicedefinitions/GomSpacePackets.h
index 2c470423..181eac52 100644
--- a/mission/devices/devicedefinitions/GomSpacePackets.h
+++ b/mission/devices/devicedefinitions/GomSpacePackets.h
@@ -334,8 +334,8 @@ class Pdu2FullTableReply : public SerialLinkedListAdapter<SerializeIF> {
 
 class SetParamMessageCache {
  public:
- SetParamMessageCache(): address(0), parameter(0), parameterSize(1) {}
- 
+  SetParamMessageCache() : address(0), parameter(0), parameterSize(1) {}
+
   void set(uint16_t address, uint32_t parameter, uint8_t parameterSize) {
     this->address = address;
     this->parameter = parameter;