diff --git a/LCLS-II/gthUltraScale+/ruckus.tcl b/LCLS-II/gthUltraScale+/ruckus.tcl
index 4635e03..9895826 100644
--- a/LCLS-II/gthUltraScale+/ruckus.tcl
+++ b/LCLS-II/gthUltraScale+/ruckus.tcl
@@ -4,11 +4,13 @@ source -quiet $::env(RUCKUS_DIR)/vivado_proc.tcl
 if { $::env(VIVADO_VERSION) >= 2022.2} {
    loadSource -lib lcls_timing_core -dir "$::DIR_PATH/rtl"
 
-   loadSource -lib lcls_timing_core   -path "$::DIR_PATH/coregen/TimingGth_extref.dcp"
-   #loadIpCore -path "$::DIR_PATH/coregen/TimingGth_extref.xci"
-
-   loadSource -lib lcls_timing_core   -path "$::DIR_PATH/coregen/TimingGth_fixedlat.dcp"
-   #loadIpCore -path "$::DIR_PATH/coregen/TimingGth_fixedlat.xci"
+   if { [info exists ::env(LCLS_TIMING_XCI)] != 0 && $::env(LCLS_TIMING_XCI) == 1 } {
+       loadIpCore -path "$::DIR_PATH/coregen/TimingGth_extref.xci"
+       loadIpCore -path "$::DIR_PATH/coregen/TimingGth_fixedlat.xci"
+   } else {
+       loadSource -lib lcls_timing_core   -path "$::DIR_PATH/coregen/TimingGth_extref.dcp"
+       loadSource -lib lcls_timing_core   -path "$::DIR_PATH/coregen/TimingGth_fixedlat.dcp"
+   }
 } else {
    puts "\n\nWARNING: $::DIR_PATH requires Vivado 2022.2 (or later)\n\n"
 }
diff --git a/LCLS-II/gthUltraScale/ruckus.tcl b/LCLS-II/gthUltraScale/ruckus.tcl
index de55f56..e3e3c88 100644
--- a/LCLS-II/gthUltraScale/ruckus.tcl
+++ b/LCLS-II/gthUltraScale/ruckus.tcl
@@ -5,11 +5,13 @@ if { $::env(VIVADO_VERSION) >= 2016.4 } {
 
    loadSource -lib lcls_timing_core -dir "$::DIR_PATH/rtl"
 
-   loadSource -lib lcls_timing_core   -path "$::DIR_PATH/coregen/TimingGth_extref.dcp"
-   # loadIpCore -path "$::DIR_PATH/coregen/TimingGth_extref.xci"
-
-   loadSource -lib lcls_timing_core   -path "$::DIR_PATH/coregen/TimingGth_fixedlat.dcp"
-   # loadIpCore -path "$::DIR_PATH/coregen/TimingGth_fixedlat.xci"
+   if { [info exists ::env(LCLS_TIMING_XCI)] != 0 && $::env(LCLS_TIMING_XCI) == 1 } {
+       loadIpCore -path "$::DIR_PATH/coregen/TimingGth_extref.xci"
+       loadIpCore -path "$::DIR_PATH/coregen/TimingGth_fixedlat.xci"
+   } else {
+       loadSource -lib lcls_timing_core   -path "$::DIR_PATH/coregen/TimingGth_extref.dcp"
+       loadSource -lib lcls_timing_core   -path "$::DIR_PATH/coregen/TimingGth_fixedlat.dcp"
+   }
 
 } else {
    puts "\n\nWARNING: $::DIR_PATH requires Vivado 2016.4 (or later)\n\n"
diff --git a/LCLS-II/gtyUltraScale+/ruckus.tcl b/LCLS-II/gtyUltraScale+/ruckus.tcl
index 1db36ab..f7fb77d 100644
--- a/LCLS-II/gtyUltraScale+/ruckus.tcl
+++ b/LCLS-II/gtyUltraScale+/ruckus.tcl
@@ -14,19 +14,25 @@ if { [info exists ::env(TIMING_246MHz)] != 1 || $::env(TIMING_246MHz) == 0 } {
 
 if { $::env(VIVADO_VERSION) >= 2021.1 && [info exists ::env(TIMING_246MHz)] != 1} {
 
-   loadSource -lib lcls_timing_core   -path "${path}/TimingGty_extref.dcp"
-   # loadIpCore -path "${path}/TimingGty_extref.xci"
+   if { [info exists ::env(LCLS_TIMING_XCI)] != 0 && $::env(LCLS_TIMING_XCI) == 1 } {
+       loadIpCore -path "${path}/TimingGty_extref.xci"
+       loadIpCore -path "${path}/TimingGty_fixedlat.xci"
+       puts "Loading XCI files for LCLS Timing"
+   } else {
+       loadSource -lib lcls_timing_core   -path "${path}/TimingGty_extref.dcp"
+       loadSource -lib lcls_timing_core   -path "${path}/TimingGty_fixedlat.dcp"       
+   }      
 
-   loadSource -lib lcls_timing_core   -path "${path}/TimingGty_fixedlat.dcp"
-   # loadIpCore -path "${path}/TimingGty_fixedlat.xci"
 
 } elseif { $::env(VIVADO_VERSION) >= 2020.2 && [info exists ::env(TIMING_246MHz)] == 1 } {
 
-   loadSource -lib lcls_timing_core   -path "${path}/TimingGty_extref.dcp"
-   # loadIpCore -path "${path}/TimingGty_extref.xci"
-
-   loadSource -lib lcls_timing_core   -path "${path}/TimingGty_fixedlat.dcp"
-   # loadIpCore -path "${path}/TimingGty_fixedlat.xci"
+    if { [info exists ::env(LCLS_TIMING_XCI)] != 0 && $::env(LCLS_TIMING_XCI) == 1 } {
+	loadIpCore -path "${path}/TimingGty_extref.xci"
+	loadIpCore -path "${path}/TimingGty_fixedlat.xci"       
+    } else {
+	loadSource -lib lcls_timing_core   -path "${path}/TimingGty_extref.dcp"
+	loadSource -lib lcls_timing_core   -path "${path}/TimingGty_fixedlat.dcp"       
+    }      
 
 } else {
    puts "\n\nWARNING: $::DIR_PATH requires Vivado 2021.1 (or later)\n\n"