diff --git a/applications/disturb2/libraries/disturb/src/vhdl/disturb_info.vhd b/applications/disturb2/libraries/disturb/src/vhdl/disturb_info.vhd
index fb50b588a5d8195e86af0af60abdc43bcba33b16..87c09eda8b0fa95f9dd8a4975722bf9c3bf6de77 100644
--- a/applications/disturb2/libraries/disturb/src/vhdl/disturb_info.vhd
+++ b/applications/disturb2/libraries/disturb/src/vhdl/disturb_info.vhd
@@ -52,12 +52,11 @@ ENTITY disturb_info IS
     reg_miso           : OUT t_mem_miso;
 
     -- inputs from other blocks
-    gn_index           : IN NATURAL;
     f_adc              : IN STD_LOGIC;
     fsub_type          : IN STD_LOGIC;
 
     -- disturb info
-    disturb_info           : OUT t_disturb_info
+    disturb_info       : OUT t_disturb_info
   );
 END disturb_info;
 
diff --git a/applications/disturb2/libraries/disturb/src/vhdl/disturb_station.vhd b/applications/disturb2/libraries/disturb/src/vhdl/disturb_station.vhd
index 40ae21aa8c68a9bc1c324c864f869850f8113192..bfa362cb2e4407123220b0f4ea06b31c53d09994 100644
--- a/applications/disturb2/libraries/disturb/src/vhdl/disturb_station.vhd
+++ b/applications/disturb2/libraries/disturb/src/vhdl/disturb_station.vhd
@@ -544,10 +544,11 @@ ARCHITECTURE str OF disturb_station IS
 
 BEGIN
 
+  gn_index <= TO_UINT(gn_id);
+
   -----------------------------------------------------------------------------
   -- SDP Info register
   -----------------------------------------------------------------------------
-  gn_index <= TO_UINT(gn_id);
   -- derive MAC, IP and UDP Port 
   cep_eth_src_mac  <= c_disturb_cep_eth_src_mac_47_16 & RESIZE_UVEC(this_bck_id, c_byte_w) & RESIZE_UVEC(this_chip_id, c_byte_w); -- Simply use chip_id since we only use 1 of the 6*4 = 24 10GbE port.
   cep_ip_src_addr  <= c_disturb_cep_ip_src_addr_31_16 & RESIZE_UVEC(this_bck_id, c_byte_w) & INCR_UVEC(RESIZE_UVEC(this_chip_id, c_byte_w), 1); -- +1 to avoid IP = *.*.*.0
@@ -572,7 +573,6 @@ BEGIN
     reg_miso  => reg_disturb_info_cipo,
 
     -- inputs from other blocks
-    gn_index  => gn_index, 
     f_adc     => c_f_adc, 
     fsub_type => c_fsub_type, 
 
diff --git a/applications/lofar2/libraries/sdp/src/vhdl/sdp_info.vhd b/applications/lofar2/libraries/sdp/src/vhdl/sdp_info.vhd
index 1e8aa33621e61ec599f4068f2e75a1e0be9bc327..9a81eccb020d86a917b979b79c36702519bd4a86 100644
--- a/applications/lofar2/libraries/sdp/src/vhdl/sdp_info.vhd
+++ b/applications/lofar2/libraries/sdp/src/vhdl/sdp_info.vhd
@@ -52,7 +52,6 @@ ENTITY sdp_info IS
     reg_miso           : OUT t_mem_miso;
 
     -- inputs from other blocks
-    gn_index           : IN NATURAL;
     f_adc              : IN STD_LOGIC;
     fsub_type          : IN STD_LOGIC;
 
diff --git a/applications/lofar2/libraries/sdp/src/vhdl/sdp_station.vhd b/applications/lofar2/libraries/sdp/src/vhdl/sdp_station.vhd
index 7455fcaf62c5127110fd4ff974b0c1d6a6187b3d..b6286cb5eca5ec72af520ebf988ce9d6eff60624 100644
--- a/applications/lofar2/libraries/sdp/src/vhdl/sdp_station.vhd
+++ b/applications/lofar2/libraries/sdp/src/vhdl/sdp_station.vhd
@@ -65,9 +65,9 @@ ENTITY sdp_station IS
     dp_clk        : IN STD_LOGIC;
 
     -- ID
-    gn_id         : IN STD_LOGIC_VECTOR(c_sdp_W_gn_id-1 DOWNTO 0);
-    this_bck_id   : IN STD_LOGIC_VECTOR(6-1 DOWNTO 0);
-    this_chip_id  : IN STD_LOGIC_VECTOR(2-1 DOWNTO 0);
+    gn_id         : IN STD_LOGIC_VECTOR(c_sdp_W_gn_id-1 DOWNTO 0);  -- used for udp src port
+    this_bck_id   : IN STD_LOGIC_VECTOR(6-1 DOWNTO 0);  -- used for src mac / ip
+    this_chip_id  : IN STD_LOGIC_VECTOR(2-1 DOWNTO 0);  -- used for src mac / ip
 
     -- Transceiver clocks
     SA_CLK        : IN    STD_LOGIC := '0'; -- Clock 10GbE front (qsfp) and ring lines
@@ -559,10 +559,11 @@ ARCHITECTURE str OF sdp_station IS
 
 BEGIN
 
+  gn_index <= TO_UINT(gn_id);
+
   -----------------------------------------------------------------------------
   -- SDP Info register
   -----------------------------------------------------------------------------
-  gn_index <= TO_UINT(gn_id);
   -- derive MAC, IP and UDP Port 
   cep_eth_src_mac  <= c_sdp_cep_eth_src_mac_47_16 & RESIZE_UVEC(this_bck_id, c_byte_w) & RESIZE_UVEC(this_chip_id, c_byte_w); -- Simply use chip_id since we only use 1 of the 6*4 = 24 10GbE port.
   cep_ip_src_addr  <= c_sdp_cep_ip_src_addr_31_16 & RESIZE_UVEC(this_bck_id, c_byte_w) & INCR_UVEC(RESIZE_UVEC(this_chip_id, c_byte_w), 1); -- +1 to avoid IP = *.*.*.0
@@ -587,7 +588,6 @@ BEGIN
     reg_miso  => reg_sdp_info_cipo,
 
     -- inputs from other blocks
-    gn_index  => gn_index, 
     f_adc     => c_f_adc, 
     fsub_type => c_fsub_type,