diff --git a/Sources/Libraries/Common/hdl/lti_decode_cdc.vhd b/Sources/Libraries/Common/hdl/lti_decode_cdc.vhd
index 9e25b935e..e24b24a9e 100644
--- a/Sources/Libraries/Common/hdl/lti_decode_cdc.vhd
+++ b/Sources/Libraries/Common/hdl/lti_decode_cdc.vhd
@@ -32,11 +32,11 @@ end lti_decode_cdc;
 architecture rtl of lti_decode_cdc is
 
   signal bcr_240      : std_logic;
-  signal bcr_count    : unsigned(7 downto 0);
+  signal bcr_count    : unsigned(7 downto 0) := x"00";
   signal bcid     : std_logic_vector(11 downto 0);
   signal bcid_q   : std_logic_vector(11 downto 0);
   signal bcid_uns : unsigned(11 downto 0) := x"abc";
-  signal new_bcid : std_logic;
+  --signal new_bcid : std_logic;
   signal bcr      : std_logic;
   signal bcr_q    : std_logic;
   signal count6       : unsigned(2 downto 0)  := "000";
diff --git a/Sources/Payload/GCI/hdl/payload_gci.vhd b/Sources/Payload/GCI/hdl/payload_gci.vhd
index bbd1dcce5..4ecb01c40 100644
--- a/Sources/Payload/GCI/hdl/payload_gci.vhd
+++ b/Sources/Payload/GCI/hdl/payload_gci.vhd
@@ -319,7 +319,7 @@ begin
       d(2)               => slr0_status2,
       d(3)               => slr0_status3,
       ctrl_default       => (0 => x"00000000",
-                             1 => x"000d0002",  --bcn-delay=d, /pattern_en, /local_bcn_sel, lti_clk_sel
+                             1 => x"00050000",  --bcn-delay=d, /pattern_en, /local_bcn_sel, lti_clk_sel
                              2 => x"00000deb",
                              3 => x"00000000"),
 --      ctrl_default(0) => x"00000000", -- sim can't do it this way!                       
diff --git a/Sources/Payload/GCI/tb/payload_gci_tb.vhd b/Sources/Payload/GCI/tb/payload_gci_tb.vhd
index 0412c00df..0f31c6cd1 100644
--- a/Sources/Payload/GCI/tb/payload_gci_tb.vhd
+++ b/Sources/Payload/GCI/tb/payload_gci_tb.vhd
@@ -50,7 +50,7 @@ end payload_gci_tb;
 
 architecture sim of payload_gci_tb is
 
-  constant NUM_CHANS : integer := 49;--VVVV --1;--49; --36; --3654/99=36 --49;
+  constant NUM_CHANS : integer := 1;--49; --36; --3654/99=36 --49;
 
   signal clk       : std_logic;
   signal rst       : std_logic;  
@@ -165,7 +165,7 @@ begin
         generic map (
         --APP_VERSION     --integer --allow for new APP
         CLK_FREQ => 240,  --integer --Used to make 40MHz ticks for DG-BCID
-        BCID49_OFFS => n,--VVVV 16, --MRMW!!! n, 
+        BCID49_OFFS => 3,--VVVV 16, --MRMW!!! n, 
         --DATA64_WIDTH      --integer --1:64b 2:128b 4:256
         N_DG_GEPS => 49 --VVVV 36 --MRMW!!! 49 --NUM_CHANS
         )
diff --git a/Sources/Payload/GCI/tb/payload_gci_tb.wcfg b/Sources/Payload/GCI/tb/payload_gci_tb.wcfg
index 2b6cdc1e3..6dea26725 100644
--- a/Sources/Payload/GCI/tb/payload_gci_tb.wcfg
+++ b/Sources/Payload/GCI/tb/payload_gci_tb.wcfg
@@ -32,343 +32,19 @@
       </db_ref>
    </db_ref_list>
    <zoom_setting>
