diff --git a/Sources/Infra/GCM/GCM415/hdl/pkg_infra_gcm415.vhd b/Sources/Infra/GCM/GCM415/hdl/pkg_infra_gcm415.vhd
index ef9f4f3bb..9be3d5cea 100644
--- a/Sources/Infra/GCM/GCM415/hdl/pkg_infra_gcm415.vhd
+++ b/Sources/Infra/GCM/GCM415/hdl/pkg_infra_gcm415.vhd
@@ -20,14 +20,14 @@ package pkg_infra is
   -- --  ---- ---- --- ---------  -----       --  ----   --------    --------
   --  0  212  GTYP  1  0-3                     0  212  
   --  1  211  GTYP  1  4-7                     1  211  
-  --  2  210  GTYP  1  8-11                    2  210     FrmGEP      FrmGEP
+  --  2  210  GTYP  1  8-11                    2  210     FrmGEP                
   --  3  209  GTYP  1  12-15                   3  209                 ToCTP(4-7)
   --  4  208  GTYP  1  16-19                   4  208                 ToCTP(0-3)  
   --  5  207  GTYP  1  20-23                   5  207  
   --  6  112  GTYP  1  24-27                   6  112  
   --  7  111  GTYP  1  28-31      Rsvd         7  111  
   --  8  110  GTYP  1  32-35      0-3          8  110     ToCTP(4-7)
-  --  9  109  GTYP  1  36-39      4-7          9  109     ToCTP(0-3)
+  --  9  109  GTYP  1  36-39      4-7          9  109     ToCTP(0-3)  FrmGEP
   -- 10  201  GTYP  0  40-43                  10  201  
   -- 11  200  GTYP  0  44-47                  11  200  
   -- 12  106  GTYP  0  48-49,FLX  FLX         12  106     LTI/Rdo     LTI/Rdo 
@@ -41,8 +41,8 @@ package pkg_infra is
   
   constant INF_QUAD_TYPE_MAP     : std_logic_vector(INF_TOTAL_QUADS-1 downto 0) := "110000000000000"; -- 0=GTYP,1=GTM
   --Must be at least 1                                                              432109876543210  
-  constant INF_ACTIVE_UPQUAD_MAP : std_logic_vector(INF_TOTAL_QUADS-1 downto 0) := "000000000000111"; -- CTPtest2
-  constant INF_ACTIVE_DNQUAD_MAP : std_logic_vector(INF_TOTAL_QUADS-1 downto 0) := "000000000011000"; -- CTPtest2
+  constant INF_ACTIVE_UPQUAD_MAP : std_logic_vector(INF_TOTAL_QUADS-1 downto 0) := "000001000000000"; -- CTPtest2
+  constant INF_ACTIVE_DNQUAD_MAP : std_logic_vector(INF_TOTAL_QUADS-1 downto 0) := "000000000001100"; -- CTPtest2
 --                                                                                  432109876543210  
 --                                                                 Readout QUAD := "001000000000000";
   
diff --git a/Sources/MGT/hdl/mgt.vhd b/Sources/MGT/hdl/mgt.vhd
index 18c813120..cd14ef0a7 100644
--- a/Sources/MGT/hdl/mgt.vhd
+++ b/Sources/MGT/hdl/mgt.vhd
@@ -389,17 +389,17 @@ begin
           ipbw_i  => ipbw_slr0(work.ipbus_decode_mgt_slr0.N_SLV_CTPOUT),
           ipbr_o  => ipbr_slr0(work.ipbus_decode_mgt_slr0.N_SLV_CTPOUT),
         -- Interlaken Link
-          refclk0_pi => ( 1 => upstrm_i.refclk0_pi(3),  --TODO - this needs proper automation
-                          0 => upstrm_i.refclk0_pi(4)),        
-          refclk0_ni => ( 1 => upstrm_i.refclk0_ni(3),
-                          0 => upstrm_i.refclk0_ni(4)),
-          gt_rx_pi  => (upstrm_i.gt_rx_pi(15 downto 12),upstrm_i.gt_rx_pi(19 downto 16)),
-          gt_rx_ni  => (upstrm_i.gt_rx_ni(15 downto 12),upstrm_i.gt_rx_pi(19 downto 16)),
+          refclk0_pi => ( 1 => upstrm_i.refclk0_pi(2),  --TODO - this needs proper automation
+                          0 => upstrm_i.refclk0_pi(3)),        
+          refclk0_ni => ( 1 => upstrm_i.refclk0_ni(2),
+                          0 => upstrm_i.refclk0_ni(3)),
+          gt_rx_pi  => (upstrm_i.gt_rx_pi(11 downto 8),upstrm_i.gt_rx_pi(15 downto 12)),
+          gt_rx_ni  => (upstrm_i.gt_rx_ni(11 downto 8),upstrm_i.gt_rx_pi(15 downto 12)),
           -- CTP Link
-          refclk1_pi => ( 1 => dnstrm_i.refclk1_pi(3),
-                          0 => dnstrm_i.refclk1_pi(4)),        
-          refclk1_ni => ( 1 => dnstrm_i.refclk1_ni(3),
-                          0 => dnstrm_i.refclk1_ni(4)),
+          refclk1_pi => ( 1 => dnstrm_i.refclk1_pi(2),
+                          0 => dnstrm_i.refclk1_pi(3)),        
+          refclk1_ni => ( 1 => dnstrm_i.refclk1_ni(2),
+                          0 => dnstrm_i.refclk1_ni(3)),
           gt_tx_po => ctp_gt_tx_p, --dnstrm_o.gt_tx_po(7 downto 0), --(11 downto 4),
           gt_tx_no => ctp_gt_tx_n, --dnstrm_o.gt_tx_no(7 downto 0), --(11 downto 4),
           -- From payload
diff --git a/Top/Baby/GCI_Links_GCM415/hog.conf b/Top/Baby/GCI_Links_GCM415/hog.conf
index eef08d75d..b83faf9f3 100644
--- a/Top/Baby/GCI_Links_GCM415/hog.conf
+++ b/Top/Baby/GCI_Links_GCM415/hog.conf
@@ -39,7 +39,7 @@ UPSTRM_EN=1
 
 ###UPSTRM_CHANS isn't used properly in this branch, maybe soon everywhere
 UPSTRM_CHANS=48
-UPSTRM_CHAN_OFFS=8
+UPSTRM_CHAN_OFFS=36
 # CHANS must be <= UPSTRM_QUADS*4 (see Sources/Infra/GCM/GCM415/hdl/pkg_infra_gcm415.vhd)
 #GCI2CTP output links
 DNSTRM_EN=1
diff --git a/Top/Main/GCI_GCM415/hog.conf b/Top/Main/GCI_GCM415/hog.conf
index 9c41ee1e4..583094ef7 100644
--- a/Top/Main/GCI_GCM415/hog.conf
+++ b/Top/Main/GCI_GCM415/hog.conf
@@ -39,7 +39,7 @@ UPSTRM_EN=1
 
 ###UPSTRM_CHANS isn't used properly in this branch, maybe soon everywhere
 UPSTRM_CHANS=48
-UPSTRM_CHAN_OFFS=8 
+UPSTRM_CHAN_OFFS=36 
 # CHANS must be <= UPSTRM_QUADS*4 (see Sources/Infra/GCM/GCM415/hdl/pkg_infra_gcm415.vhd)
 #GCI2CTP output links
 DNSTRM_EN=1
