diff --git a/projects/common/a5soc/a5soc_system_assign.tcl b/projects/common/a5soc/a5soc_system_assign.tcl
index a39e41360..2e79736f1 100755
--- a/projects/common/a5soc/a5soc_system_assign.tcl
+++ b/projects/common/a5soc/a5soc_system_assign.tcl
@@ -113,32 +113,34 @@ set_instance_assignment -name IO_STANDARD "3.3-V LVTTL" -to gpio_gpio41
 set_instance_assignment -name IO_STANDARD "3.3-V LVTTL" -to gpio_gpio42
 set_instance_assignment -name IO_STANDARD "3.3-V LVTTL" -to gpio_gpio43
 
-# gpio
+# led & switches
 
-set_location_assignment PIN_AW23 -to fpga_button_pio[3]
-set_location_assignment PIN_AW24 -to fpga_button_pio[2]
-set_location_assignment PIN_AP24 -to fpga_button_pio[1]
-set_location_assignment PIN_AT23 -to fpga_button_pio[0]
-set_location_assignment PIN_AU23 -to fpga_dipsw_pio[3]
-set_location_assignment PIN_AE24 -to fpga_dipsw_pio[2]
-set_location_assignment PIN_AF24 -to fpga_dipsw_pio[1]
-set_location_assignment PIN_AL24 -to fpga_dipsw_pio[0]
-set_location_assignment PIN_AD24 -to fpga_led_pio[3]
-set_location_assignment PIN_AT24 -to fpga_led_pio[2]
-set_location_assignment PIN_AU24 -to fpga_led_pio[1]
-set_location_assignment PIN_AH24 -to fpga_led_pio[0]
-set_instance_assignment -name IO_STANDARD "1.5 V" -to fpga_button_pio[3]
-set_instance_assignment -name IO_STANDARD "1.5 V" -to fpga_button_pio[2]
-set_instance_assignment -name IO_STANDARD "1.5 V" -to fpga_button_pio[1]
-set_instance_assignment -name IO_STANDARD "1.5 V" -to fpga_button_pio[0]
-set_instance_assignment -name IO_STANDARD "1.5 V" -to fpga_dipsw_pio[3]
-set_instance_assignment -name IO_STANDARD "1.5 V" -to fpga_dipsw_pio[2]
-set_instance_assignment -name IO_STANDARD "1.5 V" -to fpga_dipsw_pio[1]
-set_instance_assignment -name IO_STANDARD "1.5 V" -to fpga_dipsw_pio[0]
-set_instance_assignment -name IO_STANDARD "1.5 V" -to fpga_led_pio[3]
-set_instance_assignment -name IO_STANDARD "1.5 V" -to fpga_led_pio[2]
-set_instance_assignment -name IO_STANDARD "1.5 V" -to fpga_led_pio[1]
-set_instance_assignment -name IO_STANDARD "1.5 V" -to fpga_led_pio[0]
+set_location_assignment PIN_AD24 -to led[3]
+set_location_assignment PIN_AT24 -to led[2]
+set_location_assignment PIN_AU24 -to led[1]
+set_location_assignment PIN_AH24 -to led[0]
+set_instance_assignment -name IO_STANDARD "1.5 V" -to led[3]
+set_instance_assignment -name IO_STANDARD "1.5 V" -to led[2]
+set_instance_assignment -name IO_STANDARD "1.5 V" -to led[1]
+set_instance_assignment -name IO_STANDARD "1.5 V" -to led[0]
+
+set_location_assignment PIN_AW23 -to push_buttons[3]
+set_location_assignment PIN_AW24 -to push_buttons[2]
+set_location_assignment PIN_AP24 -to push_buttons[1]
+set_location_assignment PIN_AT23 -to push_buttons[0]
+set_instance_assignment -name IO_STANDARD "1.5 V" -to push_buttons[3]
+set_instance_assignment -name IO_STANDARD "1.5 V" -to push_buttons[2]
+set_instance_assignment -name IO_STANDARD "1.5 V" -to push_buttons[1]
+set_instance_assignment -name IO_STANDARD "1.5 V" -to push_buttons[0]
+
+set_location_assignment PIN_AU23 -to dip_switches[3]
+set_location_assignment PIN_AE24 -to dip_switches[2]
+set_location_assignment PIN_AF24 -to dip_switches[1]
+set_location_assignment PIN_AL24 -to dip_switches[0]
+set_instance_assignment -name IO_STANDARD "1.5 V" -to dip_switches[3]
+set_instance_assignment -name IO_STANDARD "1.5 V" -to dip_switches[2]
+set_instance_assignment -name IO_STANDARD "1.5 V" -to dip_switches[1]
+set_instance_assignment -name IO_STANDARD "1.5 V" -to dip_switches[0]
 
 # ddr
 
diff --git a/projects/fmcjesdadc1/a5soc/system_project.tcl b/projects/fmcjesdadc1/a5soc/system_project.tcl
index 7f0d2e61a..30d9cbca7 100755
--- a/projects/fmcjesdadc1/a5soc/system_project.tcl
+++ b/projects/fmcjesdadc1/a5soc/system_project.tcl
@@ -8,34 +8,32 @@ set_global_assignment -name FAMILY "Arria V"
 set_global_assignment -name DEVICE 5ASTFD5K3F40I3ES
 set_global_assignment -name TOP_LEVEL_ENTITY system_top
 set_global_assignment -name SDC_FILE system_constr.sdc
