diff --git a/designs/vivado/scalp_router_firmware/2020.2/src/hdl/scalp_router_firmware.vhd b/designs/vivado/scalp_router_firmware/2020.2/src/hdl/scalp_router_firmware.vhd
index 7d9efd071529fee74c99ba96da4aa2c5b1e27140..57d0fc0d510fcd7f74878ec16f73dc4de175c3b9 100644
--- a/designs/vivado/scalp_router_firmware/2020.2/src/hdl/scalp_router_firmware.vhd
+++ b/designs/vivado/scalp_router_firmware/2020.2/src/hdl/scalp_router_firmware.vhd
@@ -15,7 +15,7 @@
 -- Tool version: 2020.2
 -- Description: scalp_router_firmware
 --
--- Last update: 2021-09-15
+-- Last update: 2021-09-17
 --
 ---------------------------------------------------------------------------------
 
@@ -556,50 +556,70 @@ architecture arch of scalp_router_firmware is
     signal DebugBackPressureResetxR : t_rx_back_pressure_reset                           := C_NO_RX_BACK_PRESSURE_RESET;
 
     -- Attributes
-    attribute mark_debug                 : string;
-    attribute keep                       : string;
+    attribute mark_debug                      : string;
+    attribute keep                            : string;
     -- Clocks
-    attribute keep of PSSysClkxC         : signal is "true";
-    attribute keep of GTRefClk0xC        : signal is "true";
-    attribute keep of GTRefClk1xC        : signal is "true";
-    attribute keep of AuroraClkSlavexC   : signal is "true";
-    attribute keep of AuroraClkMasterxC  : signal is "true";
+    attribute keep of PSSysClkxC              : signal is "true";
+    attribute keep of GTRefClk0xC             : signal is "true";
+    attribute keep of GTRefClk1xC             : signal is "true";
+    attribute keep of AuroraClkSlavexC        : signal is "true";
+    attribute keep of AuroraClkMasterxC       : signal is "true";
     -- Scalp Router