-      <ZoomStartTime time="89,582.077 ns"></ZoomStartTime>
-      <ZoomEndTime time="90,378.768 ns"></ZoomEndTime>
-      <Cursor1Time time="90,019.131 ns"></Cursor1Time>
+      <ZoomStartTime time="49,329.003 ns"></ZoomStartTime>
+      <ZoomEndTime time="50,134.200 ns"></ZoomEndTime>
+      <Cursor1Time time="50,000.000 ns"></Cursor1Time>
    </zoom_setting>
    <column_width_setting>
       <NameColumnWidth column_width="256"></NameColumnWidth>
-      <ValueColumnWidth column_width="248"></ValueColumnWidth>
+      <ValueColumnWidth column_width="244"></ValueColumnWidth>
    </column_width_setting>
-   <WVObjectSize size="457" />
+   <WVObjectSize size="376" />
    <wave_markers>
       <marker label="" time="90143420" />
       <marker label="" time="89795660" />
    </wave_markers>
-   <wvobject type="logic" fp_name="/payload_gci_tb/xpm_fifo_axis_inst/s_aresetn">
-      <obj_property name="ElementShortName">s_aresetn</obj_property>
-      <obj_property name="ObjectShortName">s_aresetn</obj_property>
-   </wvobject>
-   <wvobject type="logic" fp_name="/payload_gci_tb/xpm_fifo_axis_inst/s_aclk">
-      <obj_property name="ElementShortName">s_aclk</obj_property>
-      <obj_property name="ObjectShortName">s_aclk</obj_property>
-   </wvobject>
-   <wvobject type="logic" fp_name="/payload_gci_tb/xpm_fifo_axis_inst/m_aclk">
-      <obj_property name="ElementShortName">m_aclk</obj_property>
-      <obj_property name="ObjectShortName">m_aclk</obj_property>
-   </wvobject>
-   <wvobject type="logic" fp_name="/payload_gci_tb/xpm_fifo_axis_inst/s_axis_tready">
-      <obj_property name="ElementShortName">s_axis_tready</obj_property>
-      <obj_property name="ObjectShortName">s_axis_tready</obj_property>
-   </wvobject>
-   <wvobject type="array" fp_name="/payload_gci_tb/xpm_fifo_axis_inst/s_axis_tstrb">
-      <obj_property name="ElementShortName">s_axis_tstrb[7:0]</obj_property>
-      <obj_property name="ObjectShortName">s_axis_tstrb[7:0]</obj_property>
-   </wvobject>
-   <wvobject type="array" fp_name="/payload_gci_tb/xpm_fifo_axis_inst/s_axis_tkeep">
-      <obj_property name="ElementShortName">s_axis_tkeep[7:0]</obj_property>
-      <obj_property name="ObjectShortName">s_axis_tkeep[7:0]</obj_property>
-   </wvobject>
-   <wvobject type="array" fp_name="/payload_gci_tb/xpm_fifo_axis_inst/s_axis_tdata">
-      <obj_property name="ElementShortName">s_axis_tdata[63:0]</obj_property>
-      <obj_property name="ObjectShortName">s_axis_tdata[63:0]</obj_property>
-   </wvobject>
-   <wvobject type="logic" fp_name="/payload_gci_tb/xpm_fifo_axis_inst/s_axis_tvalid">
-      <obj_property name="ElementShortName">s_axis_tvalid</obj_property>
-      <obj_property name="ObjectShortName">s_axis_tvalid</obj_property>
-   </wvobject>
-   <wvobject type="logic" fp_name="/payload_gci_tb/xpm_fifo_axis_inst/s_axis_tlast">
-      <obj_property name="ElementShortName">s_axis_tlast</obj_property>
-      <obj_property name="ObjectShortName">s_axis_tlast</obj_property>
-   </wvobject>
-   <wvobject type="array" fp_name="/payload_gci_tb/xpm_fifo_axis_inst/s_axis_tid">
-      <obj_property name="ElementShortName">s_axis_tid[0:0]</obj_property>
-      <obj_property name="ObjectShortName">s_axis_tid[0:0]</obj_property>
-   </wvobject>
-   <wvobject type="array" fp_name="/payload_gci_tb/xpm_fifo_axis_inst/s_axis_tdest">
-      <obj_property name="ElementShortName">s_axis_tdest[0:0]</obj_property>
-      <obj_property name="ObjectShortName">s_axis_tdest[0:0]</obj_property>
-   </wvobject>
-   <wvobject type="array" fp_name="/payload_gci_tb/xpm_fifo_axis_inst/s_axis_tuser">
-      <obj_property name="ElementShortName">s_axis_tuser[0:0]</obj_property>
-      <obj_property name="ObjectShortName">s_axis_tuser[0:0]</obj_property>
-   </wvobject>
-   <wvobject type="logic" fp_name="/payload_gci_tb/xpm_fifo_axis_inst/m_axis_tvalid">
-      <obj_property name="ElementShortName">m_axis_tvalid</obj_property>
-      <obj_property name="ObjectShortName">m_axis_tvalid</obj_property>
-   </wvobject>
-   <wvobject type="logic" fp_name="/payload_gci_tb/xpm_fifo_axis_inst/m_axis_tready">
-      <obj_property name="ElementShortName">m_axis_tready</obj_property>
-      <obj_property name="ObjectShortName">m_axis_tready</obj_property>
-   </wvobject>
-   <wvobject type="array" fp_name="/payload_gci_tb/xpm_fifo_axis_inst/m_axis_tdata">
-      <obj_property name="ElementShortName">m_axis_tdata[63:0]</obj_property>
-      <obj_property name="ObjectShortName">m_axis_tdata[63:0]</obj_property>
-   </wvobject>
-   <wvobject type="array" fp_name="/payload_gci_tb/xpm_fifo_axis_inst/m_axis_tstrb">
-      <obj_property name="ElementShortName">m_axis_tstrb[7:0]</obj_property>
-      <obj_property name="ObjectShortName">m_axis_tstrb[7:0]</obj_property>
-   </wvobject>
-   <wvobject type="array" fp_name="/payload_gci_tb/xpm_fifo_axis_inst/m_axis_tkeep">
-      <obj_property name="ElementShortName">m_axis_tkeep[7:0]</obj_property>
-      <obj_property name="ObjectShortName">m_axis_tkeep[7:0]</obj_property>
-   </wvobject>
-   <wvobject type="logic" fp_name="/payload_gci_tb/xpm_fifo_axis_inst/m_axis_tlast">
-      <obj_property name="ElementShortName">m_axis_tlast</obj_property>
-      <obj_property name="ObjectShortName">m_axis_tlast</obj_property>
-   </wvobject>
-   <wvobject type="array" fp_name="/payload_gci_tb/xpm_fifo_axis_inst/m_axis_tid">
-      <obj_property name="ElementShortName">m_axis_tid[0:0]</obj_property>
-      <obj_property name="ObjectShortName">m_axis_tid[0:0]</obj_property>
-   </wvobject>
-   <wvobject type="array" fp_name="/payload_gci_tb/xpm_fifo_axis_inst/m_axis_tdest">
-      <obj_property name="ElementShortName">m_axis_tdest[0:0]</obj_property>
-      <obj_property name="ObjectShortName">m_axis_tdest[0:0]</obj_property>
-   </wvobject>
-   <wvobject type="array" fp_name="/payload_gci_tb/xpm_fifo_axis_inst/m_axis_tuser">
-      <obj_property name="ElementShortName">m_axis_tuser[0:0]</obj_property>
-      <obj_property name="ObjectShortName">m_axis_tuser[0:0]</obj_property>
-   </wvobject>
-   <wvobject type="logic" fp_name="/payload_gci_tb/xpm_fifo_axis_inst/prog_full_axis">
-      <obj_property name="ElementShortName">prog_full_axis</obj_property>
-      <obj_property name="ObjectShortName">prog_full_axis</obj_property>
-   </wvobject>
-   <wvobject type="array" fp_name="/payload_gci_tb/xpm_fifo_axis_inst/wr_data_count_axis">
-      <obj_property name="ElementShortName">wr_data_count_axis[0:0]</obj_property>
-      <obj_property name="ObjectShortName">wr_data_count_axis[0:0]</obj_property>
-   </wvobject>
-   <wvobject type="logic" fp_name="/payload_gci_tb/xpm_fifo_axis_inst/almost_full_axis">
-      <obj_property name="ElementShortName">almost_full_axis</obj_property>
-      <obj_property name="ObjectShortName">almost_full_axis</obj_property>
-   </wvobject>
-   <wvobject type="logic" fp_name="/payload_gci_tb/xpm_fifo_axis_inst/prog_empty_axis">
-      <obj_property name="ElementShortName">prog_empty_axis</obj_property>
-      <obj_property name="ObjectShortName">prog_empty_axis</obj_property>
-   </wvobject>
-   <wvobject type="array" fp_name="/payload_gci_tb/xpm_fifo_axis_inst/rd_data_count_axis">
-      <obj_property name="ElementShortName">rd_data_count_axis[0:0]</obj_property>
-      <obj_property name="ObjectShortName">rd_data_count_axis[0:0]</obj_property>
-   </wvobject>
-   <wvobject type="logic" fp_name="/payload_gci_tb/xpm_fifo_axis_inst/almost_empty_axis">
-      <obj_property name="ElementShortName">almost_empty_axis</obj_property>
-      <obj_property name="ObjectShortName">almost_empty_axis</obj_property>
-   </wvobject>
-   <wvobject type="logic" fp_name="/payload_gci_tb/xpm_fifo_axis_inst/injectsbiterr_axis">
-      <obj_property name="ElementShortName">injectsbiterr_axis</obj_property>
-      <obj_property name="ObjectShortName">injectsbiterr_axis</obj_property>
-   </wvobject>
-   <wvobject type="logic" fp_name="/payload_gci_tb/xpm_fifo_axis_inst/injectdbiterr_axis">
-      <obj_property name="ElementShortName">injectdbiterr_axis</obj_property>
-      <obj_property name="ObjectShortName">injectdbiterr_axis</obj_property>
-   </wvobject>
-   <wvobject type="logic" fp_name="/payload_gci_tb/xpm_fifo_axis_inst/sbiterr_axis">
-      <obj_property name="ElementShortName">sbiterr_axis</obj_property>
-      <obj_property name="ObjectShortName">sbiterr_axis</obj_property>
-   </wvobject>
-   <wvobject type="logic" fp_name="/payload_gci_tb/xpm_fifo_axis_inst/dbiterr_axis">
-      <obj_property name="ElementShortName">dbiterr_axis</obj_property>
-      <obj_property name="ObjectShortName">dbiterr_axis</obj_property>
-   </wvobject>
-   <wvobject type="logic" fp_name="/payload_gci_tb/xpm_fifo_axis_inst/rst_axis">
-      <obj_property name="ElementShortName">rst_axis</obj_property>
-      <obj_property name="ObjectShortName">rst_axis</obj_property>
-   </wvobject>
-   <wvobject type="logic" fp_name="/payload_gci_tb/xpm_fifo_axis_inst/data_valid_axis">
-      <obj_property name="ElementShortName">data_valid_axis</obj_property>
-      <obj_property name="ObjectShortName">data_valid_axis</obj_property>
-   </wvobject>
-   <wvobject type="logic" fp_name="/payload_gci_tb/xpm_fifo_axis_inst/rd_rst_busy_axis">
-      <obj_property name="ElementShortName">rd_rst_busy_axis</obj_property>
-      <obj_property name="ObjectShortName">rd_rst_busy_axis</obj_property>
-   </wvobject>
-   <wvobject type="array" fp_name="/payload_gci_tb/xpm_fifo_axis_inst/axis_din">
-      <obj_property name="ElementShortName">axis_din[83:0]</obj_property>
-      <obj_property name="ObjectShortName">axis_din[83:0]</obj_property>
-   </wvobject>
-   <wvobject type="array" fp_name="/payload_gci_tb/xpm_fifo_axis_inst/axis_dout">
-      <obj_property name="ElementShortName">axis_dout[83:0]</obj_property>
-      <obj_property name="ObjectShortName">axis_dout[83:0]</obj_property>
-   </wvobject>
-   <wvobject type="logic" fp_name="/payload_gci_tb/xpm_fifo_axis_inst/axis_pkt_read">
-      <obj_property name="ElementShortName">axis_pkt_read</obj_property>
-      <obj_property name="ObjectShortName">axis_pkt_read</obj_property>
-   </wvobject>
-   <wvobject type="logic" fp_name="/payload_gci_tb/xpm_fifo_axis_inst/axis_wr_eop_d1">
-      <obj_property name="ElementShortName">axis_wr_eop_d1</obj_property>
-      <obj_property name="ObjectShortName">axis_wr_eop_d1</obj_property>
-   </wvobject>
-   <wvobject type="logic" fp_name="/payload_gci_tb/xpm_fifo_axis_inst/axis_wr_eop">
-      <obj_property name="ElementShortName">axis_wr_eop</obj_property>
-      <obj_property name="ObjectShortName">axis_wr_eop</obj_property>
-   </wvobject>
-   <wvobject type="logic" fp_name="/payload_gci_tb/xpm_fifo_axis_inst/axis_rd_eop">
-      <obj_property name="ElementShortName">axis_rd_eop</obj_property>
-      <obj_property name="ObjectShortName">axis_rd_eop</obj_property>
-   </wvobject>
-   <wvobject type="array" fp_name="/payload_gci_tb/xpm_fifo_axis_inst/axis_pkt_cnt">
-      <obj_property name="ElementShortName">axis_pkt_cnt[31:0]</obj_property>
-      <obj_property name="ObjectShortName">axis_pkt_cnt[31:0]</obj_property>
-   </wvobject>
-   <wvobject type="array" fp_name="/payload_gci_tb/xpm_fifo_axis_inst/CLOCKING_MODE">
-      <obj_property name="ElementShortName">CLOCKING_MODE[95:0]</obj_property>
-      <obj_property name="ObjectShortName">CLOCKING_MODE[95:0]</obj_property>
-   </wvobject>
-   <wvobject type="array" fp_name="/payload_gci_tb/xpm_fifo_axis_inst/FIFO_MEMORY_TYPE">
-      <obj_property name="ElementShortName">FIFO_MEMORY_TYPE[31:0]</obj_property>
-      <obj_property name="ObjectShortName">FIFO_MEMORY_TYPE[31:0]</obj_property>
-   </wvobject>
-   <wvobject type="array" fp_name="/payload_gci_tb/xpm_fifo_axis_inst/PACKET_FIFO">
-      <obj_property name="ElementShortName">PACKET_FIFO[39:0]</obj_property>
-      <obj_property name="ObjectShortName">PACKET_FIFO[39:0]</obj_property>
-   </wvobject>
-   <wvobject type="array" fp_name="/payload_gci_tb/xpm_fifo_axis_inst/FIFO_DEPTH">
-      <obj_property name="ElementShortName">FIFO_DEPTH[31:0]</obj_property>
-      <obj_property name="ObjectShortName">FIFO_DEPTH[31:0]</obj_property>
-   </wvobject>
-   <wvobject type="array" fp_name="/payload_gci_tb/xpm_fifo_axis_inst/TDATA_WIDTH">
-      <obj_property name="ElementShortName">TDATA_WIDTH[31:0]</obj_property>
-      <obj_property name="ObjectShortName">TDATA_WIDTH[31:0]</obj_property>
-   </wvobject>
-   <wvobject type="array" fp_name="/payload_gci_tb/xpm_fifo_axis_inst/TID_WIDTH">
-      <obj_property name="ElementShortName">TID_WIDTH[31:0]</obj_property>
-      <obj_property name="ObjectShortName">TID_WIDTH[31:0]</obj_property>
-   </wvobject>
-   <wvobject type="array" fp_name="/payload_gci_tb/xpm_fifo_axis_inst/TDEST_WIDTH">
-      <obj_property name="ElementShortName">TDEST_WIDTH[31:0]</obj_property>
-      <obj_property name="ObjectShortName">TDEST_WIDTH[31:0]</obj_property>
-   </wvobject>
-   <wvobject type="array" fp_name="/payload_gci_tb/xpm_fifo_axis_inst/TUSER_WIDTH">
-      <obj_property name="ElementShortName">TUSER_WIDTH[31:0]</obj_property>
-      <obj_property name="ObjectShortName">TUSER_WIDTH[31:0]</obj_property>
-   </wvobject>
-   <wvobject type="array" fp_name="/payload_gci_tb/xpm_fifo_axis_inst/SIM_ASSERT_CHK">
-      <obj_property name="ElementShortName">SIM_ASSERT_CHK[31:0]</obj_property>
-      <obj_property name="ObjectShortName">SIM_ASSERT_CHK[31:0]</obj_property>
-   </wvobject>
-   <wvobject type="array" fp_name="/payload_gci_tb/xpm_fifo_axis_inst/EN_SIM_ASSERT_ERR">
-      <obj_property name="ElementShortName">EN_SIM_ASSERT_ERR[55:0]</obj_property>
-      <obj_property name="ObjectShortName">EN_SIM_ASSERT_ERR[55:0]</obj_property>
-   </wvobject>
-   <wvobject type="array" fp_name="/payload_gci_tb/xpm_fifo_axis_inst/CASCADE_HEIGHT">
-      <obj_property name="ElementShortName">CASCADE_HEIGHT[31:0]</obj_property>
-      <obj_property name="ObjectShortName">CASCADE_HEIGHT[31:0]</obj_property>
-   </wvobject>
-   <wvobject type="array" fp_name="/payload_gci_tb/xpm_fifo_axis_inst/ECC_MODE">
-      <obj_property name="ElementShortName">ECC_MODE[47:0]</obj_property>
-      <obj_property name="ObjectShortName">ECC_MODE[47:0]</obj_property>
-   </wvobject>
-   <wvobject type="array" fp_name="/payload_gci_tb/xpm_fifo_axis_inst/RELATED_CLOCKS">
-      <obj_property name="ElementShortName">RELATED_CLOCKS[31:0]</obj_property>
-      <obj_property name="ObjectShortName">RELATED_CLOCKS[31:0]</obj_property>
-   </wvobject>
-   <wvobject type="array" fp_name="/payload_gci_tb/xpm_fifo_axis_inst/USE_ADV_FEATURES">
-      <obj_property name="ElementShortName">USE_ADV_FEATURES[31:0]</obj_property>
-      <obj_property name="ObjectShortName">USE_ADV_FEATURES[31:0]</obj_property>
-   </wvobject>
-   <wvobject type="array" fp_name="/payload_gci_tb/xpm_fifo_axis_inst/WR_DATA_COUNT_WIDTH">
-      <obj_property name="ElementShortName">WR_DATA_COUNT_WIDTH[31:0]</obj_property>
-      <obj_property name="ObjectShortName">WR_DATA_COUNT_WIDTH[31:0]</obj_property>
-   </wvobject>
-   <wvobject type="array" fp_name="/payload_gci_tb/xpm_fifo_axis_inst/RD_DATA_COUNT_WIDTH">
-      <obj_property name="ElementShortName">RD_DATA_COUNT_WIDTH[31:0]</obj_property>
-      <obj_property name="ObjectShortName">RD_DATA_COUNT_WIDTH[31:0]</obj_property>
-   </wvobject>
-   <wvobject type="array" fp_name="/payload_gci_tb/xpm_fifo_axis_inst/PROG_FULL_THRESH">
-      <obj_property name="ElementShortName">PROG_FULL_THRESH[31:0]</obj_property>
-      <obj_property name="ObjectShortName">PROG_FULL_THRESH[31:0]</obj_property>
-   </wvobject>
-   <wvobject type="array" fp_name="/payload_gci_tb/xpm_fifo_axis_inst/PROG_EMPTY_THRESH">
-      <obj_property name="ElementShortName">PROG_EMPTY_THRESH[31:0]</obj_property>
-      <obj_property name="ObjectShortName">PROG_EMPTY_THRESH[31:0]</obj_property>
-   </wvobject>
-   <wvobject type="array" fp_name="/payload_gci_tb/xpm_fifo_axis_inst/CDC_SYNC_STAGES">
-      <obj_property name="ElementShortName">CDC_SYNC_STAGES[31:0]</obj_property>
-      <obj_property name="ObjectShortName">CDC_SYNC_STAGES[31:0]</obj_property>
-   </wvobject>
-   <wvobject type="array" fp_name="/payload_gci_tb/xpm_fifo_axis_inst/EN_ADV_FEATURE_AXIS">
-      <obj_property name="ElementShortName">EN_ADV_FEATURE_AXIS[15:0]</obj_property>
-      <obj_property name="ObjectShortName">EN_ADV_FEATURE_AXIS[15:0]</obj_property>
-   </wvobject>
-   <wvobject type="logic" fp_name="/payload_gci_tb/xpm_fifo_axis_inst/EN_ALMOST_FULL_INT">
-      <obj_property name="ElementShortName">EN_ALMOST_FULL_INT</obj_property>
-      <obj_property name="ObjectShortName">EN_ALMOST_FULL_INT</obj_property>
-   </wvobject>
-   <wvobject type="logic" fp_name="/payload_gci_tb/xpm_fifo_axis_inst/EN_ALMOST_EMPTY_INT">
-      <obj_property name="ElementShortName">EN_ALMOST_EMPTY_INT</obj_property>
-      <obj_property name="ObjectShortName">EN_ALMOST_EMPTY_INT</obj_property>
-   </wvobject>
-   <wvobject type="logic" fp_name="/payload_gci_tb/xpm_fifo_axis_inst/EN_DATA_VALID_INT">
-      <obj_property name="ElementShortName">EN_DATA_VALID_INT</obj_property>
-      <obj_property name="ObjectShortName">EN_DATA_VALID_INT</obj_property>
-   </wvobject>
-   <wvobject type="array" fp_name="/payload_gci_tb/xpm_fifo_axis_inst/EN_ADV_FEATURE_AXIS_INT">
-      <obj_property name="ElementShortName">EN_ADV_FEATURE_AXIS_INT[15:0]</obj_property>
-      <obj_property name="ObjectShortName">EN_ADV_FEATURE_AXIS_INT[15:0]</obj_property>
-   </wvobject>
-   <wvobject type="array" fp_name="/payload_gci_tb/xpm_fifo_axis_inst/USE_ADV_FEATURES_INT">
-      <obj_property name="ElementShortName">USE_ADV_FEATURES_INT[31:0]</obj_property>
-      <obj_property name="ObjectShortName">USE_ADV_FEATURES_INT[31:0]</obj_property>
-   </wvobject>
-   <wvobject type="logic" fp_name="/payload_gci_tb/xpm_fifo_axis_inst/PKT_SIZE_LT8">
-      <obj_property name="ElementShortName">PKT_SIZE_LT8</obj_property>
-      <obj_property name="ObjectShortName">PKT_SIZE_LT8</obj_property>
-   </wvobject>
-   <wvobject type="array" fp_name="/payload_gci_tb/xpm_fifo_axis_inst/LOG_DEPTH_AXIS">
-      <obj_property name="ElementShortName">LOG_DEPTH_AXIS[31:0]</obj_property>
-      <obj_property name="ObjectShortName">LOG_DEPTH_AXIS[31:0]</obj_property>
-   </wvobject>
-   <wvobject type="array" fp_name="/payload_gci_tb/xpm_fifo_axis_inst/TDATA_OFFSET">
-      <obj_property name="ElementShortName">TDATA_OFFSET[31:0]</obj_property>
-      <obj_property name="ObjectShortName">TDATA_OFFSET[31:0]</obj_property>
-   </wvobject>
-   <wvobject type="array" fp_name="/payload_gci_tb/xpm_fifo_axis_inst/TSTRB_OFFSET">
-      <obj_property name="ElementShortName">TSTRB_OFFSET[31:0]</obj_property>
-      <obj_property name="ObjectShortName">TSTRB_OFFSET[31:0]</obj_property>
-   </wvobject>
-   <wvobject type="array" fp_name="/payload_gci_tb/xpm_fifo_axis_inst/TKEEP_OFFSET">
-      <obj_property name="ElementShortName">TKEEP_OFFSET[31:0]</obj_property>
-      <obj_property name="ObjectShortName">TKEEP_OFFSET[31:0]</obj_property>
-   </wvobject>
-   <wvobject type="array" fp_name="/payload_gci_tb/xpm_fifo_axis_inst/TID_OFFSET">
-      <obj_property name="ElementShortName">TID_OFFSET[31:0]</obj_property>
-      <obj_property name="ObjectShortName">TID_OFFSET[31:0]</obj_property>
-   </wvobject>
-   <wvobject type="array" fp_name="/payload_gci_tb/xpm_fifo_axis_inst/TDEST_OFFSET">
-      <obj_property name="ElementShortName">TDEST_OFFSET[31:0]</obj_property>
-      <obj_property name="ObjectShortName">TDEST_OFFSET[31:0]</obj_property>
-   </wvobject>
-   <wvobject type="array" fp_name="/payload_gci_tb/xpm_fifo_axis_inst/TUSER_OFFSET">
-      <obj_property name="ElementShortName">TUSER_OFFSET[31:0]</obj_property>
-      <obj_property name="ObjectShortName">TUSER_OFFSET[31:0]</obj_property>
-   </wvobject>
-   <wvobject type="array" fp_name="/payload_gci_tb/xpm_fifo_axis_inst/AXIS_DATA_WIDTH">
-      <obj_property name="ElementShortName">AXIS_DATA_WIDTH[31:0]</obj_property>
-      <obj_property name="ObjectShortName">AXIS_DATA_WIDTH[31:0]</obj_property>
-   </wvobject>
-   <wvobject type="array" fp_name="/payload_gci_tb/xpm_fifo_axis_inst/P_COMMON_CLOCK">
-      <obj_property name="ElementShortName">P_COMMON_CLOCK[31:0]</obj_property>
-      <obj_property name="ObjectShortName">P_COMMON_CLOCK[31:0]</obj_property>
-   </wvobject>
-   <wvobject type="array" fp_name="/payload_gci_tb/xpm_fifo_axis_inst/P_FIFO_MEMORY_TYPE">
-      <obj_property name="ElementShortName">P_FIFO_MEMORY_TYPE[31:0]</obj_property>
-      <obj_property name="ObjectShortName">P_FIFO_MEMORY_TYPE[31:0]</obj_property>
-   </wvobject>
-   <wvobject type="array" fp_name="/payload_gci_tb/xpm_fifo_axis_inst/P_ECC_MODE">
-      <obj_property name="ElementShortName">P_ECC_MODE[31:0]</obj_property>
-      <obj_property name="ObjectShortName">P_ECC_MODE[31:0]</obj_property>
-   </wvobject>
-   <wvobject type="array" fp_name="/payload_gci_tb/xpm_fifo_axis_inst/P_PKT_MODE">
-      <obj_property name="ElementShortName">P_PKT_MODE[31:0]</obj_property>
-      <obj_property name="ObjectShortName">P_PKT_MODE[31:0]</obj_property>
-   </wvobject>
-   <wvobject type="array" fp_name="/payload_gci_tb/xpm_fifo_axis_inst/AXIS_FINAL_DATA_WIDTH">
-      <obj_property name="ElementShortName">AXIS_FINAL_DATA_WIDTH[31:0]</obj_property>
-      <obj_property name="ObjectShortName">AXIS_FINAL_DATA_WIDTH[31:0]</obj_property>
-   </wvobject>
-   <wvobject type="array" fp_name="/payload_gci_tb/xpm_fifo_axis_inst/TUSER_MAX_WIDTH">
-      <obj_property name="ElementShortName">TUSER_MAX_WIDTH[31:0]</obj_property>
-      <obj_property name="ObjectShortName">TUSER_MAX_WIDTH[31:0]</obj_property>
-   </wvobject>
    <wvobject fp_name="divider54058" type="divider">
    </wvobject>
    <wvobject type="logic" fp_name="/payload_gci_tb/clk">
diff --git a/Sources/Payload/GEP/hdl/gep2gci.vhd b/Sources/Payload/GEP/hdl/gep2gci.vhd
index 4ba113b57..48a80214b 100644
--- a/Sources/Payload/GEP/hdl/gep2gci.vhd
+++ b/Sources/Payload/GEP/hdl/gep2gci.vhd
@@ -250,8 +250,8 @@ begin
     end if;
   end process;
 
-  pattern_word_v(8) <= x"12121212_12121212_34343434_34343434";
-  pattern_word_v(9) <= x"56565656_56565665_78787878_78787878";
+  pattern_word_v(8) <= x"12121212121212123434343434343434";
+  pattern_word_v(9) <= x"56565656565656657878787878787878";
 
 
 
