diff --git a/projects/ad7616_sdz/common/ad7616_bd.tcl b/projects/ad7616_sdz/common/ad7616_bd.tcl
index aaca1734f..e550aef16 100644
--- a/projects/ad7616_sdz/common/ad7616_bd.tcl
+++ b/projects/ad7616_sdz/common/ad7616_bd.tcl
@@ -1,23 +1,6 @@
 
-##--------------------------------------------------------------
-# IMPORTANT: Set AD7616 operation and interface mode
-#
-#    ad7616_opm - Defines the operation mode (software OR hardware)
-#    ad7616_if  - Defines the interface type (serial OR parallel)
-#
-# LEGEND: Software  - 0
-#         Hardware  - 1
-#         Serial    - 0
-#         Parallel  - 1
-#
-# NOTE : These switches are 'hardware' switches. User needs to
-# reimplement the design each and every time, after these variables
-# were changed.
-
-set ad7616_opm  0
-set ad7616_if   0
-
-##--------------------------------------------------------------
+global ad7616_if
+global ad7616_opm
 
 # data interfaces
 
@@ -77,10 +60,6 @@ if {$ad7616_if == 0} {
   ad_connect  burst axi_ad7616/burst
   ad_connect  os axi_ad7616/os
 
-  ad_connect  db_o GND
-  ad_connect  wr_n GND
-  ad_connect  rd_n GND
-
 } else {
 
 }
diff --git a/projects/ad7616_sdz/zc706/system_project.tcl b/projects/ad7616_sdz/zc706/system_project.tcl
index f13fb9e90..06b3ccf1b 100644
--- a/projects/ad7616_sdz/zc706/system_project.tcl
+++ b/projects/ad7616_sdz/zc706/system_project.tcl
@@ -3,12 +3,29 @@ source ../../scripts/adi_env.tcl
 source $ad_hdl_dir/projects/scripts/adi_project.tcl
 source $ad_hdl_dir/projects/scripts/adi_board.tcl
 
-set ad7616_interface "serial"
-#set ad7616_interface "parallel"
+##--------------------------------------------------------------
+# IMPORTANT: Set AD7616 operation and interface mode
+#
+#    ad7616_opm - Defines the operation mode (software OR hardware)
+#    ad7616_if  - Defines the interface type (serial OR parallel)
+#
+# LEGEND: Software  - 0
+#         Hardware  - 1
+#         Serial    - 0
+#         Parallel  - 1
+#
+# NOTE : These switches are 'hardware' switches. User needs to
+# reimplement the design each and every time, after these variables
+# were changed.
+#
+##--------------------------------------------------------------
+
+set ad7616_if   0
+set ad7616_opm  0
 
 adi_project_create ad7616_sdz_zc706
 
-if { $ad7616_interface eq "serial" } {
+if { $ad7616_if == 0 } {
 
   adi_project_files ad7616_sdz_zc706 [list \
     "$ad_hdl_dir/library/common/ad_iobuf.v" \
@@ -16,7 +33,7 @@ if { $ad7616_interface eq "serial" } {
     "serial_if_constr.xdc" \
     "$ad_hdl_dir/projects/common/zc706/zc706_system_constr.xdc"]
 
-} elseif { $ad7616_interface eq "parallel" } {
+} elseif { $ad7616_if == 1 } {
 
   adi_project_files ad7616_sdz_zc706 [list \
     "$ad_hdl_dir/library/common/ad_iobuf.v" \