-#set_global_assignment -name QSYS_FILE system_bd.qsys
-set_global_assignment -name QIP_FILE system_bd/synthesis/system_bd.qip
+set_global_assignment -name QSYS_FILE system_bd.qsys
 set_global_assignment -name VERILOG_FILE $ad_hdl_dir/library/common/altera/ad_jesd_align.v
 set_global_assignment -name VERILOG_FILE $ad_hdl_dir/library/common/altera/ad_xcvr_rx_rst.v
 set_global_assignment -name VERILOG_FILE ../common/fmcjesdadc1_spi.v
 set_global_assignment -name VERILOG_FILE system_top.v
 
-source ../../common/a5soc/a5soc_system_assign.tcl
-#source $ad_hdl_dir/projects/common/a5soc/a5soc_system_assign.tcl
+source $ad_hdl_dir/projects/common/a5soc/a5soc_system_assign.tcl
 
 # reference clock
 
-set_location_assignment PIN_AC31  -to ref_clk
-set_location_assignment PIN_AC32  -to "ref_clk(n)"
+set_location_assignment PIN_AG32  -to ref_clk
+set_location_assignment PIN_AG33  -to "ref_clk(n)"
 set_instance_assignment -name IO_STANDARD "1.5-V PCML" -to ref_clk
 set_instance_assignment -name XCVR_REFCLK_PIN_TERMINATION AC_COUPLING -to ref_clk
 set_instance_assignment -name XCVR_IO_PIN_TERMINATION 100_OHMS -to ref_clk
 
 # lane data
 
-set_location_assignment PIN_AF39  -to rx_data[0]
-set_location_assignment PIN_AF38  -to "rx_data[0](n)"
-set_location_assignment PIN_AB39  -to rx_data[1]
-set_location_assignment PIN_AB38  -to "rx_data[1](n)"
-set_location_assignment PIN_Y39   -to rx_data[2]
-set_location_assignment PIN_Y38   -to "rx_data[2](n)"
-set_location_assignment PIN_T39   -to rx_data[3]
-set_location_assignment PIN_T38   -to "rx_data[3](n)"
+set_location_assignment PIN_AW37  -to rx_data[0]
+set_location_assignment PIN_AW36  -to "rx_data[0](n)"
+set_location_assignment PIN_AP39  -to rx_data[1]
+set_location_assignment PIN_AP38  -to "rx_data[1](n)"
+set_location_assignment PIN_AM39  -to rx_data[2]
+set_location_assignment PIN_AM38  -to "rx_data[2](n)"
+set_location_assignment PIN_AH39  -to rx_data[3]
+set_location_assignment PIN_AH38  -to "rx_data[3](n)"
 set_instance_assignment -name IO_STANDARD "1.5-V PCML" -to rx_data[0]
 set_instance_assignment -name IO_STANDARD "1.5-V PCML" -to rx_data[1]
 set_instance_assignment -name IO_STANDARD "1.5-V PCML" -to rx_data[2]
@@ -47,32 +45,22 @@ set_instance_assignment -name XCVR_IO_PIN_TERMINATION 100_OHMS -to rx_data[3]
 
 # jesd signals
 
-set_location_assignment PIN_D24   -to rx_sync
+set_location_assignment PIN_A29   -to rx_sync
 set_instance_assignment -name IO_STANDARD "2.5 V" -to rx_sync
 
-set_location_assignment PIN_E24   -to rx_sysref
+set_location_assignment PIN_A28   -to rx_sysref
 set_instance_assignment -name IO_STANDARD "2.5 V" -to rx_sysref
 
 # spi
 
-set_location_assignment PIN_E25   -to spi_csn
-set_location_assignment PIN_D25   -to spi_clk
-set_location_assignment PIN_R24   -to spi_sdio
+set_location_assignment PIN_C29   -to spi_csn
+set_location_assignment PIN_B28   -to spi_clk
+set_location_assignment PIN_C32   -to spi_sdio
 
 set_instance_assignment -name IO_STANDARD "2.5 V" -to spi_csn
 set_instance_assignment -name IO_STANDARD "2.5 V" -to spi_clk
 set_instance_assignment -name IO_STANDARD "2.5 V" -to spi_sdio
 
-# globals
-
-set_global_assignment -name SYNCHRONIZER_IDENTIFICATION AUTO
-set_global_assignment -name ENABLE_ADVANCED_IO_TIMING ON
-set_global_assignment -name USE_TIMEQUEST_TIMING_ANALYZER ON
-set_global_assignment -name TIMEQUEST_DO_REPORT_TIMING ON
-set_global_assignment -name TIMEQUEST_DO_CCPP_REMOVAL ON
-set_global_assignment -name TIMEQUEST_REPORT_SCRIPT system_timing.tcl
-set_global_assignment -name ON_CHIP_BITSTREAM_DECOMPRESSION OFF
-
 #set_global_assignment -name SEARCH_PATH db/ip/system_bd
 #set_global_assignment -name SEARCH_PATH db/ip/system_bd/submodules
 #set_global_assignment -name SEARCH_PATH db/ip/system_bd/submodules/sequencer