-    attribute mark_debug of NorthRXM2SxD : signal is "true";
-    attribute keep of NorthRXM2SxD       : signal is "true";
-    attribute mark_debug of NorthRXS2MxD : signal is "true";
-    attribute keep of NorthRXS2MxD       : signal is "true";
-    attribute mark_debug of NorthTXM2SxD : signal is "true";
-    attribute keep of NorthTXM2SxD       : signal is "true";
-    attribute mark_debug of NorthTXS2MxD : signal is "true";
-    attribute keep of NorthTXS2MxD       : signal is "true";
-    attribute mark_debug of EastRXM2SxD  : signal is "true";
-    attribute keep of EastRXM2SxD        : signal is "true";
-    attribute mark_debug of EastRXS2MxD  : signal is "true";
-    attribute keep of EastRXS2MxD        : signal is "true";
-    attribute mark_debug of EastTXM2SxD  : signal is "true";
-    attribute keep of EastTXM2SxD        : signal is "true";
-    attribute mark_debug of EastTXS2MxD  : signal is "true";
-    attribute keep of EastTXS2MxD        : signal is "true";
-    attribute mark_debug of SouthRXM2SxD : signal is "true";
-    attribute keep of SouthRXM2SxD       : signal is "true";
-    attribute mark_debug of SouthRXS2MxD : signal is "true";
-    attribute keep of SouthRXS2MxD       : signal is "true";
-    attribute mark_debug of SouthTXM2SxD : signal is "true";
-    attribute keep of SouthTXM2SxD       : signal is "true";
-    attribute mark_debug of SouthTXS2MxD : signal is "true";
-    attribute keep of SouthTXS2MxD       : signal is "true";
-    attribute mark_debug of WestRXM2SxD  : signal is "true";
-    attribute keep of WestRXM2SxD        : signal is "true";
-    attribute mark_debug of WestRXS2MxD  : signal is "true";
-    attribute keep of WestRXS2MxD        : signal is "true";
-    attribute mark_debug of WestTXM2SxD  : signal is "true";
-    attribute keep of WestTXM2SxD        : signal is "true";
-    attribute mark_debug of WestTXS2MxD  : signal is "true";
-    attribute keep of WestTXS2MxD        : signal is "true";
-    attribute mark_debug of LocNetAddrxD : signal is "true";
-    attribute keep of LocNetAddrxD       : signal is "true";    
+    attribute mark_debug of NorthRXM2SxD      : signal is "true";
+    attribute keep of NorthRXM2SxD            : signal is "true";
+    attribute mark_debug of NorthRXS2MxD      : signal is "true";
+    attribute keep of NorthRXS2MxD            : signal is "true";
+    attribute mark_debug of NorthTXM2SxD      : signal is "true";
+    attribute keep of NorthTXM2SxD            : signal is "true";
+    attribute mark_debug of NorthTXS2MxD      : signal is "true";
+    attribute keep of NorthTXS2MxD            : signal is "true";
+    attribute mark_debug of EastRXM2SxD       : signal is "true";
+    attribute keep of EastRXM2SxD             : signal is "true";
+    attribute mark_debug of EastRXS2MxD       : signal is "true";
+    attribute keep of EastRXS2MxD             : signal is "true";
+    attribute mark_debug of EastTXM2SxD       : signal is "true";
+    attribute keep of EastTXM2SxD             : signal is "true";
+    attribute mark_debug of EastTXS2MxD       : signal is "true";
+    attribute keep of EastTXS2MxD             : signal is "true";
+    attribute mark_debug of SouthRXM2SxD      : signal is "true";
+    attribute keep of SouthRXM2SxD            : signal is "true";
+    attribute mark_debug of SouthRXS2MxD      : signal is "true";
+    attribute keep of SouthRXS2MxD            : signal is "true";
+    attribute mark_debug of SouthTXM2SxD      : signal is "true";
+    attribute keep of SouthTXM2SxD            : signal is "true";
+    attribute mark_debug of SouthTXS2MxD      : signal is "true";
+    attribute keep of SouthTXS2MxD            : signal is "true";
+    attribute mark_debug of WestRXM2SxD       : signal is "true";
+    attribute keep of WestRXM2SxD             : signal is "true";
+    attribute mark_debug of WestRXS2MxD       : signal is "true";
+    attribute keep of WestRXS2MxD             : signal is "true";
+    attribute mark_debug of WestTXM2SxD       : signal is "true";
+    attribute keep of WestTXM2SxD             : signal is "true";
+    attribute mark_debug of WestTXS2MxD       : signal is "true";
+    attribute keep of WestTXS2MxD             : signal is "true";
+    attribute mark_debug of LocNetAddrxD      : signal is "true";
+    attribute keep of LocNetAddrxD            : signal is "true";
     --
+    attribute mark_debug of TXAxism2sVectorxD : signal is "true";
+    attribute keep of TXAxism2sVectorxD       : signal is "true";
+    attribute mark_debug of TXAxiss2mVectorxD : signal is "true";
+    attribute keep of TXAxiss2mVectorxD       : signal is "true";
+    attribute mark_debug of RXFifoTXM2SxD     : signal is "true";
+    attribute keep of RXFifoTXM2SxD           : signal is "true";
+    attribute mark_debug of RXFifoTXS2MxS     : signal is "true";
+    attribute keep of RXFifoTXS2MxS           : signal is "true";
+    attribute mark_debug of RXFifoStatusxD    : signal is "true";
+    attribute keep of RXFifoStatusxD          : signal is "true";
+    attribute mark_debug of TXFifoRXM2SxD     : signal is "true";
+    attribute keep of TXFifoRXM2SxD           : signal is "true";
+    attribute mark_debug of TXFifoRXS2MxS     : signal is "true";
+    attribute keep of TXFifoRXS2MxS           : signal is "true";
+    attribute mark_debug of RXAxism2sVectorxD : signal is "true";
+    attribute keep of RXAxism2sVectorxD       : signal is "true";
+    attribute mark_debug of RXAxiss2mVectorxD : signal is "true";
+    attribute keep of RXAxiss2mVectorxD       : signal is "true";
+    attribute mark_debug of TXFifoStatusxD    : signal is "true";
+    attribute keep of TXFifoStatusxD          : signal is "true";
 
 begin