diff --git a/Info.md b/Info.md
index a9a9f16..1ce9e1c 100644
--- a/Info.md
+++ b/Info.md
@@ -37,20 +37,20 @@
 
 # Details
 
-Last updated on Wed 30 Oct 2019 11:49:37 PM UTC (2019-10-30T23:49:37+00:00).
+Last updated on Fri 08 Nov 2019 05:06:47 AM UTC (2019-11-08T05:06:47+00:00).
 
-Created using [Project X-Ray](https://github.com/SymbiFlow/prjxray) version [daf28415](https://github.com/SymbiFlow/prjxray/commit/daf284151c160efb67ec57d4215a76826be3071e).
+Created using [Project X-Ray](https://github.com/SymbiFlow/prjxray) version [aa9393b1](https://github.com/SymbiFlow/prjxray/commit/aa9393b199e34ce8cd8f3671c2b8c51714bf0b70).
 
 Latest commit was;
 ```
-commit daf284151c160efb67ec57d4215a76826be3071e
-Merge: 78cf96be 43fe925f
+commit aa9393b199e34ce8cd8f3671c2b8c51714bf0b70
+Merge: 4cec0817 99d31d2e
 Author: litghost <537074+litghost@users.noreply.github.com>
-Date:   Wed Oct 30 10:40:01 2019 -0700
+Date:   Thu Nov 7 10:07:03 2019 -0800
 
-    Merge pull request #1119 from antmicro/litex_litedram
+    Merge pull request #1135 from antmicro/fix-071-hclk-ioi-ppips
     
-    minitests: Add test for Litex DRAM memory interface
+    071-ppips: skip HCLK_IOI_CK_IGCLK[0-9] ppips addition
 ```
 
 
@@ -59,7 +59,7 @@
 
 ### Settings
 
-Created using following [settings/artix7.sh (sha256: 26e1ff93657132928a3b583c95347267d7afeb18a7b7036f0d7a6ea3367ae803)](https://github.com/SymbiFlow/prjxray/blob/daf284151c160efb67ec57d4215a76826be3071e/settings/artix7.sh)
+Created using following [settings/artix7.sh (sha256: 26e1ff93657132928a3b583c95347267d7afeb18a7b7036f0d7a6ea3367ae803)](https://github.com/SymbiFlow/prjxray/blob/aa9393b199e34ce8cd8f3671c2b8c51714bf0b70/settings/artix7.sh)
 ```shell
 export XRAY_DATABASE="artix7"
 export XRAY_PART="xc7a50tfgg484-1"
@@ -136,26 +136,26 @@
  * [`a01322f2b03d6e7a29dd225905afe60347f157b8cd48a0e3ad0299a8776774cf  ./artix7/mask_clk_bufg_top_r.db`](./artix7/mask_clk_bufg_top_r.db)
  * [`492d7880ed2be3ce5479b397a88e012ea0c98e2ba667fa02d1d57acbdf10208f  ./artix7/mask_clk_hrow_bot_r.db`](./artix7/mask_clk_hrow_bot_r.db)
  * [`8065dd1943464a57b58323eb09fa9d34148e09a3cd0d7d750dc31166ac25164a  ./artix7/mask_clk_hrow_top_r.db`](./artix7/mask_clk_hrow_top_r.db)
- * [`aab2e5f20890d805b6a78db6e6fd68d6024a140ac5e960feb4162d7e49582ca8  ./artix7/mask_dsp_l.db`](./artix7/mask_dsp_l.db)
+ * [`8c78f75e8bc79d687f6e72b8f3f02c4f6389130ff5338ed9626e53b77e58a419  ./artix7/mask_dsp_l.db`](./artix7/mask_dsp_l.db)
  * [`e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855  ./artix7/mask_dsp_l.origin_info.db`](./artix7/mask_dsp_l.origin_info.db)
- * [`aab2e5f20890d805b6a78db6e6fd68d6024a140ac5e960feb4162d7e49582ca8  ./artix7/mask_dsp_r.db`](./artix7/mask_dsp_r.db)
+ * [`8c78f75e8bc79d687f6e72b8f3f02c4f6389130ff5338ed9626e53b77e58a419  ./artix7/mask_dsp_r.db`](./artix7/mask_dsp_r.db)
  * [`e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855  ./artix7/mask_dsp_r.origin_info.db`](./artix7/mask_dsp_r.origin_info.db)
  * [`be757fb834be7ff84a2873c0ac6621c909a5e85362b397667760edde86616f84  ./artix7/mask_hclk_cmt.db`](./artix7/mask_hclk_cmt.db)
  * [`be757fb834be7ff84a2873c0ac6621c909a5e85362b397667760edde86616f84  ./artix7/mask_hclk_cmt_l.db`](./artix7/mask_hclk_cmt_l.db)
- * [`98ba1080f5a9e2b3aa2536c0ae3845f5a743761ae2ed8bed1e741a63db16292f  ./artix7/mask_hclk_ioi.db`](./artix7/mask_hclk_ioi.db)
+ * [`d0914443ac28056e840aee431bd51933a7cdc6504eefb052113d7e33e8b08e83  ./artix7/mask_hclk_ioi.db`](./artix7/mask_hclk_ioi.db)
  * [`49f54d634cddc4d58df9b8a0c371364088c73c1eeaaf87b80c871430aae66077  ./artix7/mask_hclk_ioi3.db`](./artix7/mask_hclk_ioi3.db)
  * [`76d1e0bd4b7ad492cf3fe8698b2b5f46f7dcc5fe446984e5dccae373c63edafd  ./artix7/mask_hclk_l.db`](./artix7/mask_hclk_l.db)
  * [`e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855  ./artix7/mask_hclk_l.origin_info.db`](./artix7/mask_hclk_l.origin_info.db)
  * [`76d1e0bd4b7ad492cf3fe8698b2b5f46f7dcc5fe446984e5dccae373c63edafd  ./artix7/mask_hclk_r.db`](./artix7/mask_hclk_r.db)
  * [`e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855  ./artix7/mask_hclk_r.origin_info.db`](./artix7/mask_hclk_r.origin_info.db)
  * [`a0777dc0808e70052a6f6b2e1056f6e9dd225032c01195919d927be7ba1b97d6  ./artix7/mask_liob33.db`](./artix7/mask_liob33.db)
- * [`7db4e012a058ddedde6f42fd3cf00105d56ae9695e6755b52c421bfc32e404a8  ./artix7/mask_lioi3.db`](./artix7/mask_lioi3.db)
- * [`7db4e012a058ddedde6f42fd3cf00105d56ae9695e6755b52c421bfc32e404a8  ./artix7/mask_lioi3_tbytesrc.db`](./artix7/mask_lioi3_tbytesrc.db)
- * [`7db4e012a058ddedde6f42fd3cf00105d56ae9695e6755b52c421bfc32e404a8  ./artix7/mask_lioi3_tbyteterm.db`](./artix7/mask_lioi3_tbyteterm.db)
+ * [`e9c5e8644b7f426944df2adaecb6e4813097034cfe78ab469d9b675e169b60d4  ./artix7/mask_lioi3.db`](./artix7/mask_lioi3.db)
+ * [`e9c5e8644b7f426944df2adaecb6e4813097034cfe78ab469d9b675e169b60d4  ./artix7/mask_lioi3_tbytesrc.db`](./artix7/mask_lioi3_tbytesrc.db)
+ * [`e9c5e8644b7f426944df2adaecb6e4813097034cfe78ab469d9b675e169b60d4  ./artix7/mask_lioi3_tbyteterm.db`](./artix7/mask_lioi3_tbyteterm.db)
  * [`a0777dc0808e70052a6f6b2e1056f6e9dd225032c01195919d927be7ba1b97d6  ./artix7/mask_riob33.db`](./artix7/mask_riob33.db)
- * [`7db4e012a058ddedde6f42fd3cf00105d56ae9695e6755b52c421bfc32e404a8  ./artix7/mask_rioi3.db`](./artix7/mask_rioi3.db)
- * [`7db4e012a058ddedde6f42fd3cf00105d56ae9695e6755b52c421bfc32e404a8  ./artix7/mask_rioi3_tbytesrc.db`](./artix7/mask_rioi3_tbytesrc.db)
- * [`7db4e012a058ddedde6f42fd3cf00105d56ae9695e6755b52c421bfc32e404a8  ./artix7/mask_rioi3_tbyteterm.db`](./artix7/mask_rioi3_tbyteterm.db)
+ * [`e9c5e8644b7f426944df2adaecb6e4813097034cfe78ab469d9b675e169b60d4  ./artix7/mask_rioi3.db`](./artix7/mask_rioi3.db)
+ * [`e9c5e8644b7f426944df2adaecb6e4813097034cfe78ab469d9b675e169b60d4  ./artix7/mask_rioi3_tbytesrc.db`](./artix7/mask_rioi3_tbytesrc.db)
+ * [`e9c5e8644b7f426944df2adaecb6e4813097034cfe78ab469d9b675e169b60d4  ./artix7/mask_rioi3_tbyteterm.db`](./artix7/mask_rioi3_tbyteterm.db)
  * [`d94e4d13df16da498224f0e94deaa310fbf471b6f9ec0ec8b2308fe62fa2eeaf  ./artix7/ppips_bram_int_interface_l.db`](./artix7/ppips_bram_int_interface_l.db)
  * [`e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855  ./artix7/ppips_bram_int_interface_l.origin_info.db`](./artix7/ppips_bram_int_interface_l.origin_info.db)
  * [`b48d766ac6f9dd0e21280d3a04dd448ea39016143309c0c7867fc00d730a59ae  ./artix7/ppips_bram_int_interface_r.db`](./artix7/ppips_bram_int_interface_r.db)
@@ -190,7 +190,7 @@
  * [`e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855  ./artix7/ppips_dsp_r.db`](./artix7/ppips_dsp_r.db)
  * [`e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855  ./artix7/ppips_dsp_r.origin_info.db`](./artix7/ppips_dsp_r.origin_info.db)
  * [`edeccdbee739f85558baee09f68ebee6cca1f2121b1ef7e38839e8a9f0797641  ./artix7/ppips_hclk_cmt.db`](./artix7/ppips_hclk_cmt.db)
- * [`6221d3addb1cdd74f6180a81209a7ac31a47d60d6ef2219108973fb26e89316c  ./artix7/ppips_hclk_ioi3.db`](./artix7/ppips_hclk_ioi3.db)
+ * [`633e6ad608c7b7fc6b5d863812fea75fd0162bf6d58dd6794e6d3f32100ec2a3  ./artix7/ppips_hclk_ioi3.db`](./artix7/ppips_hclk_ioi3.db)
  * [`b61bbc9db6d0de1141a87d787f5d118be0a244802eed712612ff2aa0b6aeb73a  ./artix7/ppips_hclk_l.db`](./artix7/ppips_hclk_l.db)
  * [`e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855  ./artix7/ppips_hclk_l.origin_info.db`](./artix7/ppips_hclk_l.origin_info.db)
  * [`abe795445c031273b59a6a98cbfea3309c4047820cbea352c723138b3111c956  ./artix7/ppips_hclk_r.db`](./artix7/ppips_hclk_r.db)
@@ -243,24 +243,24 @@
  * [`0e38f50896c11f0134f79a920fba0906f015305d296d30c45cd20601fad2c57f  ./artix7/segbits_cmt_top_l_upper_t.origin_info.db`](./artix7/segbits_cmt_top_l_upper_t.origin_info.db)
  * [`616a0118601d5541e896267dfecb5409a3704b957946644994ae48061be270aa  ./artix7/segbits_cmt_top_r_upper_t.db`](./artix7/segbits_cmt_top_r_upper_t.db)
  * [`4e8cebea5342f4404affa6c91e3245b960d2f75d1f3a4e3ceb875760a56666c9  ./artix7/segbits_cmt_top_r_upper_t.origin_info.db`](./artix7/segbits_cmt_top_r_upper_t.origin_info.db)
- * [`0c4a6e4bc385a8b3a43d05a06d8e87c8822cf2cc1742593167244ff194af4a5e  ./artix7/segbits_dsp_l.db`](./artix7/segbits_dsp_l.db)
- * [`85105e324b53c9b8a3d60a3631e125c2e6dc1329e017636232313c4aa8e1576d  ./artix7/segbits_dsp_l.origin_info.db`](./artix7/segbits_dsp_l.origin_info.db)
- * [`b014d7e2b101b0b0540a539cb74a76ccbe3a494e225e8e510bf258a457b18685  ./artix7/segbits_dsp_r.db`](./artix7/segbits_dsp_r.db)
- * [`ec2c0e9896fc373927b2c1f3028aad90fa7126c76e99c8c29c2a86a35149aa81  ./artix7/segbits_dsp_r.origin_info.db`](./artix7/segbits_dsp_r.origin_info.db)
+ * [`80c982320812abb7a269a24df2e345f7e333311f3e7de7140f6b2be54ced2d30  ./artix7/segbits_dsp_l.db`](./artix7/segbits_dsp_l.db)
+ * [`589a13e6a447c4fa8ce37629db9a8522a2f4fbad940709cd41bde0d7b8f65f61  ./artix7/segbits_dsp_l.origin_info.db`](./artix7/segbits_dsp_l.origin_info.db)
+ * [`5f0a2b65537b3ed4893ff44eb8c3a27c7013af4ac6187324bdb7a941f9a283d5  ./artix7/segbits_dsp_r.db`](./artix7/segbits_dsp_r.db)
+ * [`c12b814f79eab5451d2d242eb5f77b40bae9f6daa87d964267fcb2e2e1556a26  ./artix7/segbits_dsp_r.origin_info.db`](./artix7/segbits_dsp_r.origin_info.db)
  * [`b7fc6cf18898ea037285ec9364405cc9adac3338ff7312dcd3de4346bfdf254b  ./artix7/segbits_hclk_cmt.db`](./artix7/segbits_hclk_cmt.db)
  * [`d957e108f99354f024a9bcdd78b069f7967650652cd24de8098be0186a433368  ./artix7/segbits_hclk_cmt.origin_info.db`](./artix7/segbits_hclk_cmt.origin_info.db)
  * [`171f485e3c1f5e2bd3d9b337907a5168a2ae0aaa085f587c677888aed22a8641  ./artix7/segbits_hclk_cmt_l.db`](./artix7/segbits_hclk_cmt_l.db)
  * [`a5eefc35ba4cf729b499eeb90378a00c2bcdda0d850067efbc00aa33231daecf  ./artix7/segbits_hclk_cmt_l.origin_info.db`](./artix7/segbits_hclk_cmt_l.origin_info.db)
- * [`061fa29da7031ba485645fb7559afc790f0d6defe3aac22355d999333d00baed  ./artix7/segbits_hclk_ioi3.db`](./artix7/segbits_hclk_ioi3.db)
- * [`be8a9668a950c01d594c0804a628913f2be850dcc504a2f843696694011c11f1  ./artix7/segbits_hclk_ioi3.origin_info.db`](./artix7/segbits_hclk_ioi3.origin_info.db)
+ * [`d1dd602c5c9d1280ed8d65630da5f53a1f95aab18a48adfa26bee7c76311d675  ./artix7/segbits_hclk_ioi3.db`](./artix7/segbits_hclk_ioi3.db)
+ * [`c3307f139143360a9c07729a0a1f74bd22663dbafd730658e7aff37930020052  ./artix7/segbits_hclk_ioi3.origin_info.db`](./artix7/segbits_hclk_ioi3.origin_info.db)
  * [`1c2c7229781a4a1d51bbbdeea76238b10497c043aaadf2a76de783041a201878  ./artix7/segbits_hclk_l.db`](./artix7/segbits_hclk_l.db)
  * [`39179dfde43c6dd677c705082e1e7373d1866390cae064062f6eee50e7cd6ef6  ./artix7/segbits_hclk_l.origin_info.db`](./artix7/segbits_hclk_l.origin_info.db)
  * [`51288ec0be63172fcb2a12a92853150c62a21e894c2d42a2586046c462bf57a9  ./artix7/segbits_hclk_r.db`](./artix7/segbits_hclk_r.db)
  * [`0e9b5da6def4776e2ca8dd59af8f4334bf5cfb88d99b323be25dd6ba2e3386f7  ./artix7/segbits_hclk_r.origin_info.db`](./artix7/segbits_hclk_r.origin_info.db)
  * [`0ea44e8dfaf97ed200f30b2afe117e94e1a68bdb26af2e09e69e855414779520  ./artix7/segbits_int_l.db`](./artix7/segbits_int_l.db)
- * [`3c1ed23386f51a5d35afbb6e837110d97a57ea34140dc67d60784b397ad9776c  ./artix7/segbits_int_l.origin_info.db`](./artix7/segbits_int_l.origin_info.db)
+ * [`14f223d4ff7633592b12fdf28c39e42a40c3dee7d49848c2f576c28ee98a647f  ./artix7/segbits_int_l.origin_info.db`](./artix7/segbits_int_l.origin_info.db)
  * [`1541c7832dd161c5b3b5745d08fe0ee6f92bfbd372b76c12f54afc032c888556  ./artix7/segbits_int_r.db`](./artix7/segbits_int_r.db)
- * [`80d6f8d86143a77710ce6aac70ef5ba94c0eb4a45fa006cba120e10a5c9e4de9  ./artix7/segbits_int_r.origin_info.db`](./artix7/segbits_int_r.origin_info.db)
+ * [`83f89cadbc56f76e9117a3de1869e7f846255f15dce8dba5117191cc14d7bbb5  ./artix7/segbits_int_r.origin_info.db`](./artix7/segbits_int_r.origin_info.db)
  * [`92913f6d38cfdb14fb9c16e70a47d75e507c0ee4764bcc7941f2e0ac3e784e88  ./artix7/segbits_liob33.db`](./artix7/segbits_liob33.db)
  * [`2772dce8b6a4f6f6691ca0c0b30535c230041ebad17d318ce9962161e607be5c  ./artix7/segbits_liob33.origin_info.db`](./artix7/segbits_liob33.origin_info.db)
  * [`cf4f6a2b44d13e094f588464a902c315080d2150a522e4241c82ca201a4771e0  ./artix7/segbits_lioi3.db`](./artix7/segbits_lioi3.db)
@@ -499,7 +499,7 @@
 
 ### Settings
 
-Created using following [settings/kintex7.sh (sha256: 794538b550d399255cbafeeb1b5ff183dc66ebc6cd8dc0f725e3f6a3977f757d)](https://github.com/SymbiFlow/prjxray/blob/daf284151c160efb67ec57d4215a76826be3071e/settings/kintex7.sh)
+Created using following [settings/kintex7.sh (sha256: 794538b550d399255cbafeeb1b5ff183dc66ebc6cd8dc0f725e3f6a3977f757d)](https://github.com/SymbiFlow/prjxray/blob/aa9393b199e34ce8cd8f3671c2b8c51714bf0b70/settings/kintex7.sh)
 ```shell
 export XRAY_DATABASE="kintex7"
 export XRAY_PART="xc7k70tfbg676-2"
@@ -554,13 +554,13 @@
  * [`6421d30c48f1ae5bdf1cdbf7aa205edb31059a018082125861d6a3c7d23e9327  ./kintex7/mask_clk_bufg_top_r.db`](./kintex7/mask_clk_bufg_top_r.db)
  * [`82097a536f2fa952d7da31e5d6010d2d3952c6b096fe905b8ebc374a1d30c557  ./kintex7/mask_clk_hrow_bot_r.db`](./kintex7/mask_clk_hrow_bot_r.db)
  * [`4d6eb3eb7c63fe5b22d6d6575a236119e3bce2e74fbaaf1733591aa4223cb416  ./kintex7/mask_clk_hrow_top_r.db`](./kintex7/mask_clk_hrow_top_r.db)
- * [`aab2e5f20890d805b6a78db6e6fd68d6024a140ac5e960feb4162d7e49582ca8  ./kintex7/mask_dsp_l.db`](./kintex7/mask_dsp_l.db)
+ * [`28f39862efe6a708ae2bccc8b5d8d7eeedfbf95bcf2fc4c1b6900bb45aa1cc61  ./kintex7/mask_dsp_l.db`](./kintex7/mask_dsp_l.db)
  * [`e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855  ./kintex7/mask_dsp_l.origin_info.db`](./kintex7/mask_dsp_l.origin_info.db)
- * [`aab2e5f20890d805b6a78db6e6fd68d6024a140ac5e960feb4162d7e49582ca8  ./kintex7/mask_dsp_r.db`](./kintex7/mask_dsp_r.db)
+ * [`8c78f75e8bc79d687f6e72b8f3f02c4f6389130ff5338ed9626e53b77e58a419  ./kintex7/mask_dsp_r.db`](./kintex7/mask_dsp_r.db)
  * [`e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855  ./kintex7/mask_dsp_r.origin_info.db`](./kintex7/mask_dsp_r.origin_info.db)
  * [`be757fb834be7ff84a2873c0ac6621c909a5e85362b397667760edde86616f84  ./kintex7/mask_hclk_cmt.db`](./kintex7/mask_hclk_cmt.db)
  * [`be757fb834be7ff84a2873c0ac6621c909a5e85362b397667760edde86616f84  ./kintex7/mask_hclk_cmt_l.db`](./kintex7/mask_hclk_cmt_l.db)
- * [`98ba1080f5a9e2b3aa2536c0ae3845f5a743761ae2ed8bed1e741a63db16292f  ./kintex7/mask_hclk_ioi.db`](./kintex7/mask_hclk_ioi.db)
+ * [`d0914443ac28056e840aee431bd51933a7cdc6504eefb052113d7e33e8b08e83  ./kintex7/mask_hclk_ioi.db`](./kintex7/mask_hclk_ioi.db)
  * [`49f54d634cddc4d58df9b8a0c371364088c73c1eeaaf87b80c871430aae66077  ./kintex7/mask_hclk_ioi3.db`](./kintex7/mask_hclk_ioi3.db)
  * [`76d1e0bd4b7ad492cf3fe8698b2b5f46f7dcc5fe446984e5dccae373c63edafd  ./kintex7/mask_hclk_l.db`](./kintex7/mask_hclk_l.db)
  * [`e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855  ./kintex7/mask_hclk_l.origin_info.db`](./kintex7/mask_hclk_l.origin_info.db)
@@ -608,7 +608,7 @@
  * [`e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855  ./kintex7/ppips_dsp_r.db`](./kintex7/ppips_dsp_r.db)
  * [`e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855  ./kintex7/ppips_dsp_r.origin_info.db`](./kintex7/ppips_dsp_r.origin_info.db)
  * [`edeccdbee739f85558baee09f68ebee6cca1f2121b1ef7e38839e8a9f0797641  ./kintex7/ppips_hclk_cmt.db`](./kintex7/ppips_hclk_cmt.db)
- * [`6221d3addb1cdd74f6180a81209a7ac31a47d60d6ef2219108973fb26e89316c  ./kintex7/ppips_hclk_ioi3.db`](./kintex7/ppips_hclk_ioi3.db)
+ * [`633e6ad608c7b7fc6b5d863812fea75fd0162bf6d58dd6794e6d3f32100ec2a3  ./kintex7/ppips_hclk_ioi3.db`](./kintex7/ppips_hclk_ioi3.db)
  * [`b61bbc9db6d0de1141a87d787f5d118be0a244802eed712612ff2aa0b6aeb73a  ./kintex7/ppips_hclk_l.db`](./kintex7/ppips_hclk_l.db)
  * [`e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855  ./kintex7/ppips_hclk_l.origin_info.db`](./kintex7/ppips_hclk_l.origin_info.db)
  * [`abe795445c031273b59a6a98cbfea3309c4047820cbea352c723138b3111c956  ./kintex7/ppips_hclk_r.db`](./kintex7/ppips_hclk_r.db)
@@ -657,34 +657,34 @@
  * [`d3db1fc1c0a06f0cbea022affc6376c51960636e1fcd739b07851f87cb4c673d  ./kintex7/segbits_cmt_top_l_upper_t.origin_info.db`](./kintex7/segbits_cmt_top_l_upper_t.origin_info.db)
  * [`fda7e0c2805de552580b0c4740534d6ae7e8974aee15fc7adc82ec8f8bbe9653  ./kintex7/segbits_cmt_top_r_upper_t.db`](./kintex7/segbits_cmt_top_r_upper_t.db)
  * [`15270ddb444e16c84f678eb03f0e704a90c60ba3e7c94d191dc6545ebce1cac1  ./kintex7/segbits_cmt_top_r_upper_t.origin_info.db`](./kintex7/segbits_cmt_top_r_upper_t.origin_info.db)
- * [`0c4a6e4bc385a8b3a43d05a06d8e87c8822cf2cc1742593167244ff194af4a5e  ./kintex7/segbits_dsp_l.db`](./kintex7/segbits_dsp_l.db)
- * [`85105e324b53c9b8a3d60a3631e125c2e6dc1329e017636232313c4aa8e1576d  ./kintex7/segbits_dsp_l.origin_info.db`](./kintex7/segbits_dsp_l.origin_info.db)
- * [`b014d7e2b101b0b0540a539cb74a76ccbe3a494e225e8e510bf258a457b18685  ./kintex7/segbits_dsp_r.db`](./kintex7/segbits_dsp_r.db)
- * [`ec2c0e9896fc373927b2c1f3028aad90fa7126c76e99c8c29c2a86a35149aa81  ./kintex7/segbits_dsp_r.origin_info.db`](./kintex7/segbits_dsp_r.origin_info.db)
+ * [`80c982320812abb7a269a24df2e345f7e333311f3e7de7140f6b2be54ced2d30  ./kintex7/segbits_dsp_l.db`](./kintex7/segbits_dsp_l.db)
+ * [`589a13e6a447c4fa8ce37629db9a8522a2f4fbad940709cd41bde0d7b8f65f61  ./kintex7/segbits_dsp_l.origin_info.db`](./kintex7/segbits_dsp_l.origin_info.db)
+ * [`5f0a2b65537b3ed4893ff44eb8c3a27c7013af4ac6187324bdb7a941f9a283d5  ./kintex7/segbits_dsp_r.db`](./kintex7/segbits_dsp_r.db)
+ * [`c12b814f79eab5451d2d242eb5f77b40bae9f6daa87d964267fcb2e2e1556a26  ./kintex7/segbits_dsp_r.origin_info.db`](./kintex7/segbits_dsp_r.origin_info.db)
  * [`b7fc6cf18898ea037285ec9364405cc9adac3338ff7312dcd3de4346bfdf254b  ./kintex7/segbits_hclk_cmt.db`](./kintex7/segbits_hclk_cmt.db)
  * [`d957e108f99354f024a9bcdd78b069f7967650652cd24de8098be0186a433368  ./kintex7/segbits_hclk_cmt.origin_info.db`](./kintex7/segbits_hclk_cmt.origin_info.db)
  * [`171f485e3c1f5e2bd3d9b337907a5168a2ae0aaa085f587c677888aed22a8641  ./kintex7/segbits_hclk_cmt_l.db`](./kintex7/segbits_hclk_cmt_l.db)
  * [`a5eefc35ba4cf729b499eeb90378a00c2bcdda0d850067efbc00aa33231daecf  ./kintex7/segbits_hclk_cmt_l.origin_info.db`](./kintex7/segbits_hclk_cmt_l.origin_info.db)
- * [`061fa29da7031ba485645fb7559afc790f0d6defe3aac22355d999333d00baed  ./kintex7/segbits_hclk_ioi3.db`](./kintex7/segbits_hclk_ioi3.db)
- * [`be8a9668a950c01d594c0804a628913f2be850dcc504a2f843696694011c11f1  ./kintex7/segbits_hclk_ioi3.origin_info.db`](./kintex7/segbits_hclk_ioi3.origin_info.db)
+ * [`d1dd602c5c9d1280ed8d65630da5f53a1f95aab18a48adfa26bee7c76311d675  ./kintex7/segbits_hclk_ioi3.db`](./kintex7/segbits_hclk_ioi3.db)
+ * [`c3307f139143360a9c07729a0a1f74bd22663dbafd730658e7aff37930020052  ./kintex7/segbits_hclk_ioi3.origin_info.db`](./kintex7/segbits_hclk_ioi3.origin_info.db)
  * [`1c2c7229781a4a1d51bbbdeea76238b10497c043aaadf2a76de783041a201878  ./kintex7/segbits_hclk_l.db`](./kintex7/segbits_hclk_l.db)
  * [`39179dfde43c6dd677c705082e1e7373d1866390cae064062f6eee50e7cd6ef6  ./kintex7/segbits_hclk_l.origin_info.db`](./kintex7/segbits_hclk_l.origin_info.db)
  * [`51288ec0be63172fcb2a12a92853150c62a21e894c2d42a2586046c462bf57a9  ./kintex7/segbits_hclk_r.db`](./kintex7/segbits_hclk_r.db)
  * [`0e9b5da6def4776e2ca8dd59af8f4334bf5cfb88d99b323be25dd6ba2e3386f7  ./kintex7/segbits_hclk_r.origin_info.db`](./kintex7/segbits_hclk_r.origin_info.db)
- * [`0ea44e8dfaf97ed200f30b2afe117e94e1a68bdb26af2e09e69e855414779520  ./kintex7/segbits_int_l.db`](./kintex7/segbits_int_l.db)
- * [`e71845df8c6025243ed023491175449ccfd0ad8ffaa45be5e815b4bc5629ab6d  ./kintex7/segbits_int_l.origin_info.db`](./kintex7/segbits_int_l.origin_info.db)
+ * [`bae9b062392e6204562c62f166d1ebc957aad14a6e24294954bd5aecf4a4cb46  ./kintex7/segbits_int_l.db`](./kintex7/segbits_int_l.db)
+ * [`0e5f4b3a08b7ab2a049356fb3c91b7719f403da06e8c5352f2b37a969d5bfd54  ./kintex7/segbits_int_l.origin_info.db`](./kintex7/segbits_int_l.origin_info.db)
  * [`1541c7832dd161c5b3b5745d08fe0ee6f92bfbd372b76c12f54afc032c888556  ./kintex7/segbits_int_r.db`](./kintex7/segbits_int_r.db)
- * [`6cfa0017cd001d26644464ca971bdcc4ea72a88f793a0a1539ec54390d0017d0  ./kintex7/segbits_int_r.origin_info.db`](./kintex7/segbits_int_r.origin_info.db)
- * [`01cd7426da888ca40c5cc422a29fa9daf3d8de1901ed32ea118abd41def9d3da  ./kintex7/segbits_liob33.db`](./kintex7/segbits_liob33.db)
- * [`1c214645a8a02faacd8f463ba93414ce37f082a56095eee55b39fadea2169d07  ./kintex7/segbits_liob33.origin_info.db`](./kintex7/segbits_liob33.origin_info.db)
+ * [`98ef344878edd67a8e6e861dc0e307aa3030f5caa4b2517c9a23fdce287b2fce  ./kintex7/segbits_int_r.origin_info.db`](./kintex7/segbits_int_r.origin_info.db)
+ * [`e8840ad59adecd3c2d5cc79b8e9d11555d6346b6fef6e8e94ad5ef8a6aafde0e  ./kintex7/segbits_liob33.db`](./kintex7/segbits_liob33.db)
+ * [`e56502cee5fbad067e49b09eb1e3bf308ffae383feede7366174c7920c83e75b  ./kintex7/segbits_liob33.origin_info.db`](./kintex7/segbits_liob33.origin_info.db)
  * [`87adc9bb57b446e57722145e6461085763a5f0e690558e96c2581ea623b36071  ./kintex7/segbits_lioi3.db`](./kintex7/segbits_lioi3.db)
  * [`95f41262a22641a56176ea6ce78f44751ea676605e8eb1ecc72b90dc2aed3a9c  ./kintex7/segbits_lioi3.origin_info.db`](./kintex7/segbits_lioi3.origin_info.db)
  * [`5ce44e654b750b72090c2f3f00fbacb5acc338f9647ffb061b336331f812b488  ./kintex7/segbits_lioi3_tbytesrc.db`](./kintex7/segbits_lioi3_tbytesrc.db)
  * [`feb497770c76d905ffc3c4c5805ef8bfd1c4a6d2829c9d67a64128ffe90b201c  ./kintex7/segbits_lioi3_tbytesrc.origin_info.db`](./kintex7/segbits_lioi3_tbytesrc.origin_info.db)
  * [`23ee01e24c5831233c4213234eec53e5f0b55a291a8205e8954275d0da1363ae  ./kintex7/segbits_lioi3_tbyteterm.db`](./kintex7/segbits_lioi3_tbyteterm.db)
  * [`c7a45daa6d00cdec99eb29ef4eec682fd7d126082df050f8d65e1136e2a2b86a  ./kintex7/segbits_lioi3_tbyteterm.origin_info.db`](./kintex7/segbits_lioi3_tbyteterm.origin_info.db)
- * [`b6be0b91d37dd1299a16d0f132f156290b798b329280875e407a07d8c06a554f  ./kintex7/segbits_riob33.db`](./kintex7/segbits_riob33.db)
- * [`2b6063565e930b6184b986564c3e5551d865fc6ab3527f6e6b5f717b3811c571  ./kintex7/segbits_riob33.origin_info.db`](./kintex7/segbits_riob33.origin_info.db)
+ * [`2841f2e3620817d44789c10cc314885a60d7671e034b2d5ea574f15b4ae69f3a  ./kintex7/segbits_riob33.db`](./kintex7/segbits_riob33.db)
+ * [`d2b1bf4082a373c5a05e2ab3da031b61b86b0234d810601915003c1dd6cec174  ./kintex7/segbits_riob33.origin_info.db`](./kintex7/segbits_riob33.origin_info.db)
  * [`4210f9eb79cffe057f850a853b49e3cf18f7378e7e9e081d4a05afa534be9bf2  ./kintex7/segbits_rioi3.db`](./kintex7/segbits_rioi3.db)
  * [`21b603a381111c063aba34838e0bb9381c7a66ead4f2ae75c3e5669a9ac6862f  ./kintex7/segbits_rioi3.origin_info.db`](./kintex7/segbits_rioi3.origin_info.db)
  * [`d4d3718a5759779146849fd66e663409d5a20b9ec045350933722292f67e6c4a  ./kintex7/segbits_rioi3_tbytesrc.db`](./kintex7/segbits_rioi3_tbytesrc.db)
@@ -867,7 +867,7 @@
 
 ### Settings
 
-Created using following [settings/zynq7.sh (sha256: 61298e89dcc873eadba47f5c2f9f72a38fa022583b2c7ff89246b2e051585ad8)](https://github.com/SymbiFlow/prjxray/blob/daf284151c160efb67ec57d4215a76826be3071e/settings/zynq7.sh)
+Created using following [settings/zynq7.sh (sha256: 61298e89dcc873eadba47f5c2f9f72a38fa022583b2c7ff89246b2e051585ad8)](https://github.com/SymbiFlow/prjxray/blob/aa9393b199e34ce8cd8f3671c2b8c51714bf0b70/settings/zynq7.sh)
 ```shell
 export XRAY_DATABASE="zynq7"
 export XRAY_PART="xc7z010clg400-1"
@@ -927,24 +927,24 @@
  * [`061f62437a067bb14f4904e40ca1bf01151eac5bef05867b7caf0c7de087c55e  ./zynq7/mask_clk_bufg_top_r.db`](./zynq7/mask_clk_bufg_top_r.db)
  * [`5becf39d0ec36839d159ca614b298465d3e1b0696d33bcfb509cbe72a7058ecf  ./zynq7/mask_clk_hrow_bot_r.db`](./zynq7/mask_clk_hrow_bot_r.db)
  * [`5becf39d0ec36839d159ca614b298465d3e1b0696d33bcfb509cbe72a7058ecf  ./zynq7/mask_clk_hrow_top_r.db`](./zynq7/mask_clk_hrow_top_r.db)
- * [`aab2e5f20890d805b6a78db6e6fd68d6024a140ac5e960feb4162d7e49582ca8  ./zynq7/mask_dsp_l.db`](./zynq7/mask_dsp_l.db)
+ * [`8c78f75e8bc79d687f6e72b8f3f02c4f6389130ff5338ed9626e53b77e58a419  ./zynq7/mask_dsp_l.db`](./zynq7/mask_dsp_l.db)
  * [`e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855  ./zynq7/mask_dsp_l.origin_info.db`](./zynq7/mask_dsp_l.origin_info.db)
- * [`aab2e5f20890d805b6a78db6e6fd68d6024a140ac5e960feb4162d7e49582ca8  ./zynq7/mask_dsp_r.db`](./zynq7/mask_dsp_r.db)
+ * [`8c78f75e8bc79d687f6e72b8f3f02c4f6389130ff5338ed9626e53b77e58a419  ./zynq7/mask_dsp_r.db`](./zynq7/mask_dsp_r.db)
  * [`e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855  ./zynq7/mask_dsp_r.origin_info.db`](./zynq7/mask_dsp_r.origin_info.db)
  * [`be757fb834be7ff84a2873c0ac6621c909a5e85362b397667760edde86616f84  ./zynq7/mask_hclk_cmt_l.db`](./zynq7/mask_hclk_cmt_l.db)
- * [`98ba1080f5a9e2b3aa2536c0ae3845f5a743761ae2ed8bed1e741a63db16292f  ./zynq7/mask_hclk_ioi.db`](./zynq7/mask_hclk_ioi.db)
+ * [`d0914443ac28056e840aee431bd51933a7cdc6504eefb052113d7e33e8b08e83  ./zynq7/mask_hclk_ioi.db`](./zynq7/mask_hclk_ioi.db)
  * [`49f54d634cddc4d58df9b8a0c371364088c73c1eeaaf87b80c871430aae66077  ./zynq7/mask_hclk_ioi3.db`](./zynq7/mask_hclk_ioi3.db)
  * [`76d1e0bd4b7ad492cf3fe8698b2b5f46f7dcc5fe446984e5dccae373c63edafd  ./zynq7/mask_hclk_l.db`](./zynq7/mask_hclk_l.db)
  * [`e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855  ./zynq7/mask_hclk_l.origin_info.db`](./zynq7/mask_hclk_l.origin_info.db)
  * [`76d1e0bd4b7ad492cf3fe8698b2b5f46f7dcc5fe446984e5dccae373c63edafd  ./zynq7/mask_hclk_r.db`](./zynq7/mask_hclk_r.db)
  * [`e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855  ./zynq7/mask_hclk_r.origin_info.db`](./zynq7/mask_hclk_r.origin_info.db)
- * [`0b62252a0c7638e7cccd730ccf26ea2fe891f753cf77648461254f77f2ad5529  ./zynq7/mask_lioi3.db`](./zynq7/mask_lioi3.db)
- * [`0b62252a0c7638e7cccd730ccf26ea2fe891f753cf77648461254f77f2ad5529  ./zynq7/mask_lioi3_tbytesrc.db`](./zynq7/mask_lioi3_tbytesrc.db)
- * [`0b62252a0c7638e7cccd730ccf26ea2fe891f753cf77648461254f77f2ad5529  ./zynq7/mask_lioi3_tbyteterm.db`](./zynq7/mask_lioi3_tbyteterm.db)
+ * [`75166de110e574743ad0cdac380699701c93b1e6bd26dd3b60657553f7ccf4b1  ./zynq7/mask_lioi3.db`](./zynq7/mask_lioi3.db)
+ * [`75166de110e574743ad0cdac380699701c93b1e6bd26dd3b60657553f7ccf4b1  ./zynq7/mask_lioi3_tbytesrc.db`](./zynq7/mask_lioi3_tbytesrc.db)
+ * [`75166de110e574743ad0cdac380699701c93b1e6bd26dd3b60657553f7ccf4b1  ./zynq7/mask_lioi3_tbyteterm.db`](./zynq7/mask_lioi3_tbyteterm.db)
  * [`a0777dc0808e70052a6f6b2e1056f6e9dd225032c01195919d927be7ba1b97d6  ./zynq7/mask_riob33.db`](./zynq7/mask_riob33.db)
- * [`0b62252a0c7638e7cccd730ccf26ea2fe891f753cf77648461254f77f2ad5529  ./zynq7/mask_rioi3.db`](./zynq7/mask_rioi3.db)
- * [`0b62252a0c7638e7cccd730ccf26ea2fe891f753cf77648461254f77f2ad5529  ./zynq7/mask_rioi3_tbytesrc.db`](./zynq7/mask_rioi3_tbytesrc.db)
- * [`0b62252a0c7638e7cccd730ccf26ea2fe891f753cf77648461254f77f2ad5529  ./zynq7/mask_rioi3_tbyteterm.db`](./zynq7/mask_rioi3_tbyteterm.db)
+ * [`75166de110e574743ad0cdac380699701c93b1e6bd26dd3b60657553f7ccf4b1  ./zynq7/mask_rioi3.db`](./zynq7/mask_rioi3.db)
+ * [`75166de110e574743ad0cdac380699701c93b1e6bd26dd3b60657553f7ccf4b1  ./zynq7/mask_rioi3_tbytesrc.db`](./zynq7/mask_rioi3_tbytesrc.db)
+ * [`75166de110e574743ad0cdac380699701c93b1e6bd26dd3b60657553f7ccf4b1  ./zynq7/mask_rioi3_tbyteterm.db`](./zynq7/mask_rioi3_tbyteterm.db)
  * [`d94e4d13df16da498224f0e94deaa310fbf471b6f9ec0ec8b2308fe62fa2eeaf  ./zynq7/ppips_bram_int_interface_l.db`](./zynq7/ppips_bram_int_interface_l.db)
  * [`e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855  ./zynq7/ppips_bram_int_interface_l.origin_info.db`](./zynq7/ppips_bram_int_interface_l.origin_info.db)
  * [`b48d766ac6f9dd0e21280d3a04dd448ea39016143309c0c7867fc00d730a59ae  ./zynq7/ppips_bram_int_interface_r.db`](./zynq7/ppips_bram_int_interface_r.db)
@@ -974,7 +974,7 @@
  * [`e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855  ./zynq7/ppips_dsp_l.origin_info.db`](./zynq7/ppips_dsp_l.origin_info.db)
  * [`e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855  ./zynq7/ppips_dsp_r.db`](./zynq7/ppips_dsp_r.db)
  * [`e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855  ./zynq7/ppips_dsp_r.origin_info.db`](./zynq7/ppips_dsp_r.origin_info.db)
- * [`6221d3addb1cdd74f6180a81209a7ac31a47d60d6ef2219108973fb26e89316c  ./zynq7/ppips_hclk_ioi3.db`](./zynq7/ppips_hclk_ioi3.db)
+ * [`633e6ad608c7b7fc6b5d863812fea75fd0162bf6d58dd6794e6d3f32100ec2a3  ./zynq7/ppips_hclk_ioi3.db`](./zynq7/ppips_hclk_ioi3.db)
  * [`b61bbc9db6d0de1141a87d787f5d118be0a244802eed712612ff2aa0b6aeb73a  ./zynq7/ppips_hclk_l.db`](./zynq7/ppips_hclk_l.db)
  * [`e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855  ./zynq7/ppips_hclk_l.origin_info.db`](./zynq7/ppips_hclk_l.origin_info.db)
  * [`abe795445c031273b59a6a98cbfea3309c4047820cbea352c723138b3111c956  ./zynq7/ppips_hclk_r.db`](./zynq7/ppips_hclk_r.db)
@@ -1022,22 +1022,22 @@
  * [`e23a62d0f57948dd166b5a33b77afb1699b46c526f72dc4e376da04f36e0e1be  ./zynq7/segbits_cmt_top_l_upper_t.origin_info.db`](./zynq7/segbits_cmt_top_l_upper_t.origin_info.db)
  * [`6b205562d2e870f43d7959a05b1b8fbd75bfbb08878bb7ec5239d6b419ce3117  ./zynq7/segbits_cmt_top_r_upper_t.db`](./zynq7/segbits_cmt_top_r_upper_t.db)
  * [`29023fed85b544c2d849067d1c945cb9cdc64fa2f4070acf6496ea132f9f3997  ./zynq7/segbits_cmt_top_r_upper_t.origin_info.db`](./zynq7/segbits_cmt_top_r_upper_t.origin_info.db)
- * [`0c4a6e4bc385a8b3a43d05a06d8e87c8822cf2cc1742593167244ff194af4a5e  ./zynq7/segbits_dsp_l.db`](./zynq7/segbits_dsp_l.db)
- * [`85105e324b53c9b8a3d60a3631e125c2e6dc1329e017636232313c4aa8e1576d  ./zynq7/segbits_dsp_l.origin_info.db`](./zynq7/segbits_dsp_l.origin_info.db)
- * [`b014d7e2b101b0b0540a539cb74a76ccbe3a494e225e8e510bf258a457b18685  ./zynq7/segbits_dsp_r.db`](./zynq7/segbits_dsp_r.db)
- * [`ec2c0e9896fc373927b2c1f3028aad90fa7126c76e99c8c29c2a86a35149aa81  ./zynq7/segbits_dsp_r.origin_info.db`](./zynq7/segbits_dsp_r.origin_info.db)
+ * [`80c982320812abb7a269a24df2e345f7e333311f3e7de7140f6b2be54ced2d30  ./zynq7/segbits_dsp_l.db`](./zynq7/segbits_dsp_l.db)
+ * [`589a13e6a447c4fa8ce37629db9a8522a2f4fbad940709cd41bde0d7b8f65f61  ./zynq7/segbits_dsp_l.origin_info.db`](./zynq7/segbits_dsp_l.origin_info.db)
+ * [`5f0a2b65537b3ed4893ff44eb8c3a27c7013af4ac6187324bdb7a941f9a283d5  ./zynq7/segbits_dsp_r.db`](./zynq7/segbits_dsp_r.db)
+ * [`c12b814f79eab5451d2d242eb5f77b40bae9f6daa87d964267fcb2e2e1556a26  ./zynq7/segbits_dsp_r.origin_info.db`](./zynq7/segbits_dsp_r.origin_info.db)
  * [`171f485e3c1f5e2bd3d9b337907a5168a2ae0aaa085f587c677888aed22a8641  ./zynq7/segbits_hclk_cmt_l.db`](./zynq7/segbits_hclk_cmt_l.db)
  * [`a5eefc35ba4cf729b499eeb90378a00c2bcdda0d850067efbc00aa33231daecf  ./zynq7/segbits_hclk_cmt_l.origin_info.db`](./zynq7/segbits_hclk_cmt_l.origin_info.db)
- * [`1fce1d2e283d3fc782cc16ebdc6946259baffadd4cebb71acb54db3f71058ab2  ./zynq7/segbits_hclk_ioi3.db`](./zynq7/segbits_hclk_ioi3.db)
- * [`81289bee152acc5ec9c26088d8a0e78fde3e99f0f3ec060b2e9b10d147f626ee  ./zynq7/segbits_hclk_ioi3.origin_info.db`](./zynq7/segbits_hclk_ioi3.origin_info.db)
+ * [`e1104fc691fa54104ef705cc47d273c64849b010067b0b646fb6c15f559c186c  ./zynq7/segbits_hclk_ioi3.db`](./zynq7/segbits_hclk_ioi3.db)
+ * [`b73574caed75457e2140f72b27f18fa4e1a2bc9846c01ada21598085cf2c2964  ./zynq7/segbits_hclk_ioi3.origin_info.db`](./zynq7/segbits_hclk_ioi3.origin_info.db)
  * [`1c2c7229781a4a1d51bbbdeea76238b10497c043aaadf2a76de783041a201878  ./zynq7/segbits_hclk_l.db`](./zynq7/segbits_hclk_l.db)
  * [`39179dfde43c6dd677c705082e1e7373d1866390cae064062f6eee50e7cd6ef6  ./zynq7/segbits_hclk_l.origin_info.db`](./zynq7/segbits_hclk_l.origin_info.db)
  * [`51288ec0be63172fcb2a12a92853150c62a21e894c2d42a2586046c462bf57a9  ./zynq7/segbits_hclk_r.db`](./zynq7/segbits_hclk_r.db)
  * [`0e9b5da6def4776e2ca8dd59af8f4334bf5cfb88d99b323be25dd6ba2e3386f7  ./zynq7/segbits_hclk_r.origin_info.db`](./zynq7/segbits_hclk_r.origin_info.db)
  * [`0ea44e8dfaf97ed200f30b2afe117e94e1a68bdb26af2e09e69e855414779520  ./zynq7/segbits_int_l.db`](./zynq7/segbits_int_l.db)
- * [`7641073505be3aa9be78f640d5112e2a615a39f3ca8b8d1037440b5f7c2f4b9f  ./zynq7/segbits_int_l.origin_info.db`](./zynq7/segbits_int_l.origin_info.db)
+ * [`ec13df09a687f1025d523b0e8e1d14ce6a62177fa4587c6af1fee4f703ef1884  ./zynq7/segbits_int_l.origin_info.db`](./zynq7/segbits_int_l.origin_info.db)
  * [`1541c7832dd161c5b3b5745d08fe0ee6f92bfbd372b76c12f54afc032c888556  ./zynq7/segbits_int_r.db`](./zynq7/segbits_int_r.db)
- * [`7bbf7bc8d1ea43573749a06dd83d43aec0f8c44fc532b7ebf719df2d10b85422  ./zynq7/segbits_int_r.origin_info.db`](./zynq7/segbits_int_r.origin_info.db)
+ * [`980402cb5f0ba5fa49b282aa2b7449c869ecab0cd42f13bafa8b8300187b85b5  ./zynq7/segbits_int_r.origin_info.db`](./zynq7/segbits_int_r.origin_info.db)
  * [`e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855  ./zynq7/segbits_liob33.db`](./zynq7/segbits_liob33.db)
  * [`e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855  ./zynq7/segbits_liob33.origin_info.db`](./zynq7/segbits_liob33.origin_info.db)
  * [`cf4f6a2b44d13e094f588464a902c315080d2150a522e4241c82ca201a4771e0  ./zynq7/segbits_lioi3.db`](./zynq7/segbits_lioi3.db)
diff --git a/artix7/mask_dsp_l.db b/artix7/mask_dsp_l.db
index ea47238..f504eb1 100644
--- a/artix7/mask_dsp_l.db
+++ b/artix7/mask_dsp_l.db
@@ -1,259 +1,233 @@
-bit 00_11
-bit 00_35
-bit 00_39
 bit 00_42
-bit 00_75
 bit 00_89
 bit 00_90
-bit 00_99
-bit 00_103
 bit 00_106
-bit 00_139
-bit 00_163
-bit 00_167
 bit 00_170
-bit 00_203
 bit 00_209
 bit 00_217
 bit 00_218
-bit 00_227
-bit 00_231
 bit 00_234
 bit 00_273
-bit 00_293
-bit 00_295
 bit 00_298
-bit 01_14
 bit 01_32
-bit 01_36
 bit 01_37
 bit 01_38
-bit 01_41
-bit 01_78
 bit 01_85
 bit 01_88
 bit 01_96
-bit 01_100
 bit 01_101
 bit 01_102
-bit 01_105
-bit 01_142
 bit 01_160
-bit 01_164
 bit 01_165
 bit 01_166
-bit 01_169
 bit 01_205
-bit 01_206
 bit 01_213
 bit 01_216
 bit 01_224
-bit 01_228
 bit 01_229
 bit 01_230
-bit 01_233
 bit 01_269
 bit 01_288
 bit 01_293
 bit 01_294
-bit 01_296
-bit 01_297
-bit 20_65
-bit 20_73
-bit 20_81
-bit 20_89
-bit 20_129
-bit 20_137
-bit 20_195
-bit 20_203
-bit 20_213
-bit 20_219
 bit 20_293
-bit 20_307
-bit 20_315
-bit 21_70
-bit 21_78
-bit 21_86
-bit 21_94
-bit 21_134
-bit 21_142
-bit 21_194
-bit 21_202
-bit 21_212
-bit 21_218
 bit 21_242
 bit 21_244
 bit 21_292
-bit 21_306
-bit 21_314
-bit 24_65
-bit 24_73
-bit 24_81
-bit 24_89
-bit 24_129
-bit 24_137
-bit 24_195
-bit 24_203
-bit 24_213
-bit 24_219
 bit 24_293
-bit 24_307
-bit 24_315
-bit 25_70
-bit 25_78
-bit 25_86
-bit 25_94
-bit 25_134
-bit 25_142
-bit 25_194
-bit 25_202
-bit 25_212
-bit 25_218
 bit 25_242
 bit 25_244
 bit 25_292
-bit 25_306
-bit 25_314
 bit 26_01
+bit 26_02
 bit 26_03
 bit 26_04
 bit 26_05
 bit 26_07
 bit 26_09
 bit 26_10
+bit 26_11
 bit 26_12
 bit 26_17
 bit 26_18
+bit 26_19
 bit 26_20
+bit 26_21
 bit 26_22
+bit 26_25
 bit 26_26
 bit 26_28
 bit 26_29
+bit 26_38
+bit 26_40
 bit 26_41
 bit 26_43
+bit 26_44
 bit 26_45
+bit 26_46
 bit 26_47
+bit 26_48
 bit 26_49
+bit 26_50
 bit 26_51
+bit 26_54
 bit 26_57
-bit 26_58
 bit 26_59
 bit 26_60
 bit 26_61
 bit 26_62
 bit 26_64
-bit 26_65
 bit 26_66
+bit 26_67
 bit 26_68
-bit 26_69
+bit 26_70
+bit 26_71
 bit 26_72
-bit 26_75
-bit 26_82
+bit 26_73
+bit 26_76
+bit 26_77
+bit 26_78
+bit 26_79
+bit 26_81
+bit 26_83
+bit 26_84
+bit 26_85
 bit 26_86
+bit 26_87
 bit 26_88
-bit 26_89
 bit 26_90
+bit 26_91
 bit 26_92
 bit 26_94
+bit 26_95
 bit 26_96
 bit 26_97
-bit 26_98
-bit 26_101
+bit 26_99
+bit 26_103
 bit 26_104
-bit 26_105
 bit 26_106
-bit 26_107
 bit 26_108
 bit 26_110
+bit 26_111
 bit 26_112
-bit 26_118
+bit 26_113
+bit 26_114
+bit 26_125
 bit 26_127
 bit 26_129
 bit 26_130
+bit 26_131
 bit 26_132
-bit 26_133
 bit 26_134
-bit 26_135
 bit 26_136
+bit 26_137
 bit 26_138
 bit 26_139
+bit 26_140
+bit 26_143
 bit 26_144
-bit 26_145
 bit 26_146
+bit 26_147
 bit 26_148
 bit 26_149
+bit 26_150
 bit 26_151
 bit 26_153
 bit 26_154
 bit 26_155
 bit 26_161
+bit 26_162
 bit 26_163
 bit 26_164
 bit 26_165
 bit 26_167
 bit 26_169
 bit 26_170
+bit 26_171
 bit 26_172
 bit 26_177
 bit 26_178
+bit 26_179
 bit 26_180
+bit 26_181
 bit 26_182
+bit 26_185
 bit 26_186
 bit 26_188
 bit 26_189
+bit 26_198
+bit 26_200
 bit 26_201
 bit 26_203
+bit 26_204
 bit 26_205
+bit 26_206
 bit 26_207
+bit 26_208
 bit 26_209
+bit 26_210
 bit 26_211
+bit 26_214
 bit 26_217
-bit 26_218
 bit 26_219
 bit 26_220
 bit 26_221
 bit 26_222
 bit 26_224
-bit 26_225
 bit 26_226
+bit 26_227
 bit 26_228
-bit 26_229
+bit 26_230
+bit 26_231
 bit 26_232
-bit 26_235
-bit 26_242
+bit 26_233
+bit 26_236
+bit 26_237
+bit 26_238
+bit 26_239
+bit 26_241
+bit 26_243
+bit 26_244
+bit 26_245
 bit 26_246
+bit 26_247
 bit 26_248
-bit 26_249
 bit 26_250
+bit 26_251
 bit 26_252
 bit 26_254
+bit 26_255
 bit 26_256
 bit 26_257
-bit 26_258
-bit 26_261
+bit 26_259
+bit 26_263
 bit 26_264
-bit 26_265
 bit 26_266
-bit 26_267
 bit 26_268
 bit 26_270
+bit 26_271
 bit 26_272
-bit 26_278
+bit 26_273
+bit 26_274
+bit 26_285
 bit 26_287
 bit 26_289
 bit 26_290
+bit 26_291
 bit 26_292
-bit 26_293
 bit 26_294
-bit 26_295
 bit 26_296
+bit 26_297
 bit 26_298
 bit 26_299
+bit 26_300
+bit 26_303
 bit 26_304
-bit 26_305
 bit 26_306
+bit 26_307
 bit 26_308
 bit 26_309
+bit 26_310
 bit 26_311
 bit 26_313
 bit 26_314
@@ -261,154 +235,174 @@
 bit 27_01
 bit 27_06
 bit 27_08
+bit 27_09
+bit 27_10
 bit 27_11
-bit 27_12
 bit 27_13
 bit 27_17
 bit 27_19
+bit 27_20
 bit 27_21
+bit 27_22
 bit 27_23
 bit 27_24
 bit 27_26
+bit 27_29
 bit 27_38
 bit 27_40
+bit 27_41
 bit 27_42
 bit 27_44
 bit 27_46
+bit 27_47
 bit 27_48
 bit 27_49
 bit 27_50
-bit 27_51
+bit 27_52
 bit 27_53
 bit 27_54
 bit 27_56
 bit 27_57
+bit 27_58
 bit 27_60
 bit 27_61
 bit 27_62
 bit 27_63
+bit 27_64
 bit 27_65
 bit 27_66
 bit 27_67
-bit 27_68
 bit 27_69
-bit 27_71
-bit 27_78
-bit 27_79
-bit 27_80
+bit 27_70
+bit 27_74
+bit 27_75
+bit 27_77
+bit 27_81
+bit 27_82
+bit 27_84
+bit 27_85
 bit 27_86
 bit 27_88
+bit 27_89
 bit 27_90
-bit 27_91
 bit 27_92
 bit 27_93
 bit 27_94
 bit 27_95
-bit 27_96
+bit 27_97
 bit 27_101
 bit 27_102
 bit 27_104
+bit 27_105
 bit 27_106
-bit 27_107
 bit 27_108
 bit 27_110
 bit 27_111
 bit 27_112
-bit 27_113
+bit 27_116
 bit 27_118
 bit 27_119
-bit 27_122
-bit 27_125
+bit 27_120
+bit 27_126
 bit 27_127
-bit 27_128
+bit 27_130
 bit 27_131
 bit 27_133
-bit 27_134
 bit 27_135
+bit 27_136
 bit 27_137
-bit 27_140
+bit 27_143
 bit 27_144
+bit 27_145
 bit 27_146
-bit 27_147
 bit 27_150
-bit 27_151
 bit 27_152
-bit 27_154
-bit 27_158
+bit 27_153
+bit 27_155
 bit 27_161
 bit 27_166
 bit 27_168
+bit 27_169
+bit 27_170
 bit 27_171
-bit 27_172
 bit 27_173
 bit 27_177
 bit 27_179
+bit 27_180
 bit 27_181
+bit 27_182
 bit 27_183
 bit 27_184
 bit 27_186
+bit 27_189
 bit 27_198
 bit 27_200
+bit 27_201
 bit 27_202
 bit 27_204
 bit 27_206
+bit 27_207
 bit 27_208
 bit 27_209
 bit 27_210
-bit 27_211
+bit 27_212
 bit 27_213
 bit 27_214
 bit 27_216
 bit 27_217
+bit 27_218
 bit 27_220
 bit 27_221
 bit 27_222
 bit 27_223
+bit 27_224
 bit 27_225
 bit 27_226
 bit 27_227
-bit 27_228
 bit 27_229
-bit 27_231
-bit 27_238
-bit 27_239
-bit 27_240
+bit 27_230
+bit 27_234
+bit 27_235
+bit 27_237
+bit 27_241
+bit 27_242
+bit 27_244
+bit 27_245
 bit 27_246
 bit 27_248
+bit 27_249
 bit 27_250
-bit 27_251
 bit 27_252
 bit 27_253
 bit 27_254
 bit 27_255
-bit 27_256
+bit 27_257
 bit 27_261
 bit 27_262
 bit 27_264
+bit 27_265
 bit 27_266
-bit 27_267
 bit 27_268
 bit 27_270
 bit 27_271
 bit 27_272
-bit 27_273
+bit 27_276
 bit 27_278
 bit 27_279
-bit 27_282
-bit 27_285
+bit 27_280
+bit 27_286
 bit 27_287
-bit 27_288
+bit 27_290
 bit 27_291
 bit 27_293
-bit 27_294
 bit 27_295
+bit 27_296
 bit 27_297
-bit 27_300
+bit 27_303
 bit 27_304
+bit 27_305
 bit 27_306
-bit 27_307
 bit 27_310
-bit 27_311
 bit 27_312
-bit 27_314
-bit 27_318
+bit 27_313
+bit 27_315
diff --git a/artix7/mask_dsp_r.db b/artix7/mask_dsp_r.db
index ea47238..f504eb1 100644
--- a/artix7/mask_dsp_r.db
+++ b/artix7/mask_dsp_r.db
@@ -1,259 +1,233 @@
-bit 00_11
-bit 00_35
-bit 00_39
 bit 00_42
-bit 00_75
 bit 00_89
 bit 00_90
-bit 00_99
-bit 00_103
 bit 00_106
-bit 00_139
-bit 00_163
-bit 00_167
 bit 00_170
-bit 00_203
 bit 00_209
 bit 00_217
 bit 00_218
-bit 00_227
-bit 00_231
 bit 00_234
 bit 00_273
-bit 00_293
-bit 00_295
 bit 00_298
-bit 01_14
 bit 01_32
-bit 01_36
 bit 01_37
 bit 01_38
-bit 01_41
-bit 01_78
 bit 01_85
 bit 01_88
 bit 01_96
-bit 01_100
 bit 01_101
 bit 01_102
-bit 01_105
-bit 01_142
 bit 01_160
-bit 01_164
 bit 01_165
 bit 01_166
-bit 01_169
 bit 01_205
-bit 01_206
 bit 01_213
 bit 01_216
 bit 01_224
-bit 01_228
 bit 01_229
 bit 01_230
-bit 01_233
 bit 01_269
 bit 01_288
 bit 01_293
 bit 01_294
-bit 01_296
-bit 01_297
-bit 20_65
-bit 20_73
-bit 20_81
-bit 20_89
-bit 20_129
-bit 20_137
-bit 20_195
-bit 20_203
-bit 20_213
-bit 20_219
 bit 20_293
-bit 20_307
-bit 20_315
-bit 21_70
-bit 21_78
-bit 21_86
-bit 21_94
-bit 21_134
-bit 21_142
-bit 21_194
-bit 21_202
-bit 21_212
-bit 21_218
 bit 21_242
 bit 21_244
 bit 21_292
-bit 21_306
-bit 21_314
-bit 24_65
-bit 24_73
-bit 24_81
-bit 24_89
-bit 24_129
-bit 24_137
-bit 24_195
-bit 24_203
-bit 24_213
-bit 24_219
 bit 24_293
-bit 24_307
-bit 24_315
-bit 25_70
-bit 25_78
-bit 25_86
-bit 25_94
-bit 25_134
-bit 25_142
-bit 25_194
-bit 25_202
-bit 25_212
-bit 25_218
 bit 25_242
 bit 25_244
 bit 25_292
-bit 25_306
-bit 25_314
 bit 26_01
+bit 26_02
 bit 26_03
 bit 26_04
 bit 26_05
 bit 26_07
 bit 26_09
 bit 26_10
+bit 26_11
 bit 26_12
 bit 26_17
 bit 26_18
+bit 26_19
 bit 26_20
+bit 26_21
 bit 26_22
+bit 26_25
 bit 26_26
 bit 26_28
 bit 26_29
+bit 26_38
+bit 26_40
 bit 26_41
 bit 26_43
+bit 26_44
 bit 26_45
+bit 26_46
 bit 26_47
+bit 26_48
 bit 26_49
+bit 26_50
 bit 26_51
+bit 26_54
 bit 26_57
-bit 26_58
 bit 26_59
 bit 26_60
 bit 26_61
 bit 26_62
 bit 26_64
-bit 26_65
 bit 26_66
+bit 26_67
 bit 26_68
-bit 26_69
+bit 26_70
+bit 26_71
 bit 26_72
-bit 26_75
-bit 26_82
+bit 26_73
+bit 26_76
+bit 26_77
+bit 26_78
+bit 26_79
+bit 26_81
+bit 26_83
+bit 26_84
+bit 26_85
 bit 26_86
+bit 26_87
 bit 26_88
-bit 26_89
 bit 26_90
+bit 26_91
 bit 26_92
 bit 26_94
+bit 26_95
 bit 26_96
 bit 26_97
-bit 26_98
-bit 26_101
+bit 26_99
+bit 26_103
 bit 26_104
-bit 26_105
 bit 26_106
-bit 26_107
 bit 26_108
 bit 26_110
+bit 26_111
 bit 26_112
-bit 26_118
+bit 26_113
+bit 26_114
+bit 26_125
 bit 26_127
 bit 26_129
 bit 26_130
+bit 26_131
 bit 26_132
-bit 26_133
 bit 26_134
-bit 26_135
 bit 26_136
+bit 26_137
 bit 26_138
 bit 26_139
+bit 26_140
+bit 26_143
 bit 26_144
-bit 26_145
 bit 26_146
+bit 26_147
 bit 26_148
 bit 26_149
+bit 26_150
 bit 26_151
 bit 26_153
 bit 26_154
 bit 26_155
 bit 26_161
+bit 26_162
 bit 26_163
 bit 26_164
 bit 26_165
 bit 26_167
 bit 26_169
 bit 26_170
+bit 26_171
 bit 26_172
 bit 26_177
 bit 26_178
+bit 26_179
 bit 26_180
+bit 26_181
 bit 26_182
+bit 26_185
 bit 26_186
 bit 26_188
 bit 26_189
+bit 26_198
+bit 26_200
 bit 26_201
 bit 26_203
+bit 26_204
 bit 26_205
+bit 26_206
 bit 26_207
+bit 26_208
 bit 26_209
+bit 26_210
 bit 26_211
+bit 26_214
 bit 26_217
-bit 26_218
 bit 26_219
 bit 26_220
 bit 26_221
 bit 26_222
 bit 26_224
-bit 26_225
 bit 26_226
+bit 26_227
 bit 26_228
-bit 26_229
+bit 26_230
+bit 26_231
 bit 26_232
-bit 26_235
-bit 26_242
+bit 26_233
+bit 26_236
+bit 26_237
+bit 26_238
+bit 26_239
+bit 26_241
+bit 26_243
+bit 26_244
+bit 26_245
 bit 26_246
+bit 26_247
 bit 26_248
-bit 26_249
 bit 26_250
+bit 26_251
 bit 26_252
 bit 26_254
+bit 26_255
 bit 26_256
 bit 26_257
-bit 26_258
-bit 26_261
+bit 26_259
+bit 26_263
 bit 26_264
-bit 26_265
 bit 26_266
-bit 26_267
 bit 26_268
 bit 26_270
+bit 26_271
 bit 26_272
-bit 26_278
+bit 26_273
+bit 26_274
+bit 26_285
 bit 26_287
 bit 26_289
 bit 26_290
+bit 26_291
 bit 26_292
-bit 26_293
 bit 26_294
-bit 26_295
 bit 26_296
+bit 26_297
 bit 26_298
 bit 26_299
+bit 26_300
+bit 26_303
 bit 26_304
-bit 26_305
 bit 26_306
+bit 26_307
 bit 26_308
 bit 26_309
+bit 26_310
 bit 26_311
 bit 26_313
 bit 26_314
@@ -261,154 +235,174 @@
 bit 27_01
 bit 27_06
 bit 27_08
+bit 27_09
+bit 27_10
 bit 27_11
-bit 27_12
 bit 27_13
 bit 27_17
 bit 27_19
+bit 27_20
 bit 27_21
+bit 27_22
 bit 27_23
 bit 27_24
 bit 27_26
+bit 27_29
 bit 27_38
 bit 27_40
+bit 27_41
 bit 27_42
 bit 27_44
 bit 27_46
+bit 27_47
 bit 27_48
 bit 27_49
 bit 27_50
-bit 27_51
+bit 27_52
 bit 27_53
 bit 27_54
 bit 27_56
 bit 27_57
+bit 27_58
 bit 27_60
 bit 27_61
 bit 27_62
 bit 27_63
+bit 27_64
 bit 27_65
 bit 27_66
 bit 27_67
-bit 27_68
 bit 27_69
-bit 27_71
-bit 27_78
-bit 27_79
-bit 27_80
+bit 27_70
+bit 27_74
+bit 27_75
+bit 27_77
+bit 27_81
+bit 27_82
+bit 27_84
+bit 27_85
 bit 27_86
 bit 27_88
+bit 27_89
 bit 27_90
-bit 27_91
 bit 27_92
 bit 27_93
 bit 27_94
 bit 27_95
-bit 27_96
+bit 27_97
 bit 27_101
 bit 27_102
 bit 27_104
+bit 27_105
 bit 27_106
-bit 27_107
 bit 27_108
 bit 27_110
 bit 27_111
 bit 27_112
-bit 27_113
+bit 27_116
 bit 27_118
 bit 27_119
-bit 27_122
-bit 27_125
+bit 27_120
+bit 27_126
 bit 27_127
-bit 27_128
+bit 27_130
 bit 27_131
 bit 27_133
-bit 27_134
 bit 27_135
+bit 27_136
 bit 27_137
-bit 27_140
+bit 27_143
 bit 27_144
+bit 27_145
 bit 27_146
-bit 27_147
 bit 27_150
-bit 27_151
 bit 27_152
-bit 27_154
-bit 27_158
+bit 27_153
+bit 27_155
 bit 27_161
 bit 27_166
 bit 27_168
+bit 27_169
+bit 27_170
 bit 27_171
-bit 27_172
 bit 27_173
 bit 27_177
 bit 27_179
+bit 27_180
 bit 27_181
+bit 27_182
 bit 27_183
 bit 27_184
 bit 27_186
+bit 27_189
 bit 27_198
 bit 27_200
+bit 27_201
 bit 27_202
 bit 27_204
 bit 27_206
+bit 27_207
 bit 27_208
 bit 27_209
 bit 27_210
-bit 27_211
+bit 27_212
 bit 27_213
 bit 27_214
 bit 27_216
 bit 27_217
+bit 27_218
 bit 27_220
 bit 27_221
 bit 27_222
 bit 27_223
+bit 27_224
 bit 27_225
 bit 27_226
 bit 27_227
-bit 27_228
 bit 27_229
-bit 27_231
-bit 27_238
-bit 27_239
-bit 27_240
+bit 27_230
+bit 27_234
+bit 27_235
+bit 27_237
+bit 27_241
+bit 27_242
+bit 27_244
+bit 27_245
 bit 27_246
 bit 27_248
+bit 27_249
 bit 27_250
-bit 27_251
 bit 27_252
 bit 27_253
 bit 27_254
 bit 27_255
-bit 27_256
+bit 27_257
 bit 27_261
 bit 27_262
 bit 27_264
+bit 27_265
 bit 27_266
-bit 27_267
 bit 27_268
 bit 27_270
 bit 27_271
 bit 27_272
-bit 27_273
+bit 27_276
 bit 27_278
 bit 27_279
-bit 27_282
-bit 27_285
+bit 27_280
+bit 27_286
 bit 27_287
-bit 27_288
+bit 27_290
 bit 27_291
 bit 27_293
-bit 27_294
 bit 27_295
+bit 27_296
 bit 27_297
-bit 27_300
+bit 27_303
 bit 27_304
+bit 27_305
 bit 27_306
-bit 27_307
 bit 27_310
-bit 27_311
 bit 27_312
-bit 27_314
-bit 27_318
+bit 27_313
+bit 27_315
diff --git a/artix7/mask_hclk_ioi.db b/artix7/mask_hclk_ioi.db
index b86f81d..c94181d 100644
--- a/artix7/mask_hclk_ioi.db
+++ b/artix7/mask_hclk_ioi.db
@@ -105,23 +105,59 @@
 bit 32_14
 bit 32_15
 bit 32_16
+bit 32_17
 bit 32_19
 bit 32_20
+bit 32_22
 bit 32_23
 bit 32_24
 bit 32_25
 bit 32_26
+bit 32_28
 bit 32_30
+bit 33_14
+bit 33_15
+bit 33_16
+bit 33_17
+bit 33_18
+bit 33_19
+bit 33_20
+bit 33_21
+bit 33_23
+bit 33_24
+bit 33_25
+bit 33_26
+bit 33_27
+bit 33_28
+bit 33_29
+bit 33_30
+bit 33_31
 bit 34_15
 bit 34_16
+bit 34_17
+bit 34_18
+bit 34_19
+bit 34_20
 bit 34_23
 bit 34_24
+bit 34_25
+bit 34_26
+bit 34_29
+bit 34_30
 bit 34_31
+bit 35_15
+bit 35_16
+bit 35_17
+bit 35_18
 bit 35_19
 bit 35_21
 bit 35_23
 bit 35_24
 bit 35_25
+bit 35_26
+bit 35_27
+bit 35_28
+bit 35_29
 bit 36_14
 bit 36_16
 bit 36_17
diff --git a/artix7/mask_lioi3.db b/artix7/mask_lioi3.db
index 4c3181d..1c35129 100644
--- a/artix7/mask_lioi3.db
+++ b/artix7/mask_lioi3.db
@@ -15,7 +15,6 @@
 bit 25_84
 bit 25_85
 bit 25_95
-bit 25_96
 bit 25_98
 bit 25_99
 bit 25_111
diff --git a/artix7/mask_lioi3_tbytesrc.db b/artix7/mask_lioi3_tbytesrc.db
index 4c3181d..1c35129 100644
--- a/artix7/mask_lioi3_tbytesrc.db
+++ b/artix7/mask_lioi3_tbytesrc.db
@@ -15,7 +15,6 @@
 bit 25_84
 bit 25_85
 bit 25_95
-bit 25_96
 bit 25_98
 bit 25_99
 bit 25_111
diff --git a/artix7/mask_lioi3_tbyteterm.db b/artix7/mask_lioi3_tbyteterm.db
index 4c3181d..1c35129 100644
--- a/artix7/mask_lioi3_tbyteterm.db
+++ b/artix7/mask_lioi3_tbyteterm.db
@@ -15,7 +15,6 @@
 bit 25_84
 bit 25_85
 bit 25_95
-bit 25_96
 bit 25_98
 bit 25_99
 bit 25_111
diff --git a/artix7/mask_rioi3.db b/artix7/mask_rioi3.db
index 4c3181d..1c35129 100644
--- a/artix7/mask_rioi3.db
+++ b/artix7/mask_rioi3.db
@@ -15,7 +15,6 @@
 bit 25_84
 bit 25_85
 bit 25_95
-bit 25_96
 bit 25_98
 bit 25_99
 bit 25_111
diff --git a/artix7/mask_rioi3_tbytesrc.db b/artix7/mask_rioi3_tbytesrc.db
index 4c3181d..1c35129 100644
--- a/artix7/mask_rioi3_tbytesrc.db
+++ b/artix7/mask_rioi3_tbytesrc.db
@@ -15,7 +15,6 @@
 bit 25_84
 bit 25_85
 bit 25_95
-bit 25_96
 bit 25_98
 bit 25_99
 bit 25_111
diff --git a/artix7/mask_rioi3_tbyteterm.db b/artix7/mask_rioi3_tbyteterm.db
index 4c3181d..1c35129 100644
--- a/artix7/mask_rioi3_tbyteterm.db
+++ b/artix7/mask_rioi3_tbyteterm.db
@@ -15,7 +15,6 @@
 bit 25_84
 bit 25_85
 bit 25_95
-bit 25_96
 bit 25_98
 bit 25_99
 bit 25_111
diff --git a/artix7/ppips_hclk_ioi3.db b/artix7/ppips_hclk_ioi3.db
index 71375b7..b376a67 100644
--- a/artix7/ppips_hclk_ioi3.db
+++ b/artix7/ppips_hclk_ioi3.db
@@ -2,18 +2,6 @@
 HCLK_IOI3.HCLK_IOI_CK_BUFRCLK1.HCLK_IOI_RCLK2RCLK1 always
 HCLK_IOI3.HCLK_IOI_CK_BUFRCLK2.HCLK_IOI_RCLK2RCLK2 always
 HCLK_IOI3.HCLK_IOI_CK_BUFRCLK3.HCLK_IOI_RCLK2RCLK3 always
-HCLK_IOI3.HCLK_IOI_CK_IGCLK0.HCLK_IOI_CK_BUFHCLK0 always
-HCLK_IOI3.HCLK_IOI_CK_IGCLK1.HCLK_IOI_CK_BUFHCLK1 always
-HCLK_IOI3.HCLK_IOI_CK_IGCLK2.HCLK_IOI_CK_BUFHCLK2 always
-HCLK_IOI3.HCLK_IOI_CK_IGCLK3.HCLK_IOI_CK_BUFHCLK3 always
-HCLK_IOI3.HCLK_IOI_CK_IGCLK4.HCLK_IOI_CK_BUFHCLK4 always
-HCLK_IOI3.HCLK_IOI_CK_IGCLK5.HCLK_IOI_CK_BUFHCLK5 always
-HCLK_IOI3.HCLK_IOI_CK_IGCLK6.HCLK_IOI_CK_BUFHCLK6 always
-HCLK_IOI3.HCLK_IOI_CK_IGCLK7.HCLK_IOI_CK_BUFHCLK7 always
-HCLK_IOI3.HCLK_IOI_CK_IGCLK8.HCLK_IOI_CK_BUFHCLK8 always
-HCLK_IOI3.HCLK_IOI_CK_IGCLK9.HCLK_IOI_CK_BUFHCLK9 always
-HCLK_IOI3.HCLK_IOI_CK_IGCLK10.HCLK_IOI_CK_BUFHCLK10 always
-HCLK_IOI3.HCLK_IOI_CK_IGCLK11.HCLK_IOI_CK_BUFHCLK11 always
 HCLK_IOI3.HCLK_IOI_IO_PLL_CLK0.HCLK_IOI_IO_PLL_CLK0_DMUX always
 HCLK_IOI3.HCLK_IOI_IO_PLL_CLK1.HCLK_IOI_IO_PLL_CLK1_DMUX always
 HCLK_IOI3.HCLK_IOI_IO_PLL_CLK2.HCLK_IOI_IO_PLL_CLK2_DMUX always
diff --git a/artix7/segbits_dsp_l.db b/artix7/segbits_dsp_l.db
index 78d5d77..26e1f3b 100644
--- a/artix7/segbits_dsp_l.db
+++ b/artix7/segbits_dsp_l.db
@@ -1,3 +1,6 @@
+DSP_L.DSP48.DSP_0.A_INPUT[0] 27_84
+DSP_L.DSP48.DSP_0.AUTORESET_PATDET[0] 26_78
+DSP_L.DSP48.DSP_0.B_INPUT[0] 26_11
 DSP_L.DSP48.DSP_0.MASK[0] 27_01
 DSP_L.DSP48.DSP_0.MASK[1] 26_03
 DSP_L.DSP48.DSP_0.MASK[2] 27_06
@@ -94,6 +97,20 @@
 DSP_L.DSP48.DSP_0.PATTERN[45] 26_151
 DSP_L.DSP48.DSP_0.PATTERN[46] 27_152
 DSP_L.DSP48.DSP_0.PATTERN[47] 26_155
+DSP_L.DSP48.DSP_0.SEL_MASK[1] 27_82
+DSP_L.DSP48.DSP_0.USE_DPORT[0] 26_95
+DSP_L.DSP48.DSP_0.USE_SIMD[1] 26_143 27_52
+DSP_L.DSP48.DSP_0.ZALUMODEREG[0] 26_54
+DSP_L.DSP48.DSP_0.ZCARRYINREG[0] 26_02
+DSP_L.DSP48.DSP_0.ZCARRYINSELREG[0] 27_10
+DSP_L.DSP48.DSP_0.ZCREG[0] 26_76
+DSP_L.DSP48.DSP_0.ZINMODEREG[0] 26_87
+DSP_L.DSP48.DSP_0.ZMREG[0] 26_38
+DSP_L.DSP48.DSP_0.ZOPMODEREG[0] 26_25
+DSP_L.DSP48.DSP_0.ZPREG[0] 27_75
+DSP_L.DSP48.DSP_1.A_INPUT[0] 27_244
+DSP_L.DSP48.DSP_1.AUTORESET_PATDET[0] 26_238
+DSP_L.DSP48.DSP_1.B_INPUT[0] 26_171
 DSP_L.DSP48.DSP_1.MASK[0] 27_161
 DSP_L.DSP48.DSP_1.MASK[1] 26_163
 DSP_L.DSP48.DSP_1.MASK[2] 27_166
@@ -190,3 +207,14 @@
 DSP_L.DSP48.DSP_1.PATTERN[45] 26_311
 DSP_L.DSP48.DSP_1.PATTERN[46] 27_312
 DSP_L.DSP48.DSP_1.PATTERN[47] 26_315
+DSP_L.DSP48.DSP_1.SEL_MASK[1] 27_242
+DSP_L.DSP48.DSP_1.USE_DPORT[0] 26_255
+DSP_L.DSP48.DSP_1.USE_SIMD[1] 26_303 27_212
+DSP_L.DSP48.DSP_1.ZALUMODEREG[0] 26_214
+DSP_L.DSP48.DSP_1.ZCARRYINREG[0] 26_162
+DSP_L.DSP48.DSP_1.ZCARRYINSELREG[0] 27_170
+DSP_L.DSP48.DSP_1.ZCREG[0] 26_236
+DSP_L.DSP48.DSP_1.ZINMODEREG[0] 26_247
+DSP_L.DSP48.DSP_1.ZMREG[0] 26_198
+DSP_L.DSP48.DSP_1.ZOPMODEREG[0] 26_185
+DSP_L.DSP48.DSP_1.ZPREG[0] 27_235
diff --git a/artix7/segbits_dsp_l.origin_info.db b/artix7/segbits_dsp_l.origin_info.db
index b96d449..6648abf 100644
--- a/artix7/segbits_dsp_l.origin_info.db
+++ b/artix7/segbits_dsp_l.origin_info.db
@@ -1,3 +1,6 @@
+DSP_L.DSP48.DSP_0.AUTORESET_PATDET[0] origin:100-dsp-mskpat 26_78
+DSP_L.DSP48.DSP_0.A_INPUT[0] origin:100-dsp-mskpat 27_84
+DSP_L.DSP48.DSP_0.B_INPUT[0] origin:100-dsp-mskpat 26_11
 DSP_L.DSP48.DSP_0.MASK[0] origin:100-dsp-mskpat 27_01
 DSP_L.DSP48.DSP_0.MASK[10] origin:100-dsp-mskpat 27_26
 DSP_L.DSP48.DSP_0.MASK[11] origin:100-dsp-mskpat 26_28
@@ -94,6 +97,20 @@
 DSP_L.DSP48.DSP_0.PATTERN[7] origin:100-dsp-mskpat 26_20
 DSP_L.DSP48.DSP_0.PATTERN[8] origin:100-dsp-mskpat 27_21
 DSP_L.DSP48.DSP_0.PATTERN[9] origin:100-dsp-mskpat 27_24
+DSP_L.DSP48.DSP_0.SEL_MASK[1] origin:100-dsp-mskpat 27_82
+DSP_L.DSP48.DSP_0.USE_DPORT[0] origin:100-dsp-mskpat 26_95
+DSP_L.DSP48.DSP_0.USE_SIMD[1] origin:100-dsp-mskpat 26_143 27_52
+DSP_L.DSP48.DSP_0.ZALUMODEREG[0] origin:100-dsp-mskpat 26_54
+DSP_L.DSP48.DSP_0.ZCARRYINREG[0] origin:100-dsp-mskpat 26_02
+DSP_L.DSP48.DSP_0.ZCARRYINSELREG[0] origin:100-dsp-mskpat 27_10
+DSP_L.DSP48.DSP_0.ZCREG[0] origin:100-dsp-mskpat 26_76
+DSP_L.DSP48.DSP_0.ZINMODEREG[0] origin:100-dsp-mskpat 26_87
+DSP_L.DSP48.DSP_0.ZMREG[0] origin:100-dsp-mskpat 26_38
+DSP_L.DSP48.DSP_0.ZOPMODEREG[0] origin:100-dsp-mskpat 26_25
+DSP_L.DSP48.DSP_0.ZPREG[0] origin:100-dsp-mskpat 27_75
+DSP_L.DSP48.DSP_1.AUTORESET_PATDET[0] origin:100-dsp-mskpat 26_238
+DSP_L.DSP48.DSP_1.A_INPUT[0] origin:100-dsp-mskpat 27_244
+DSP_L.DSP48.DSP_1.B_INPUT[0] origin:100-dsp-mskpat 26_171
 DSP_L.DSP48.DSP_1.MASK[0] origin:100-dsp-mskpat 27_161
 DSP_L.DSP48.DSP_1.MASK[10] origin:100-dsp-mskpat 27_186
 DSP_L.DSP48.DSP_1.MASK[11] origin:100-dsp-mskpat 26_188
@@ -190,3 +207,14 @@
 DSP_L.DSP48.DSP_1.PATTERN[7] origin:100-dsp-mskpat 26_180
 DSP_L.DSP48.DSP_1.PATTERN[8] origin:100-dsp-mskpat 27_181
 DSP_L.DSP48.DSP_1.PATTERN[9] origin:100-dsp-mskpat 27_184
+DSP_L.DSP48.DSP_1.SEL_MASK[1] origin:100-dsp-mskpat 27_242
+DSP_L.DSP48.DSP_1.USE_DPORT[0] origin:100-dsp-mskpat 26_255
+DSP_L.DSP48.DSP_1.USE_SIMD[1] origin:100-dsp-mskpat 26_303 27_212
+DSP_L.DSP48.DSP_1.ZALUMODEREG[0] origin:100-dsp-mskpat 26_214
+DSP_L.DSP48.DSP_1.ZCARRYINREG[0] origin:100-dsp-mskpat 26_162
+DSP_L.DSP48.DSP_1.ZCARRYINSELREG[0] origin:100-dsp-mskpat 27_170
+DSP_L.DSP48.DSP_1.ZCREG[0] origin:100-dsp-mskpat 26_236
+DSP_L.DSP48.DSP_1.ZINMODEREG[0] origin:100-dsp-mskpat 26_247
+DSP_L.DSP48.DSP_1.ZMREG[0] origin:100-dsp-mskpat 26_198
+DSP_L.DSP48.DSP_1.ZOPMODEREG[0] origin:100-dsp-mskpat 26_185
+DSP_L.DSP48.DSP_1.ZPREG[0] origin:100-dsp-mskpat 27_235
diff --git a/artix7/segbits_dsp_r.db b/artix7/segbits_dsp_r.db
index 050f6fa..db04273 100644
--- a/artix7/segbits_dsp_r.db
+++ b/artix7/segbits_dsp_r.db
@@ -1,3 +1,6 @@
+DSP_R.DSP48.DSP_0.A_INPUT[0] 27_84
+DSP_R.DSP48.DSP_0.AUTORESET_PATDET[0] 26_78
+DSP_R.DSP48.DSP_0.B_INPUT[0] 26_11
 DSP_R.DSP48.DSP_0.MASK[0] 27_01
 DSP_R.DSP48.DSP_0.MASK[1] 26_03
 DSP_R.DSP48.DSP_0.MASK[2] 27_06
@@ -94,6 +97,20 @@
 DSP_R.DSP48.DSP_0.PATTERN[45] 26_151
 DSP_R.DSP48.DSP_0.PATTERN[46] 27_152
 DSP_R.DSP48.DSP_0.PATTERN[47] 26_155
+DSP_R.DSP48.DSP_0.SEL_MASK[1] 27_82
+DSP_R.DSP48.DSP_0.USE_DPORT[0] 26_95
+DSP_R.DSP48.DSP_0.USE_SIMD[1] 26_143 27_52
+DSP_R.DSP48.DSP_0.ZALUMODEREG[0] 26_54
+DSP_R.DSP48.DSP_0.ZCARRYINREG[0] 26_02
+DSP_R.DSP48.DSP_0.ZCARRYINSELREG[0] 27_10
+DSP_R.DSP48.DSP_0.ZCREG[0] 26_76
+DSP_R.DSP48.DSP_0.ZINMODEREG[0] 26_87
+DSP_R.DSP48.DSP_0.ZMREG[0] 26_38
+DSP_R.DSP48.DSP_0.ZOPMODEREG[0] 26_25
+DSP_R.DSP48.DSP_0.ZPREG[0] 27_75
+DSP_R.DSP48.DSP_1.A_INPUT[0] 27_244
+DSP_R.DSP48.DSP_1.AUTORESET_PATDET[0] 26_238
+DSP_R.DSP48.DSP_1.B_INPUT[0] 26_171
 DSP_R.DSP48.DSP_1.MASK[0] 27_161
 DSP_R.DSP48.DSP_1.MASK[1] 26_163
 DSP_R.DSP48.DSP_1.MASK[2] 27_166
@@ -190,3 +207,14 @@
 DSP_R.DSP48.DSP_1.PATTERN[45] 26_311
 DSP_R.DSP48.DSP_1.PATTERN[46] 27_312
 DSP_R.DSP48.DSP_1.PATTERN[47] 26_315
+DSP_R.DSP48.DSP_1.SEL_MASK[1] 27_242
+DSP_R.DSP48.DSP_1.USE_DPORT[0] 26_255
+DSP_R.DSP48.DSP_1.USE_SIMD[1] 26_303 27_212
+DSP_R.DSP48.DSP_1.ZALUMODEREG[0] 26_214
+DSP_R.DSP48.DSP_1.ZCARRYINREG[0] 26_162
+DSP_R.DSP48.DSP_1.ZCARRYINSELREG[0] 27_170
+DSP_R.DSP48.DSP_1.ZCREG[0] 26_236
+DSP_R.DSP48.DSP_1.ZINMODEREG[0] 26_247
+DSP_R.DSP48.DSP_1.ZMREG[0] 26_198
+DSP_R.DSP48.DSP_1.ZOPMODEREG[0] 26_185
+DSP_R.DSP48.DSP_1.ZPREG[0] 27_235
diff --git a/artix7/segbits_dsp_r.origin_info.db b/artix7/segbits_dsp_r.origin_info.db
index b2686fc..03bbb6e 100644
--- a/artix7/segbits_dsp_r.origin_info.db
+++ b/artix7/segbits_dsp_r.origin_info.db
@@ -1,3 +1,6 @@
+DSP_R.DSP48.DSP_0.AUTORESET_PATDET[0] origin:100-dsp-mskpat 26_78
+DSP_R.DSP48.DSP_0.A_INPUT[0] origin:100-dsp-mskpat 27_84
+DSP_R.DSP48.DSP_0.B_INPUT[0] origin:100-dsp-mskpat 26_11
 DSP_R.DSP48.DSP_0.MASK[0] origin:100-dsp-mskpat 27_01
 DSP_R.DSP48.DSP_0.MASK[10] origin:100-dsp-mskpat 27_26
 DSP_R.DSP48.DSP_0.MASK[11] origin:100-dsp-mskpat 26_28
@@ -94,6 +97,20 @@
 DSP_R.DSP48.DSP_0.PATTERN[7] origin:100-dsp-mskpat 26_20
 DSP_R.DSP48.DSP_0.PATTERN[8] origin:100-dsp-mskpat 27_21
 DSP_R.DSP48.DSP_0.PATTERN[9] origin:100-dsp-mskpat 27_24
+DSP_R.DSP48.DSP_0.SEL_MASK[1] origin:100-dsp-mskpat 27_82
+DSP_R.DSP48.DSP_0.USE_DPORT[0] origin:100-dsp-mskpat 26_95
+DSP_R.DSP48.DSP_0.USE_SIMD[1] origin:100-dsp-mskpat 26_143 27_52
+DSP_R.DSP48.DSP_0.ZALUMODEREG[0] origin:100-dsp-mskpat 26_54
+DSP_R.DSP48.DSP_0.ZCARRYINREG[0] origin:100-dsp-mskpat 26_02
+DSP_R.DSP48.DSP_0.ZCARRYINSELREG[0] origin:100-dsp-mskpat 27_10
+DSP_R.DSP48.DSP_0.ZCREG[0] origin:100-dsp-mskpat 26_76
+DSP_R.DSP48.DSP_0.ZINMODEREG[0] origin:100-dsp-mskpat 26_87
+DSP_R.DSP48.DSP_0.ZMREG[0] origin:100-dsp-mskpat 26_38
+DSP_R.DSP48.DSP_0.ZOPMODEREG[0] origin:100-dsp-mskpat 26_25
+DSP_R.DSP48.DSP_0.ZPREG[0] origin:100-dsp-mskpat 27_75
+DSP_R.DSP48.DSP_1.AUTORESET_PATDET[0] origin:100-dsp-mskpat 26_238
+DSP_R.DSP48.DSP_1.A_INPUT[0] origin:100-dsp-mskpat 27_244
+DSP_R.DSP48.DSP_1.B_INPUT[0] origin:100-dsp-mskpat 26_171
 DSP_R.DSP48.DSP_1.MASK[0] origin:100-dsp-mskpat 27_161
 DSP_R.DSP48.DSP_1.MASK[10] origin:100-dsp-mskpat 27_186
 DSP_R.DSP48.DSP_1.MASK[11] origin:100-dsp-mskpat 26_188
@@ -190,3 +207,14 @@
 DSP_R.DSP48.DSP_1.PATTERN[7] origin:100-dsp-mskpat 26_180
 DSP_R.DSP48.DSP_1.PATTERN[8] origin:100-dsp-mskpat 27_181
 DSP_R.DSP48.DSP_1.PATTERN[9] origin:100-dsp-mskpat 27_184
+DSP_R.DSP48.DSP_1.SEL_MASK[1] origin:100-dsp-mskpat 27_242
+DSP_R.DSP48.DSP_1.USE_DPORT[0] origin:100-dsp-mskpat 26_255
+DSP_R.DSP48.DSP_1.USE_SIMD[1] origin:100-dsp-mskpat 26_303 27_212
+DSP_R.DSP48.DSP_1.ZALUMODEREG[0] origin:100-dsp-mskpat 26_214
+DSP_R.DSP48.DSP_1.ZCARRYINREG[0] origin:100-dsp-mskpat 26_162
+DSP_R.DSP48.DSP_1.ZCARRYINSELREG[0] origin:100-dsp-mskpat 27_170
+DSP_R.DSP48.DSP_1.ZCREG[0] origin:100-dsp-mskpat 26_236
+DSP_R.DSP48.DSP_1.ZINMODEREG[0] origin:100-dsp-mskpat 26_247
+DSP_R.DSP48.DSP_1.ZMREG[0] origin:100-dsp-mskpat 26_198
+DSP_R.DSP48.DSP_1.ZOPMODEREG[0] origin:100-dsp-mskpat 26_185
+DSP_R.DSP48.DSP_1.ZPREG[0] origin:100-dsp-mskpat 27_235
diff --git a/artix7/segbits_hclk_ioi3.db b/artix7/segbits_hclk_ioi3.db
index 7820e98..443583e 100644
--- a/artix7/segbits_hclk_ioi3.db
+++ b/artix7/segbits_hclk_ioi3.db
@@ -210,18 +210,34 @@
 HCLK_IOI3.HCLK_IOI_LEAF_GCLK_TOP5.HCLK_IOI_CK_IGCLK9 30_19 31_15
 HCLK_IOI3.HCLK_IOI_LEAF_GCLK_TOP5.HCLK_IOI_CK_IGCLK10 30_14 30_19
 HCLK_IOI3.HCLK_IOI_LEAF_GCLK_TOP5.HCLK_IOI_CK_IGCLK11 30_16 30_19
+HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV0.HCLK_IOI_RCLK_IMUX0 32_30 35_26
+HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV0.HCLK_IOI_RCLK_IMUX1 32_30 35_27
+HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV0.HCLK_IOI_RCLK_IMUX2 32_30 35_28
+HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV0.HCLK_IOI_RCLK_IMUX3 32_30 35_29
 HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV0.HCLK_IOI_RCLK0 32_30 35_23
 HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV0.HCLK_IOI_RCLK1 32_30 35_24
 HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV0.HCLK_IOI_RCLK2 32_30 34_31
 HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV0.HCLK_IOI_RCLK3 32_30 35_25
+HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV1.HCLK_IOI_RCLK_IMUX0 32_26 34_25
+HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV1.HCLK_IOI_RCLK_IMUX1 32_26 34_26
+HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV1.HCLK_IOI_RCLK_IMUX2 32_26 34_30
+HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV1.HCLK_IOI_RCLK_IMUX3 32_26 34_29
 HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV1.HCLK_IOI_RCLK0 32_26 36_26
 HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV1.HCLK_IOI_RCLK1 32_26 36_27
 HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV1.HCLK_IOI_RCLK2 32_26 34_23
 HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV1.HCLK_IOI_RCLK3 32_26 34_24
+HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV2.HCLK_IOI_RCLK_IMUX0 32_20 34_17
+HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV2.HCLK_IOI_RCLK_IMUX1 32_20 34_18
+HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV2.HCLK_IOI_RCLK_IMUX2 32_20 34_19
+HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV2.HCLK_IOI_RCLK_IMUX3 32_20 34_20
 HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV2.HCLK_IOI_RCLK0 32_20 36_24
 HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV2.HCLK_IOI_RCLK1 32_20 36_25
 HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV2.HCLK_IOI_RCLK2 32_20 34_15
 HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV2.HCLK_IOI_RCLK3 32_20 34_16
+HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV3.HCLK_IOI_RCLK_IMUX0 32_19 35_18
+HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV3.HCLK_IOI_RCLK_IMUX1 32_19 35_17
+HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV3.HCLK_IOI_RCLK_IMUX2 32_19 35_16
+HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV3.HCLK_IOI_RCLK_IMUX3 32_19 35_15
 HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV3.HCLK_IOI_RCLK0 32_16 32_19
 HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV3.HCLK_IOI_RCLK1 32_19 35_21
 HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV3.HCLK_IOI_RCLK2 31_20 32_19
diff --git a/artix7/segbits_hclk_ioi3.origin_info.db b/artix7/segbits_hclk_ioi3.origin_info.db
index 1ada548..eeb07e9 100644
--- a/artix7/segbits_hclk_ioi3.origin_info.db
+++ b/artix7/segbits_hclk_ioi3.origin_info.db
@@ -50,18 +50,18 @@
 HCLK_IOI3.HCLK_IOI_CK_IGCLK7.HCLK_IOI_CK_BUFHCLK7 origin:047-hclk-ioi-pips 29_31
 HCLK_IOI3.HCLK_IOI_CK_IGCLK8.HCLK_IOI_CK_BUFHCLK8 origin:047-hclk-ioi-pips 28_14
 HCLK_IOI3.HCLK_IOI_CK_IGCLK9.HCLK_IOI_CK_BUFHCLK9 origin:047-hclk-ioi-pips 29_15
-HCLK_IOI3.HCLK_IOI_IDELAYCTRL_REFCLK.HCLK_IOI_LEAF_GCLK_BOT0 origin:047-hclk-ioi-pips 26_20 37_28 37_29
-HCLK_IOI3.HCLK_IOI_IDELAYCTRL_REFCLK.HCLK_IOI_LEAF_GCLK_BOT1 origin:047-hclk-ioi-pips 26_21 37_28 37_29
-HCLK_IOI3.HCLK_IOI_IDELAYCTRL_REFCLK.HCLK_IOI_LEAF_GCLK_BOT2 origin:047-hclk-ioi-pips 26_22 37_28 37_29
-HCLK_IOI3.HCLK_IOI_IDELAYCTRL_REFCLK.HCLK_IOI_LEAF_GCLK_BOT3 origin:047-hclk-ioi-pips 26_23 37_28 37_29
-HCLK_IOI3.HCLK_IOI_IDELAYCTRL_REFCLK.HCLK_IOI_LEAF_GCLK_BOT4 origin:047-hclk-ioi-pips 26_24 37_28 37_29
-HCLK_IOI3.HCLK_IOI_IDELAYCTRL_REFCLK.HCLK_IOI_LEAF_GCLK_BOT5 origin:047-hclk-ioi-pips 26_25 37_28 37_29
-HCLK_IOI3.HCLK_IOI_IDELAYCTRL_REFCLK.HCLK_IOI_LEAF_GCLK_TOP0 origin:047-hclk-ioi-pips 26_26 37_28 37_29
-HCLK_IOI3.HCLK_IOI_IDELAYCTRL_REFCLK.HCLK_IOI_LEAF_GCLK_TOP1 origin:047-hclk-ioi-pips 26_27 37_28 37_29
-HCLK_IOI3.HCLK_IOI_IDELAYCTRL_REFCLK.HCLK_IOI_LEAF_GCLK_TOP2 origin:047-hclk-ioi-pips 26_28 37_28 37_29
-HCLK_IOI3.HCLK_IOI_IDELAYCTRL_REFCLK.HCLK_IOI_LEAF_GCLK_TOP3 origin:047-hclk-ioi-pips 26_29 37_28 37_29
-HCLK_IOI3.HCLK_IOI_IDELAYCTRL_REFCLK.HCLK_IOI_LEAF_GCLK_TOP4 origin:047-hclk-ioi-pips 26_30 37_28 37_29
-HCLK_IOI3.HCLK_IOI_IDELAYCTRL_REFCLK.HCLK_IOI_LEAF_GCLK_TOP5 origin:047-hclk-ioi-pips 26_31 37_28 37_29
+HCLK_IOI3.HCLK_IOI_IDELAYCTRL_REFCLK.HCLK_IOI_LEAF_GCLK_BOT0 origin:047a-hclk-idelayctrl-pips 26_20 37_28 37_29
+HCLK_IOI3.HCLK_IOI_IDELAYCTRL_REFCLK.HCLK_IOI_LEAF_GCLK_BOT1 origin:047a-hclk-idelayctrl-pips 26_21 37_28 37_29
+HCLK_IOI3.HCLK_IOI_IDELAYCTRL_REFCLK.HCLK_IOI_LEAF_GCLK_BOT2 origin:047a-hclk-idelayctrl-pips 26_22 37_28 37_29
+HCLK_IOI3.HCLK_IOI_IDELAYCTRL_REFCLK.HCLK_IOI_LEAF_GCLK_BOT3 origin:047a-hclk-idelayctrl-pips 26_23 37_28 37_29
+HCLK_IOI3.HCLK_IOI_IDELAYCTRL_REFCLK.HCLK_IOI_LEAF_GCLK_BOT4 origin:047a-hclk-idelayctrl-pips 26_24 37_28 37_29
+HCLK_IOI3.HCLK_IOI_IDELAYCTRL_REFCLK.HCLK_IOI_LEAF_GCLK_BOT5 origin:047a-hclk-idelayctrl-pips 26_25 37_28 37_29
+HCLK_IOI3.HCLK_IOI_IDELAYCTRL_REFCLK.HCLK_IOI_LEAF_GCLK_TOP0 origin:047a-hclk-idelayctrl-pips 26_26 37_28 37_29
+HCLK_IOI3.HCLK_IOI_IDELAYCTRL_REFCLK.HCLK_IOI_LEAF_GCLK_TOP1 origin:047a-hclk-idelayctrl-pips 26_27 37_28 37_29
+HCLK_IOI3.HCLK_IOI_IDELAYCTRL_REFCLK.HCLK_IOI_LEAF_GCLK_TOP2 origin:047a-hclk-idelayctrl-pips 26_28 37_28 37_29
+HCLK_IOI3.HCLK_IOI_IDELAYCTRL_REFCLK.HCLK_IOI_LEAF_GCLK_TOP3 origin:047a-hclk-idelayctrl-pips 26_29 37_28 37_29
+HCLK_IOI3.HCLK_IOI_IDELAYCTRL_REFCLK.HCLK_IOI_LEAF_GCLK_TOP4 origin:047a-hclk-idelayctrl-pips 26_30 37_28 37_29
+HCLK_IOI3.HCLK_IOI_IDELAYCTRL_REFCLK.HCLK_IOI_LEAF_GCLK_TOP5 origin:047a-hclk-idelayctrl-pips 26_31 37_28 37_29
 HCLK_IOI3.HCLK_IOI_IO_PLL_CLK0_DMUX.HCLK_IOI_IOCLK_PLL0 origin:047-hclk-ioi-pips 36_28 36_29
 HCLK_IOI3.HCLK_IOI_IO_PLL_CLK1_DMUX.HCLK_IOI_IOCLK_PLL1 origin:047-hclk-ioi-pips 36_20 37_21
 HCLK_IOI3.HCLK_IOI_IO_PLL_CLK2_DMUX.HCLK_IOI_IOCLK_PLL2 origin:047-hclk-ioi-pips 36_14 36_17
@@ -214,18 +214,34 @@
 HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV0.HCLK_IOI_RCLK1 origin:047-hclk-ioi-pips 32_30 35_24
 HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV0.HCLK_IOI_RCLK2 origin:047-hclk-ioi-pips 32_30 34_31
 HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV0.HCLK_IOI_RCLK3 origin:047-hclk-ioi-pips 32_30 35_25
+HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV0.HCLK_IOI_RCLK_IMUX0 origin:047-hclk-ioi-pips 32_30 35_26
+HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV0.HCLK_IOI_RCLK_IMUX1 origin:047-hclk-ioi-pips 32_30 35_27
+HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV0.HCLK_IOI_RCLK_IMUX2 origin:047-hclk-ioi-pips 32_30 35_28
+HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV0.HCLK_IOI_RCLK_IMUX3 origin:047-hclk-ioi-pips 32_30 35_29
 HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV1.HCLK_IOI_RCLK0 origin:047-hclk-ioi-pips 32_26 36_26
 HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV1.HCLK_IOI_RCLK1 origin:047-hclk-ioi-pips 32_26 36_27
 HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV1.HCLK_IOI_RCLK2 origin:047-hclk-ioi-pips 32_26 34_23
 HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV1.HCLK_IOI_RCLK3 origin:047-hclk-ioi-pips 32_26 34_24
+HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV1.HCLK_IOI_RCLK_IMUX0 origin:047-hclk-ioi-pips 32_26 34_25
+HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV1.HCLK_IOI_RCLK_IMUX1 origin:047-hclk-ioi-pips 32_26 34_26
+HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV1.HCLK_IOI_RCLK_IMUX2 origin:047-hclk-ioi-pips 32_26 34_30
+HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV1.HCLK_IOI_RCLK_IMUX3 origin:047-hclk-ioi-pips 32_26 34_29
 HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV2.HCLK_IOI_RCLK0 origin:047-hclk-ioi-pips 32_20 36_24
 HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV2.HCLK_IOI_RCLK1 origin:047-hclk-ioi-pips 32_20 36_25
 HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV2.HCLK_IOI_RCLK2 origin:047-hclk-ioi-pips 32_20 34_15
 HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV2.HCLK_IOI_RCLK3 origin:047-hclk-ioi-pips 32_20 34_16
+HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV2.HCLK_IOI_RCLK_IMUX0 origin:047-hclk-ioi-pips 32_20 34_17
+HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV2.HCLK_IOI_RCLK_IMUX1 origin:047-hclk-ioi-pips 32_20 34_18
+HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV2.HCLK_IOI_RCLK_IMUX2 origin:047-hclk-ioi-pips 32_20 34_19
+HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV2.HCLK_IOI_RCLK_IMUX3 origin:047-hclk-ioi-pips 32_20 34_20
 HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV3.HCLK_IOI_RCLK0 origin:047-hclk-ioi-pips 32_16 32_19
 HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV3.HCLK_IOI_RCLK1 origin:047-hclk-ioi-pips 32_19 35_21
 HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV3.HCLK_IOI_RCLK2 origin:047-hclk-ioi-pips 31_20 32_19
 HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV3.HCLK_IOI_RCLK3 origin:047-hclk-ioi-pips 32_19 35_19
+HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV3.HCLK_IOI_RCLK_IMUX0 origin:047-hclk-ioi-pips 32_19 35_18
+HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV3.HCLK_IOI_RCLK_IMUX1 origin:047-hclk-ioi-pips 32_19 35_17
+HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV3.HCLK_IOI_RCLK_IMUX2 origin:047-hclk-ioi-pips 32_19 35_16
+HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV3.HCLK_IOI_RCLK_IMUX3 origin:047-hclk-ioi-pips 32_19 35_15
 HCLK_IOI3.STEPDOWN origin:030-iob 38_15 39_14 39_15 39_16
 HCLK_IOI3.VREF.V_600_MV origin:030-iob 38_26 39_30
 HCLK_IOI3.VREF.V_675_MV origin:030-iob 38_26 39_22
diff --git a/artix7/segbits_int_l.origin_info.db b/artix7/segbits_int_l.origin_info.db
index f345e7f..1a387ef 100644
--- a/artix7/segbits_int_l.origin_info.db
+++ b/artix7/segbits_int_l.origin_info.db
@@ -413,7 +413,7 @@
 INT_L.EE4BEG3.SS2END3 origin:050-pip-seed 03_56 05_59
 INT_L.EE4BEG3.SS6END3 origin:050-pip-seed 05_59 06_56
 INT_L.EE4BEG3.SW2END3 origin:050-pip-seed 02_57 05_59
-INT_L.EE4BEG3.SW6END3 origin:056-pip-rem 05_56 05_59
+INT_L.EE4BEG3.SW6END3 origin:050-pip-seed 05_56 05_59
 INT_L.EL1BEG0.EE2END1 origin:050-pip-seed 07_20 15_21
 INT_L.EL1BEG0.EE4END1 origin:050-pip-seed 07_20 12_21
 INT_L.EL1BEG0.EL1END1 origin:050-pip-seed 11_21 13_21
@@ -584,7 +584,7 @@
 INT_L.FAN_ALT0.GFAN0 origin:054-pip-fan-alt !22_00 !23_00 !24_00 21_00 25_00
 INT_L.FAN_ALT0.LOGIC_OUTS_L0 origin:050-pip-seed !23_00 21_00 22_00 24_00 25_00
 INT_L.FAN_ALT0.LOGIC_OUTS_L12 origin:050-pip-seed !22_00 21_00 23_00 24_00 25_00
-INT_L.FAN_ALT0.LOGIC_OUTS_L22 origin:050-pip-seed !22_00 !23_00 !25_00 21_00 24_00
+INT_L.FAN_ALT0.LOGIC_OUTS_L22 origin:056-pip-rem !22_00 !23_00 !25_00 21_00 24_00
 INT_L.FAN_ALT0.NE2END0 origin:050-pip-seed !22_00 !23_00 !25_00 18_01 24_00
 INT_L.FAN_ALT0.NL1END0 origin:050-pip-seed !22_00 19_01 23_00 24_00 25_00
 INT_L.FAN_ALT0.NN2END0 origin:050-pip-seed !22_00 !23_00 !24_00 18_01 25_00
@@ -2191,7 +2191,7 @@
 INT_L.NE6BEG3.NW2END3 origin:050-pip-seed 02_53 04_53
 INT_L.NE6BEG3.NW6END3 origin:050-pip-seed 04_53 06_52
 INT_L.NE6BEG3.SE2END3 origin:050-pip-seed 02_53 05_55
-INT_L.NE6BEG3.SE6END3 origin:050-pip-seed 05_55 06_52
+INT_L.NE6BEG3.SE6END3 origin:056-pip-rem 05_55 06_52
 INT_L.NE6BEG3.WW2END2 origin:050-pip-seed 03_52 04_53
 INT_L.NE6BEG3.WW4END3 origin:056-pip-rem 04_53 05_52
 INT_L.NL1BEG0.LOGIC_OUTS_L1 origin:050-pip-seed 07_16 14_17
@@ -3603,7 +3603,7 @@
 INT_L.WW4BEG2.LVB_L0 origin:056-pip-rem 04_34 05_32
 INT_L.WW4BEG2.LVB_L12 origin:056-pip-rem 05_32 07_33
 INT_L.WW4BEG2.NE2END2 origin:050-pip-seed 02_33 05_35
-INT_L.WW4BEG2.NE6END2 origin:050-pip-seed 05_32 05_35
+INT_L.WW4BEG2.NE6END2 origin:056-pip-rem 05_32 05_35
 INT_L.WW4BEG2.NN2END2 origin:050-pip-seed 03_32 05_35
 INT_L.WW4BEG2.NN6END2 origin:050-pip-seed 05_35 06_32
 INT_L.WW4BEG2.NW2END2 origin:050-pip-seed 02_33 03_33
diff --git a/artix7/segbits_int_r.origin_info.db b/artix7/segbits_int_r.origin_info.db
index 2a48ab4..9badc50 100644
--- a/artix7/segbits_int_r.origin_info.db
+++ b/artix7/segbits_int_r.origin_info.db
@@ -172,7 +172,7 @@
 INT_R.BYP_ALT7.EL1END_S3_0 origin:050-pip-seed !23_63 17_63 22_63 24_63 25_63
 INT_R.BYP_ALT7.ER1END3 origin:050-pip-seed !22_63 16_63 23_63 24_63 25_63
 INT_R.BYP_ALT7.FAN_BOUNCE_S3_4 origin:050-pip-seed !23_63 21_63 22_63 24_63 25_63
-INT_R.BYP_ALT7.FAN_BOUNCE_S3_6 origin:050-pip-seed !22_63 21_63 23_63 24_63 25_63
+INT_R.BYP_ALT7.FAN_BOUNCE_S3_6 origin:056-pip-rem !22_63 21_63 23_63 24_63 25_63
 INT_R.BYP_ALT7.GFAN1 origin:054-pip-fan-alt !22_63 !23_63 !25_63 20_63 24_63
 INT_R.BYP_ALT7.LOGIC_OUTS15 origin:051-pip-imuxlout-bypalts !23_63 20_63 22_63 24_63 25_63
 INT_R.BYP_ALT7.LOGIC_OUTS21 origin:051-pip-imuxlout-bypalts !22_63 !23_63 !24_63 20_63 25_63
@@ -353,7 +353,7 @@
 INT_R.EE4BEG0.SS2END0 origin:050-pip-seed 03_08 05_11
 INT_R.EE4BEG0.SS6END0 origin:050-pip-seed 05_11 06_08
 INT_R.EE4BEG0.SW2END0 origin:050-pip-seed 02_09 05_11
-INT_R.EE4BEG0.SW6END0 origin:050-pip-seed 05_08 05_11
+INT_R.EE4BEG0.SW6END0 origin:056-pip-rem 05_08 05_11
 INT_R.EE4BEG1.EE2END1 origin:050-pip-seed 03_24 03_25
 INT_R.EE4BEG1.EE4END1 origin:050-pip-seed 03_25 05_24
 INT_R.EE4BEG1.LH6 origin:056-pip-rem 05_24 07_25
@@ -413,7 +413,7 @@
 INT_R.EE4BEG3.SS2END3 origin:050-pip-seed 03_56 05_59
 INT_R.EE4BEG3.SS6END3 origin:050-pip-seed 05_59 06_56
 INT_R.EE4BEG3.SW2END3 origin:050-pip-seed 02_57 05_59
-INT_R.EE4BEG3.SW6END3 origin:050-pip-seed 05_56 05_59
+INT_R.EE4BEG3.SW6END3 origin:056-pip-rem 05_56 05_59
 INT_R.EL1BEG0.EE2END1 origin:050-pip-seed 07_20 15_21
 INT_R.EL1BEG0.EE4END1 origin:050-pip-seed 07_20 12_21
 INT_R.EL1BEG0.EL1END1 origin:050-pip-seed 11_21 13_21
@@ -676,7 +676,7 @@
 INT_R.FAN_ALT4.EL1END0 origin:050-pip-seed !22_08 16_08 23_08 24_08 25_08
 INT_R.FAN_ALT4.ER1END0 origin:050-pip-seed !23_08 17_08 22_08 24_08 25_08
 INT_R.FAN_ALT4.FAN_BOUNCE2 origin:050-pip-seed !23_08 20_08 22_08 24_08 25_08
-INT_R.FAN_ALT4.FAN_BOUNCE7 origin:050-pip-seed !22_08 20_08 23_08 24_08 25_08
+INT_R.FAN_ALT4.FAN_BOUNCE7 origin:056-pip-rem !22_08 20_08 23_08 24_08 25_08
 INT_R.FAN_ALT4.GFAN0 origin:054-pip-fan-alt !22_08 !23_08 !24_08 21_08 25_08
 INT_R.FAN_ALT4.LOGIC_OUTS18 origin:050-pip-seed !22_08 !23_08 !25_08 21_08 24_08
 INT_R.FAN_ALT4.LOGIC_OUTS4 origin:050-pip-seed !23_08 21_08 22_08 24_08 25_08
@@ -2193,7 +2193,7 @@
 INT_R.NE6BEG3.SE2END3 origin:050-pip-seed 02_53 05_55
 INT_R.NE6BEG3.SE6END3 origin:050-pip-seed 05_55 06_52
 INT_R.NE6BEG3.WW2END2 origin:050-pip-seed 03_52 04_53
-INT_R.NE6BEG3.WW4END3 origin:050-pip-seed 04_53 05_52
+INT_R.NE6BEG3.WW4END3 origin:056-pip-rem 04_53 05_52
 INT_R.NL1BEG0.LOGIC_OUTS1 origin:050-pip-seed 07_16 14_17
 INT_R.NL1BEG0.LOGIC_OUTS13 origin:050-pip-seed 10_17 14_17
 INT_R.NL1BEG0.LOGIC_OUTS19 origin:050-pip-seed 08_17 14_17
@@ -2609,7 +2609,7 @@
 INT_R.NW6BEG0.NW2END0 origin:050-pip-seed 02_02 03_02
 INT_R.NW6BEG0.NW6END0 origin:050-pip-seed 02_02 07_03
 INT_R.NW6BEG0.SS2END_N0_3 origin:050-pip-seed 02_03 04_00
-INT_R.NW6BEG0.SS6END_N0_3 origin:056-pip-rem 04_00 07_03
+INT_R.NW6BEG0.SS6END_N0_3 origin:050-pip-seed 04_00 07_03
 INT_R.NW6BEG0.SW2END_N0_3 origin:050-pip-seed 03_02 04_00
 INT_R.NW6BEG0.SW6END_N0_3 origin:050-pip-seed 04_00 04_03
 INT_R.NW6BEG0.WW2END_N0_3 origin:050-pip-seed 02_02 02_03
@@ -3295,7 +3295,7 @@
 INT_R.SW6BEG2.WW2END2 origin:050-pip-seed 03_44 05_47
 INT_R.SW6BEG2.WW4END3 origin:050-pip-seed 05_44 05_47
 INT_R.SW6BEG3.EE2END3 origin:050-pip-seed 03_60 04_61
-INT_R.SW6BEG3.EE4END3 origin:056-pip-rem 04_61 05_60
+INT_R.SW6BEG3.EE4END3 origin:050-pip-seed 04_61 05_60
 INT_R.SW6BEG3.LH0 origin:056-pip-rem 04_62 05_60
 INT_R.SW6BEG3.LOGIC_OUTS11 origin:050-pip-seed 03_60 07_61
 INT_R.SW6BEG3.LOGIC_OUTS15 origin:050-pip-seed 03_60 04_62
diff --git a/kintex7/mask_dsp_l.db b/kintex7/mask_dsp_l.db
index ea47238..1d1a6d4 100644
--- a/kintex7/mask_dsp_l.db
+++ b/kintex7/mask_dsp_l.db
@@ -1,259 +1,235 @@
-bit 00_11
-bit 00_35
-bit 00_39
 bit 00_42
-bit 00_75
 bit 00_89
 bit 00_90
-bit 00_99
-bit 00_103
 bit 00_106
-bit 00_139
-bit 00_163
-bit 00_167
 bit 00_170
-bit 00_203
 bit 00_209
 bit 00_217
 bit 00_218
-bit 00_227
-bit 00_231
 bit 00_234
 bit 00_273
-bit 00_293
-bit 00_295
 bit 00_298
-bit 01_14
 bit 01_32
-bit 01_36
 bit 01_37
 bit 01_38
-bit 01_41
-bit 01_78
 bit 01_85
 bit 01_88
 bit 01_96
-bit 01_100
 bit 01_101
 bit 01_102
-bit 01_105
-bit 01_142
 bit 01_160
-bit 01_164
 bit 01_165
 bit 01_166
-bit 01_169
 bit 01_205
-bit 01_206
 bit 01_213
 bit 01_216
 bit 01_224
-bit 01_228
 bit 01_229
 bit 01_230
-bit 01_233
 bit 01_269
 bit 01_288
 bit 01_293
 bit 01_294
-bit 01_296
-bit 01_297
-bit 20_65
-bit 20_73
-bit 20_81
-bit 20_89
-bit 20_129
-bit 20_137
-bit 20_195
-bit 20_203
-bit 20_213
-bit 20_219
+bit 03_69
+bit 05_68
 bit 20_293
-bit 20_307
-bit 20_315
-bit 21_70
-bit 21_78
-bit 21_86
-bit 21_94
-bit 21_134
-bit 21_142
-bit 21_194
-bit 21_202
-bit 21_212
-bit 21_218
 bit 21_242
 bit 21_244
 bit 21_292
-bit 21_306
-bit 21_314
-bit 24_65
-bit 24_73
-bit 24_81
-bit 24_89
-bit 24_129
-bit 24_137
-bit 24_195
-bit 24_203
-bit 24_213
-bit 24_219
 bit 24_293
-bit 24_307
-bit 24_315
-bit 25_70
-bit 25_78
-bit 25_86
-bit 25_94
-bit 25_134
-bit 25_142
-bit 25_194
-bit 25_202
-bit 25_212
-bit 25_218
 bit 25_242
 bit 25_244
 bit 25_292
-bit 25_306
-bit 25_314
 bit 26_01
+bit 26_02
 bit 26_03
 bit 26_04
 bit 26_05
 bit 26_07
 bit 26_09
 bit 26_10
+bit 26_11
 bit 26_12
 bit 26_17
 bit 26_18
+bit 26_19
 bit 26_20
+bit 26_21
 bit 26_22
+bit 26_25
 bit 26_26
 bit 26_28
 bit 26_29
+bit 26_38
+bit 26_40
 bit 26_41
 bit 26_43
+bit 26_44
 bit 26_45
+bit 26_46
 bit 26_47
+bit 26_48
 bit 26_49
+bit 26_50
 bit 26_51
+bit 26_54
 bit 26_57
-bit 26_58
 bit 26_59
 bit 26_60
 bit 26_61
 bit 26_62
 bit 26_64
-bit 26_65
 bit 26_66
+bit 26_67
 bit 26_68
-bit 26_69
+bit 26_70
+bit 26_71
 bit 26_72
-bit 26_75
-bit 26_82
+bit 26_73
+bit 26_76
+bit 26_77
+bit 26_78
+bit 26_79
+bit 26_81
+bit 26_83
+bit 26_84
+bit 26_85
 bit 26_86
+bit 26_87
 bit 26_88
-bit 26_89
 bit 26_90
+bit 26_91
 bit 26_92
 bit 26_94
+bit 26_95
 bit 26_96
 bit 26_97
-bit 26_98
-bit 26_101
+bit 26_99
+bit 26_103
 bit 26_104
-bit 26_105
 bit 26_106
-bit 26_107
 bit 26_108
 bit 26_110
+bit 26_111
 bit 26_112
-bit 26_118
+bit 26_113
+bit 26_114
+bit 26_125
 bit 26_127
 bit 26_129
 bit 26_130
+bit 26_131
 bit 26_132
-bit 26_133
 bit 26_134
-bit 26_135
 bit 26_136
+bit 26_137
 bit 26_138
 bit 26_139
+bit 26_140
+bit 26_143
 bit 26_144
-bit 26_145
 bit 26_146
+bit 26_147
 bit 26_148
 bit 26_149
+bit 26_150
 bit 26_151
 bit 26_153
 bit 26_154
 bit 26_155
 bit 26_161
+bit 26_162
 bit 26_163
 bit 26_164
 bit 26_165
 bit 26_167
 bit 26_169
 bit 26_170
+bit 26_171
 bit 26_172
 bit 26_177
 bit 26_178
+bit 26_179
 bit 26_180
+bit 26_181
 bit 26_182
+bit 26_185
 bit 26_186
 bit 26_188
 bit 26_189
+bit 26_198
+bit 26_200
 bit 26_201
 bit 26_203
+bit 26_204
 bit 26_205
+bit 26_206
 bit 26_207
+bit 26_208
 bit 26_209
+bit 26_210
 bit 26_211
+bit 26_214
 bit 26_217
-bit 26_218
 bit 26_219
 bit 26_220
 bit 26_221
 bit 26_222
 bit 26_224
-bit 26_225
 bit 26_226
+bit 26_227
 bit 26_228
-bit 26_229
+bit 26_230
+bit 26_231
 bit 26_232
-bit 26_235
-bit 26_242
+bit 26_233
+bit 26_236
+bit 26_237
+bit 26_238
+bit 26_239
+bit 26_241
+bit 26_243
+bit 26_244
+bit 26_245
 bit 26_246
+bit 26_247
 bit 26_248
-bit 26_249
 bit 26_250
+bit 26_251
 bit 26_252
 bit 26_254
+bit 26_255
 bit 26_256
 bit 26_257
-bit 26_258
-bit 26_261
+bit 26_259
+bit 26_263
 bit 26_264
-bit 26_265
 bit 26_266
-bit 26_267
 bit 26_268
 bit 26_270
+bit 26_271
 bit 26_272
-bit 26_278
+bit 26_273
+bit 26_274
+bit 26_285
 bit 26_287
 bit 26_289
 bit 26_290
+bit 26_291
 bit 26_292
-bit 26_293
 bit 26_294
-bit 26_295
 bit 26_296
+bit 26_297
 bit 26_298
 bit 26_299
+bit 26_300
+bit 26_303
 bit 26_304
-bit 26_305
 bit 26_306
+bit 26_307
 bit 26_308
 bit 26_309
+bit 26_310
 bit 26_311
 bit 26_313
 bit 26_314
@@ -261,154 +237,174 @@
 bit 27_01
 bit 27_06
 bit 27_08
+bit 27_09
+bit 27_10
 bit 27_11
-bit 27_12
 bit 27_13
 bit 27_17
 bit 27_19
+bit 27_20
 bit 27_21
+bit 27_22
 bit 27_23
 bit 27_24
 bit 27_26
+bit 27_29
 bit 27_38
 bit 27_40
+bit 27_41
 bit 27_42
 bit 27_44
 bit 27_46
+bit 27_47
 bit 27_48
 bit 27_49
 bit 27_50
-bit 27_51
+bit 27_52
 bit 27_53
 bit 27_54
 bit 27_56
 bit 27_57
+bit 27_58
 bit 27_60
 bit 27_61
 bit 27_62
 bit 27_63
+bit 27_64
 bit 27_65
 bit 27_66
 bit 27_67
-bit 27_68
 bit 27_69
-bit 27_71
-bit 27_78
-bit 27_79
-bit 27_80
+bit 27_70
+bit 27_74
+bit 27_75
+bit 27_77
+bit 27_81
+bit 27_82
+bit 27_84
+bit 27_85
 bit 27_86
 bit 27_88
+bit 27_89
 bit 27_90
-bit 27_91
 bit 27_92
 bit 27_93
 bit 27_94
 bit 27_95
-bit 27_96
+bit 27_97
 bit 27_101
 bit 27_102
 bit 27_104
+bit 27_105
 bit 27_106
-bit 27_107
 bit 27_108
 bit 27_110
 bit 27_111
 bit 27_112
-bit 27_113
+bit 27_116
 bit 27_118
 bit 27_119
-bit 27_122
-bit 27_125
+bit 27_120
+bit 27_126
 bit 27_127
-bit 27_128
+bit 27_130
 bit 27_131
 bit 27_133
-bit 27_134
 bit 27_135
+bit 27_136
 bit 27_137
-bit 27_140
+bit 27_143
 bit 27_144
+bit 27_145
 bit 27_146
-bit 27_147
 bit 27_150
-bit 27_151
 bit 27_152
-bit 27_154
-bit 27_158
+bit 27_153
+bit 27_155
 bit 27_161
 bit 27_166
 bit 27_168
+bit 27_169
+bit 27_170
 bit 27_171
-bit 27_172
 bit 27_173
 bit 27_177
 bit 27_179
+bit 27_180
 bit 27_181
+bit 27_182
 bit 27_183
 bit 27_184
 bit 27_186
+bit 27_189
 bit 27_198
 bit 27_200
+bit 27_201
 bit 27_202
 bit 27_204
 bit 27_206
+bit 27_207
 bit 27_208
 bit 27_209
 bit 27_210
-bit 27_211
+bit 27_212
 bit 27_213
 bit 27_214
 bit 27_216
 bit 27_217
+bit 27_218
 bit 27_220
 bit 27_221
 bit 27_222
 bit 27_223
+bit 27_224
 bit 27_225
 bit 27_226
 bit 27_227
-bit 27_228
 bit 27_229
-bit 27_231
-bit 27_238
-bit 27_239
-bit 27_240
+bit 27_230
+bit 27_234
+bit 27_235
+bit 27_237
+bit 27_241
+bit 27_242
+bit 27_244
+bit 27_245
 bit 27_246
 bit 27_248
+bit 27_249
 bit 27_250
-bit 27_251
 bit 27_252
 bit 27_253
 bit 27_254
 bit 27_255
-bit 27_256
+bit 27_257
 bit 27_261
 bit 27_262
 bit 27_264
+bit 27_265
 bit 27_266
-bit 27_267
 bit 27_268
 bit 27_270
 bit 27_271
 bit 27_272
-bit 27_273
+bit 27_276
 bit 27_278
 bit 27_279
-bit 27_282
-bit 27_285
+bit 27_280
+bit 27_286
 bit 27_287
-bit 27_288
+bit 27_290
 bit 27_291
 bit 27_293
-bit 27_294
 bit 27_295
+bit 27_296
 bit 27_297
-bit 27_300
+bit 27_303
 bit 27_304
+bit 27_305
 bit 27_306
-bit 27_307
 bit 27_310
-bit 27_311
 bit 27_312
-bit 27_314
-bit 27_318
+bit 27_313
+bit 27_315
diff --git a/kintex7/mask_dsp_r.db b/kintex7/mask_dsp_r.db
index ea47238..f504eb1 100644
--- a/kintex7/mask_dsp_r.db
+++ b/kintex7/mask_dsp_r.db
@@ -1,259 +1,233 @@
-bit 00_11
-bit 00_35
-bit 00_39
 bit 00_42
-bit 00_75
 bit 00_89
 bit 00_90
-bit 00_99
-bit 00_103
 bit 00_106
-bit 00_139
-bit 00_163
-bit 00_167
 bit 00_170
-bit 00_203
 bit 00_209
 bit 00_217
 bit 00_218
-bit 00_227
-bit 00_231
 bit 00_234
 bit 00_273
-bit 00_293
-bit 00_295
 bit 00_298
-bit 01_14
 bit 01_32
-bit 01_36
 bit 01_37
 bit 01_38
-bit 01_41
-bit 01_78
 bit 01_85
 bit 01_88
 bit 01_96
-bit 01_100
 bit 01_101
 bit 01_102
-bit 01_105
-bit 01_142
 bit 01_160
-bit 01_164
 bit 01_165
 bit 01_166
-bit 01_169
 bit 01_205
-bit 01_206
 bit 01_213
 bit 01_216
 bit 01_224
-bit 01_228
 bit 01_229
 bit 01_230
-bit 01_233
 bit 01_269
 bit 01_288
 bit 01_293
 bit 01_294
-bit 01_296
-bit 01_297
-bit 20_65
-bit 20_73
-bit 20_81
-bit 20_89
-bit 20_129
-bit 20_137
-bit 20_195
-bit 20_203
-bit 20_213
-bit 20_219
 bit 20_293
-bit 20_307
-bit 20_315
-bit 21_70
-bit 21_78
-bit 21_86
-bit 21_94
-bit 21_134
-bit 21_142
-bit 21_194
-bit 21_202
-bit 21_212
-bit 21_218
 bit 21_242
 bit 21_244
 bit 21_292
-bit 21_306
-bit 21_314
-bit 24_65
-bit 24_73
-bit 24_81
-bit 24_89
-bit 24_129
-bit 24_137
-bit 24_195
-bit 24_203
-bit 24_213
-bit 24_219
 bit 24_293
-bit 24_307
-bit 24_315
-bit 25_70
-bit 25_78
-bit 25_86
-bit 25_94
-bit 25_134
-bit 25_142
-bit 25_194
-bit 25_202
-bit 25_212
-bit 25_218
 bit 25_242
 bit 25_244
 bit 25_292
-bit 25_306
-bit 25_314
 bit 26_01
+bit 26_02
 bit 26_03
 bit 26_04
 bit 26_05
 bit 26_07
 bit 26_09
 bit 26_10
+bit 26_11
 bit 26_12
 bit 26_17
 bit 26_18
+bit 26_19
 bit 26_20
+bit 26_21
 bit 26_22
+bit 26_25
 bit 26_26
 bit 26_28
 bit 26_29
+bit 26_38
+bit 26_40
 bit 26_41
 bit 26_43
+bit 26_44
 bit 26_45
+bit 26_46
 bit 26_47
+bit 26_48
 bit 26_49
+bit 26_50
 bit 26_51
+bit 26_54
 bit 26_57
-bit 26_58
 bit 26_59
 bit 26_60
 bit 26_61
 bit 26_62
 bit 26_64
-bit 26_65
 bit 26_66
+bit 26_67
 bit 26_68
-bit 26_69
+bit 26_70
+bit 26_71
 bit 26_72
-bit 26_75
-bit 26_82
+bit 26_73
+bit 26_76
+bit 26_77
+bit 26_78
+bit 26_79
+bit 26_81
+bit 26_83
+bit 26_84
+bit 26_85
 bit 26_86
+bit 26_87
 bit 26_88
-bit 26_89
 bit 26_90
+bit 26_91
 bit 26_92
 bit 26_94
+bit 26_95
 bit 26_96
 bit 26_97
-bit 26_98
-bit 26_101
+bit 26_99
+bit 26_103
 bit 26_104
-bit 26_105
 bit 26_106
-bit 26_107
 bit 26_108
 bit 26_110
+bit 26_111
 bit 26_112
-bit 26_118
+bit 26_113
+bit 26_114
+bit 26_125
 bit 26_127
 bit 26_129
 bit 26_130
+bit 26_131
 bit 26_132
-bit 26_133
 bit 26_134
-bit 26_135
 bit 26_136
+bit 26_137
 bit 26_138
 bit 26_139
+bit 26_140
+bit 26_143
 bit 26_144
-bit 26_145
 bit 26_146
+bit 26_147
 bit 26_148
 bit 26_149
+bit 26_150
 bit 26_151
 bit 26_153
 bit 26_154
 bit 26_155
 bit 26_161
+bit 26_162
 bit 26_163
 bit 26_164
 bit 26_165
 bit 26_167
 bit 26_169
 bit 26_170
+bit 26_171
 bit 26_172
 bit 26_177
 bit 26_178
+bit 26_179
 bit 26_180
+bit 26_181
 bit 26_182
+bit 26_185
 bit 26_186
 bit 26_188
 bit 26_189
+bit 26_198
+bit 26_200
 bit 26_201
 bit 26_203
+bit 26_204
 bit 26_205
+bit 26_206
 bit 26_207
+bit 26_208
 bit 26_209
+bit 26_210
 bit 26_211
+bit 26_214
 bit 26_217
-bit 26_218
 bit 26_219
 bit 26_220
 bit 26_221
 bit 26_222
 bit 26_224
-bit 26_225
 bit 26_226
+bit 26_227
 bit 26_228
-bit 26_229
+bit 26_230
+bit 26_231
 bit 26_232
-bit 26_235
-bit 26_242
+bit 26_233
+bit 26_236
+bit 26_237
+bit 26_238
+bit 26_239
+bit 26_241
+bit 26_243
+bit 26_244
+bit 26_245
 bit 26_246
+bit 26_247
 bit 26_248
-bit 26_249
 bit 26_250
+bit 26_251
 bit 26_252
 bit 26_254
+bit 26_255
 bit 26_256
 bit 26_257
-bit 26_258
-bit 26_261
+bit 26_259
+bit 26_263
 bit 26_264
-bit 26_265
 bit 26_266
-bit 26_267
 bit 26_268
 bit 26_270
+bit 26_271
 bit 26_272
-bit 26_278
+bit 26_273
+bit 26_274
+bit 26_285
 bit 26_287
 bit 26_289
 bit 26_290
+bit 26_291
 bit 26_292
-bit 26_293
 bit 26_294
-bit 26_295
 bit 26_296
+bit 26_297
 bit 26_298
 bit 26_299
+bit 26_300
+bit 26_303
 bit 26_304
-bit 26_305
 bit 26_306
+bit 26_307
 bit 26_308
 bit 26_309
+bit 26_310
 bit 26_311
 bit 26_313
 bit 26_314
@@ -261,154 +235,174 @@
 bit 27_01
 bit 27_06
 bit 27_08
+bit 27_09
+bit 27_10
 bit 27_11
-bit 27_12
 bit 27_13
 bit 27_17
 bit 27_19
+bit 27_20
 bit 27_21
+bit 27_22
 bit 27_23
 bit 27_24
 bit 27_26
+bit 27_29
 bit 27_38
 bit 27_40
+bit 27_41
 bit 27_42
 bit 27_44
 bit 27_46
+bit 27_47
 bit 27_48
 bit 27_49
 bit 27_50
-bit 27_51
+bit 27_52
 bit 27_53
 bit 27_54
 bit 27_56
 bit 27_57
+bit 27_58
 bit 27_60
 bit 27_61
 bit 27_62
 bit 27_63
+bit 27_64
 bit 27_65
 bit 27_66
 bit 27_67
-bit 27_68
 bit 27_69
-bit 27_71
-bit 27_78
-bit 27_79
-bit 27_80
+bit 27_70
+bit 27_74
+bit 27_75
+bit 27_77
+bit 27_81
+bit 27_82
+bit 27_84
+bit 27_85
 bit 27_86
 bit 27_88
+bit 27_89
 bit 27_90
-bit 27_91
 bit 27_92
 bit 27_93
 bit 27_94
 bit 27_95
-bit 27_96
+bit 27_97
 bit 27_101
 bit 27_102
 bit 27_104
+bit 27_105
 bit 27_106
-bit 27_107
 bit 27_108
 bit 27_110
 bit 27_111
 bit 27_112
-bit 27_113
+bit 27_116
 bit 27_118
 bit 27_119
-bit 27_122
-bit 27_125
+bit 27_120
+bit 27_126
 bit 27_127
-bit 27_128
+bit 27_130
 bit 27_131
 bit 27_133
-bit 27_134
 bit 27_135
+bit 27_136
 bit 27_137
-bit 27_140
+bit 27_143
 bit 27_144
+bit 27_145
 bit 27_146
-bit 27_147
 bit 27_150
-bit 27_151
 bit 27_152
-bit 27_154
-bit 27_158
+bit 27_153
+bit 27_155
 bit 27_161
 bit 27_166
 bit 27_168
+bit 27_169
+bit 27_170
 bit 27_171
-bit 27_172
 bit 27_173
 bit 27_177
 bit 27_179
+bit 27_180
 bit 27_181
+bit 27_182
 bit 27_183
 bit 27_184
 bit 27_186
+bit 27_189
 bit 27_198
 bit 27_200
+bit 27_201
 bit 27_202
 bit 27_204
 bit 27_206
+bit 27_207
 bit 27_208
 bit 27_209
 bit 27_210
-bit 27_211
+bit 27_212
 bit 27_213
 bit 27_214
 bit 27_216
 bit 27_217
+bit 27_218
 bit 27_220
 bit 27_221
 bit 27_222
 bit 27_223
+bit 27_224
 bit 27_225
 bit 27_226
 bit 27_227
-bit 27_228
 bit 27_229
-bit 27_231
-bit 27_238
-bit 27_239
-bit 27_240
+bit 27_230
+bit 27_234
+bit 27_235
+bit 27_237
+bit 27_241
+bit 27_242
+bit 27_244
+bit 27_245
 bit 27_246
 bit 27_248
+bit 27_249
 bit 27_250
-bit 27_251
 bit 27_252
 bit 27_253
 bit 27_254
 bit 27_255
-bit 27_256
+bit 27_257
 bit 27_261
 bit 27_262
 bit 27_264
+bit 27_265
 bit 27_266
-bit 27_267
 bit 27_268
 bit 27_270
 bit 27_271
 bit 27_272
-bit 27_273
+bit 27_276
 bit 27_278
 bit 27_279
-bit 27_282
-bit 27_285
+bit 27_280
+bit 27_286
 bit 27_287
-bit 27_288
+bit 27_290
 bit 27_291
 bit 27_293
-bit 27_294
 bit 27_295
+bit 27_296
 bit 27_297
-bit 27_300
+bit 27_303
 bit 27_304
+bit 27_305
 bit 27_306
-bit 27_307
 bit 27_310
-bit 27_311
 bit 27_312
-bit 27_314
-bit 27_318
+bit 27_313
+bit 27_315
diff --git a/kintex7/mask_hclk_ioi.db b/kintex7/mask_hclk_ioi.db
index b86f81d..c94181d 100644
--- a/kintex7/mask_hclk_ioi.db
+++ b/kintex7/mask_hclk_ioi.db
@@ -105,23 +105,59 @@
 bit 32_14
 bit 32_15
 bit 32_16
+bit 32_17
 bit 32_19
 bit 32_20
+bit 32_22
 bit 32_23
 bit 32_24
 bit 32_25
 bit 32_26
+bit 32_28
 bit 32_30
+bit 33_14
+bit 33_15
+bit 33_16
+bit 33_17
+bit 33_18
+bit 33_19
+bit 33_20
+bit 33_21
+bit 33_23
+bit 33_24
+bit 33_25
+bit 33_26
+bit 33_27
+bit 33_28
+bit 33_29
+bit 33_30
+bit 33_31
 bit 34_15
 bit 34_16
+bit 34_17
+bit 34_18
+bit 34_19
+bit 34_20
 bit 34_23
 bit 34_24
+bit 34_25
+bit 34_26
+bit 34_29
+bit 34_30
 bit 34_31
+bit 35_15
+bit 35_16
+bit 35_17
+bit 35_18
 bit 35_19
 bit 35_21
 bit 35_23
 bit 35_24
 bit 35_25
+bit 35_26
+bit 35_27
+bit 35_28
+bit 35_29
 bit 36_14
 bit 36_16
 bit 36_17
diff --git a/kintex7/ppips_hclk_ioi3.db b/kintex7/ppips_hclk_ioi3.db
index 71375b7..b376a67 100644
--- a/kintex7/ppips_hclk_ioi3.db
+++ b/kintex7/ppips_hclk_ioi3.db
@@ -2,18 +2,6 @@
 HCLK_IOI3.HCLK_IOI_CK_BUFRCLK1.HCLK_IOI_RCLK2RCLK1 always
 HCLK_IOI3.HCLK_IOI_CK_BUFRCLK2.HCLK_IOI_RCLK2RCLK2 always
 HCLK_IOI3.HCLK_IOI_CK_BUFRCLK3.HCLK_IOI_RCLK2RCLK3 always
-HCLK_IOI3.HCLK_IOI_CK_IGCLK0.HCLK_IOI_CK_BUFHCLK0 always
-HCLK_IOI3.HCLK_IOI_CK_IGCLK1.HCLK_IOI_CK_BUFHCLK1 always
-HCLK_IOI3.HCLK_IOI_CK_IGCLK2.HCLK_IOI_CK_BUFHCLK2 always
-HCLK_IOI3.HCLK_IOI_CK_IGCLK3.HCLK_IOI_CK_BUFHCLK3 always
-HCLK_IOI3.HCLK_IOI_CK_IGCLK4.HCLK_IOI_CK_BUFHCLK4 always
-HCLK_IOI3.HCLK_IOI_CK_IGCLK5.HCLK_IOI_CK_BUFHCLK5 always
-HCLK_IOI3.HCLK_IOI_CK_IGCLK6.HCLK_IOI_CK_BUFHCLK6 always
-HCLK_IOI3.HCLK_IOI_CK_IGCLK7.HCLK_IOI_CK_BUFHCLK7 always
-HCLK_IOI3.HCLK_IOI_CK_IGCLK8.HCLK_IOI_CK_BUFHCLK8 always
-HCLK_IOI3.HCLK_IOI_CK_IGCLK9.HCLK_IOI_CK_BUFHCLK9 always
-HCLK_IOI3.HCLK_IOI_CK_IGCLK10.HCLK_IOI_CK_BUFHCLK10 always
-HCLK_IOI3.HCLK_IOI_CK_IGCLK11.HCLK_IOI_CK_BUFHCLK11 always
 HCLK_IOI3.HCLK_IOI_IO_PLL_CLK0.HCLK_IOI_IO_PLL_CLK0_DMUX always
 HCLK_IOI3.HCLK_IOI_IO_PLL_CLK1.HCLK_IOI_IO_PLL_CLK1_DMUX always
 HCLK_IOI3.HCLK_IOI_IO_PLL_CLK2.HCLK_IOI_IO_PLL_CLK2_DMUX always
diff --git a/kintex7/segbits_dsp_l.db b/kintex7/segbits_dsp_l.db
index 78d5d77..26e1f3b 100644
--- a/kintex7/segbits_dsp_l.db
+++ b/kintex7/segbits_dsp_l.db
@@ -1,3 +1,6 @@
+DSP_L.DSP48.DSP_0.A_INPUT[0] 27_84
+DSP_L.DSP48.DSP_0.AUTORESET_PATDET[0] 26_78
+DSP_L.DSP48.DSP_0.B_INPUT[0] 26_11
 DSP_L.DSP48.DSP_0.MASK[0] 27_01
 DSP_L.DSP48.DSP_0.MASK[1] 26_03
 DSP_L.DSP48.DSP_0.MASK[2] 27_06
@@ -94,6 +97,20 @@
 DSP_L.DSP48.DSP_0.PATTERN[45] 26_151
 DSP_L.DSP48.DSP_0.PATTERN[46] 27_152
 DSP_L.DSP48.DSP_0.PATTERN[47] 26_155
+DSP_L.DSP48.DSP_0.SEL_MASK[1] 27_82
+DSP_L.DSP48.DSP_0.USE_DPORT[0] 26_95
+DSP_L.DSP48.DSP_0.USE_SIMD[1] 26_143 27_52
+DSP_L.DSP48.DSP_0.ZALUMODEREG[0] 26_54
+DSP_L.DSP48.DSP_0.ZCARRYINREG[0] 26_02
+DSP_L.DSP48.DSP_0.ZCARRYINSELREG[0] 27_10
+DSP_L.DSP48.DSP_0.ZCREG[0] 26_76
+DSP_L.DSP48.DSP_0.ZINMODEREG[0] 26_87
+DSP_L.DSP48.DSP_0.ZMREG[0] 26_38
+DSP_L.DSP48.DSP_0.ZOPMODEREG[0] 26_25
+DSP_L.DSP48.DSP_0.ZPREG[0] 27_75
+DSP_L.DSP48.DSP_1.A_INPUT[0] 27_244
+DSP_L.DSP48.DSP_1.AUTORESET_PATDET[0] 26_238
+DSP_L.DSP48.DSP_1.B_INPUT[0] 26_171
 DSP_L.DSP48.DSP_1.MASK[0] 27_161
 DSP_L.DSP48.DSP_1.MASK[1] 26_163
 DSP_L.DSP48.DSP_1.MASK[2] 27_166
@@ -190,3 +207,14 @@
 DSP_L.DSP48.DSP_1.PATTERN[45] 26_311
 DSP_L.DSP48.DSP_1.PATTERN[46] 27_312
 DSP_L.DSP48.DSP_1.PATTERN[47] 26_315
+DSP_L.DSP48.DSP_1.SEL_MASK[1] 27_242
+DSP_L.DSP48.DSP_1.USE_DPORT[0] 26_255
+DSP_L.DSP48.DSP_1.USE_SIMD[1] 26_303 27_212
+DSP_L.DSP48.DSP_1.ZALUMODEREG[0] 26_214
+DSP_L.DSP48.DSP_1.ZCARRYINREG[0] 26_162
+DSP_L.DSP48.DSP_1.ZCARRYINSELREG[0] 27_170
+DSP_L.DSP48.DSP_1.ZCREG[0] 26_236
+DSP_L.DSP48.DSP_1.ZINMODEREG[0] 26_247
+DSP_L.DSP48.DSP_1.ZMREG[0] 26_198
+DSP_L.DSP48.DSP_1.ZOPMODEREG[0] 26_185
+DSP_L.DSP48.DSP_1.ZPREG[0] 27_235
diff --git a/kintex7/segbits_dsp_l.origin_info.db b/kintex7/segbits_dsp_l.origin_info.db
index b96d449..6648abf 100644
--- a/kintex7/segbits_dsp_l.origin_info.db
+++ b/kintex7/segbits_dsp_l.origin_info.db
@@ -1,3 +1,6 @@
+DSP_L.DSP48.DSP_0.AUTORESET_PATDET[0] origin:100-dsp-mskpat 26_78
+DSP_L.DSP48.DSP_0.A_INPUT[0] origin:100-dsp-mskpat 27_84
+DSP_L.DSP48.DSP_0.B_INPUT[0] origin:100-dsp-mskpat 26_11
 DSP_L.DSP48.DSP_0.MASK[0] origin:100-dsp-mskpat 27_01
 DSP_L.DSP48.DSP_0.MASK[10] origin:100-dsp-mskpat 27_26
 DSP_L.DSP48.DSP_0.MASK[11] origin:100-dsp-mskpat 26_28
@@ -94,6 +97,20 @@
 DSP_L.DSP48.DSP_0.PATTERN[7] origin:100-dsp-mskpat 26_20
 DSP_L.DSP48.DSP_0.PATTERN[8] origin:100-dsp-mskpat 27_21
 DSP_L.DSP48.DSP_0.PATTERN[9] origin:100-dsp-mskpat 27_24
+DSP_L.DSP48.DSP_0.SEL_MASK[1] origin:100-dsp-mskpat 27_82
+DSP_L.DSP48.DSP_0.USE_DPORT[0] origin:100-dsp-mskpat 26_95
+DSP_L.DSP48.DSP_0.USE_SIMD[1] origin:100-dsp-mskpat 26_143 27_52
+DSP_L.DSP48.DSP_0.ZALUMODEREG[0] origin:100-dsp-mskpat 26_54
+DSP_L.DSP48.DSP_0.ZCARRYINREG[0] origin:100-dsp-mskpat 26_02
+DSP_L.DSP48.DSP_0.ZCARRYINSELREG[0] origin:100-dsp-mskpat 27_10
+DSP_L.DSP48.DSP_0.ZCREG[0] origin:100-dsp-mskpat 26_76
+DSP_L.DSP48.DSP_0.ZINMODEREG[0] origin:100-dsp-mskpat 26_87
+DSP_L.DSP48.DSP_0.ZMREG[0] origin:100-dsp-mskpat 26_38
+DSP_L.DSP48.DSP_0.ZOPMODEREG[0] origin:100-dsp-mskpat 26_25
+DSP_L.DSP48.DSP_0.ZPREG[0] origin:100-dsp-mskpat 27_75
+DSP_L.DSP48.DSP_1.AUTORESET_PATDET[0] origin:100-dsp-mskpat 26_238
+DSP_L.DSP48.DSP_1.A_INPUT[0] origin:100-dsp-mskpat 27_244
+DSP_L.DSP48.DSP_1.B_INPUT[0] origin:100-dsp-mskpat 26_171
 DSP_L.DSP48.DSP_1.MASK[0] origin:100-dsp-mskpat 27_161
 DSP_L.DSP48.DSP_1.MASK[10] origin:100-dsp-mskpat 27_186
 DSP_L.DSP48.DSP_1.MASK[11] origin:100-dsp-mskpat 26_188
@@ -190,3 +207,14 @@
 DSP_L.DSP48.DSP_1.PATTERN[7] origin:100-dsp-mskpat 26_180
 DSP_L.DSP48.DSP_1.PATTERN[8] origin:100-dsp-mskpat 27_181
 DSP_L.DSP48.DSP_1.PATTERN[9] origin:100-dsp-mskpat 27_184
+DSP_L.DSP48.DSP_1.SEL_MASK[1] origin:100-dsp-mskpat 27_242
+DSP_L.DSP48.DSP_1.USE_DPORT[0] origin:100-dsp-mskpat 26_255
+DSP_L.DSP48.DSP_1.USE_SIMD[1] origin:100-dsp-mskpat 26_303 27_212
+DSP_L.DSP48.DSP_1.ZALUMODEREG[0] origin:100-dsp-mskpat 26_214
+DSP_L.DSP48.DSP_1.ZCARRYINREG[0] origin:100-dsp-mskpat 26_162
+DSP_L.DSP48.DSP_1.ZCARRYINSELREG[0] origin:100-dsp-mskpat 27_170
+DSP_L.DSP48.DSP_1.ZCREG[0] origin:100-dsp-mskpat 26_236
+DSP_L.DSP48.DSP_1.ZINMODEREG[0] origin:100-dsp-mskpat 26_247
+DSP_L.DSP48.DSP_1.ZMREG[0] origin:100-dsp-mskpat 26_198
+DSP_L.DSP48.DSP_1.ZOPMODEREG[0] origin:100-dsp-mskpat 26_185
+DSP_L.DSP48.DSP_1.ZPREG[0] origin:100-dsp-mskpat 27_235
diff --git a/kintex7/segbits_dsp_r.db b/kintex7/segbits_dsp_r.db
index 050f6fa..db04273 100644
--- a/kintex7/segbits_dsp_r.db
+++ b/kintex7/segbits_dsp_r.db
@@ -1,3 +1,6 @@
+DSP_R.DSP48.DSP_0.A_INPUT[0] 27_84
+DSP_R.DSP48.DSP_0.AUTORESET_PATDET[0] 26_78
+DSP_R.DSP48.DSP_0.B_INPUT[0] 26_11
 DSP_R.DSP48.DSP_0.MASK[0] 27_01
 DSP_R.DSP48.DSP_0.MASK[1] 26_03
 DSP_R.DSP48.DSP_0.MASK[2] 27_06
@@ -94,6 +97,20 @@
 DSP_R.DSP48.DSP_0.PATTERN[45] 26_151
 DSP_R.DSP48.DSP_0.PATTERN[46] 27_152
 DSP_R.DSP48.DSP_0.PATTERN[47] 26_155
+DSP_R.DSP48.DSP_0.SEL_MASK[1] 27_82
+DSP_R.DSP48.DSP_0.USE_DPORT[0] 26_95
+DSP_R.DSP48.DSP_0.USE_SIMD[1] 26_143 27_52
+DSP_R.DSP48.DSP_0.ZALUMODEREG[0] 26_54
+DSP_R.DSP48.DSP_0.ZCARRYINREG[0] 26_02
+DSP_R.DSP48.DSP_0.ZCARRYINSELREG[0] 27_10
+DSP_R.DSP48.DSP_0.ZCREG[0] 26_76
+DSP_R.DSP48.DSP_0.ZINMODEREG[0] 26_87
+DSP_R.DSP48.DSP_0.ZMREG[0] 26_38
+DSP_R.DSP48.DSP_0.ZOPMODEREG[0] 26_25
+DSP_R.DSP48.DSP_0.ZPREG[0] 27_75
+DSP_R.DSP48.DSP_1.A_INPUT[0] 27_244
+DSP_R.DSP48.DSP_1.AUTORESET_PATDET[0] 26_238
+DSP_R.DSP48.DSP_1.B_INPUT[0] 26_171
 DSP_R.DSP48.DSP_1.MASK[0] 27_161
 DSP_R.DSP48.DSP_1.MASK[1] 26_163
 DSP_R.DSP48.DSP_1.MASK[2] 27_166
@@ -190,3 +207,14 @@
 DSP_R.DSP48.DSP_1.PATTERN[45] 26_311
 DSP_R.DSP48.DSP_1.PATTERN[46] 27_312
 DSP_R.DSP48.DSP_1.PATTERN[47] 26_315
+DSP_R.DSP48.DSP_1.SEL_MASK[1] 27_242
+DSP_R.DSP48.DSP_1.USE_DPORT[0] 26_255
+DSP_R.DSP48.DSP_1.USE_SIMD[1] 26_303 27_212
+DSP_R.DSP48.DSP_1.ZALUMODEREG[0] 26_214
+DSP_R.DSP48.DSP_1.ZCARRYINREG[0] 26_162
+DSP_R.DSP48.DSP_1.ZCARRYINSELREG[0] 27_170
+DSP_R.DSP48.DSP_1.ZCREG[0] 26_236
+DSP_R.DSP48.DSP_1.ZINMODEREG[0] 26_247
+DSP_R.DSP48.DSP_1.ZMREG[0] 26_198
+DSP_R.DSP48.DSP_1.ZOPMODEREG[0] 26_185
+DSP_R.DSP48.DSP_1.ZPREG[0] 27_235
diff --git a/kintex7/segbits_dsp_r.origin_info.db b/kintex7/segbits_dsp_r.origin_info.db
index b2686fc..03bbb6e 100644
--- a/kintex7/segbits_dsp_r.origin_info.db
+++ b/kintex7/segbits_dsp_r.origin_info.db
@@ -1,3 +1,6 @@
+DSP_R.DSP48.DSP_0.AUTORESET_PATDET[0] origin:100-dsp-mskpat 26_78
+DSP_R.DSP48.DSP_0.A_INPUT[0] origin:100-dsp-mskpat 27_84
+DSP_R.DSP48.DSP_0.B_INPUT[0] origin:100-dsp-mskpat 26_11
 DSP_R.DSP48.DSP_0.MASK[0] origin:100-dsp-mskpat 27_01
 DSP_R.DSP48.DSP_0.MASK[10] origin:100-dsp-mskpat 27_26
 DSP_R.DSP48.DSP_0.MASK[11] origin:100-dsp-mskpat 26_28
@@ -94,6 +97,20 @@
 DSP_R.DSP48.DSP_0.PATTERN[7] origin:100-dsp-mskpat 26_20
 DSP_R.DSP48.DSP_0.PATTERN[8] origin:100-dsp-mskpat 27_21
 DSP_R.DSP48.DSP_0.PATTERN[9] origin:100-dsp-mskpat 27_24
+DSP_R.DSP48.DSP_0.SEL_MASK[1] origin:100-dsp-mskpat 27_82
+DSP_R.DSP48.DSP_0.USE_DPORT[0] origin:100-dsp-mskpat 26_95
+DSP_R.DSP48.DSP_0.USE_SIMD[1] origin:100-dsp-mskpat 26_143 27_52
+DSP_R.DSP48.DSP_0.ZALUMODEREG[0] origin:100-dsp-mskpat 26_54
+DSP_R.DSP48.DSP_0.ZCARRYINREG[0] origin:100-dsp-mskpat 26_02
+DSP_R.DSP48.DSP_0.ZCARRYINSELREG[0] origin:100-dsp-mskpat 27_10
+DSP_R.DSP48.DSP_0.ZCREG[0] origin:100-dsp-mskpat 26_76
+DSP_R.DSP48.DSP_0.ZINMODEREG[0] origin:100-dsp-mskpat 26_87
+DSP_R.DSP48.DSP_0.ZMREG[0] origin:100-dsp-mskpat 26_38
+DSP_R.DSP48.DSP_0.ZOPMODEREG[0] origin:100-dsp-mskpat 26_25
+DSP_R.DSP48.DSP_0.ZPREG[0] origin:100-dsp-mskpat 27_75
+DSP_R.DSP48.DSP_1.AUTORESET_PATDET[0] origin:100-dsp-mskpat 26_238
+DSP_R.DSP48.DSP_1.A_INPUT[0] origin:100-dsp-mskpat 27_244
+DSP_R.DSP48.DSP_1.B_INPUT[0] origin:100-dsp-mskpat 26_171
 DSP_R.DSP48.DSP_1.MASK[0] origin:100-dsp-mskpat 27_161
 DSP_R.DSP48.DSP_1.MASK[10] origin:100-dsp-mskpat 27_186
 DSP_R.DSP48.DSP_1.MASK[11] origin:100-dsp-mskpat 26_188
@@ -190,3 +207,14 @@
 DSP_R.DSP48.DSP_1.PATTERN[7] origin:100-dsp-mskpat 26_180
 DSP_R.DSP48.DSP_1.PATTERN[8] origin:100-dsp-mskpat 27_181
 DSP_R.DSP48.DSP_1.PATTERN[9] origin:100-dsp-mskpat 27_184
+DSP_R.DSP48.DSP_1.SEL_MASK[1] origin:100-dsp-mskpat 27_242
+DSP_R.DSP48.DSP_1.USE_DPORT[0] origin:100-dsp-mskpat 26_255
+DSP_R.DSP48.DSP_1.USE_SIMD[1] origin:100-dsp-mskpat 26_303 27_212
+DSP_R.DSP48.DSP_1.ZALUMODEREG[0] origin:100-dsp-mskpat 26_214
+DSP_R.DSP48.DSP_1.ZCARRYINREG[0] origin:100-dsp-mskpat 26_162
+DSP_R.DSP48.DSP_1.ZCARRYINSELREG[0] origin:100-dsp-mskpat 27_170
+DSP_R.DSP48.DSP_1.ZCREG[0] origin:100-dsp-mskpat 26_236
+DSP_R.DSP48.DSP_1.ZINMODEREG[0] origin:100-dsp-mskpat 26_247
+DSP_R.DSP48.DSP_1.ZMREG[0] origin:100-dsp-mskpat 26_198
+DSP_R.DSP48.DSP_1.ZOPMODEREG[0] origin:100-dsp-mskpat 26_185
+DSP_R.DSP48.DSP_1.ZPREG[0] origin:100-dsp-mskpat 27_235
diff --git a/kintex7/segbits_hclk_ioi3.db b/kintex7/segbits_hclk_ioi3.db
index 7820e98..443583e 100644
--- a/kintex7/segbits_hclk_ioi3.db
+++ b/kintex7/segbits_hclk_ioi3.db
@@ -210,18 +210,34 @@
 HCLK_IOI3.HCLK_IOI_LEAF_GCLK_TOP5.HCLK_IOI_CK_IGCLK9 30_19 31_15
 HCLK_IOI3.HCLK_IOI_LEAF_GCLK_TOP5.HCLK_IOI_CK_IGCLK10 30_14 30_19
 HCLK_IOI3.HCLK_IOI_LEAF_GCLK_TOP5.HCLK_IOI_CK_IGCLK11 30_16 30_19
+HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV0.HCLK_IOI_RCLK_IMUX0 32_30 35_26
+HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV0.HCLK_IOI_RCLK_IMUX1 32_30 35_27
+HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV0.HCLK_IOI_RCLK_IMUX2 32_30 35_28
+HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV0.HCLK_IOI_RCLK_IMUX3 32_30 35_29
 HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV0.HCLK_IOI_RCLK0 32_30 35_23
 HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV0.HCLK_IOI_RCLK1 32_30 35_24
 HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV0.HCLK_IOI_RCLK2 32_30 34_31
 HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV0.HCLK_IOI_RCLK3 32_30 35_25
+HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV1.HCLK_IOI_RCLK_IMUX0 32_26 34_25
+HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV1.HCLK_IOI_RCLK_IMUX1 32_26 34_26
+HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV1.HCLK_IOI_RCLK_IMUX2 32_26 34_30
+HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV1.HCLK_IOI_RCLK_IMUX3 32_26 34_29
 HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV1.HCLK_IOI_RCLK0 32_26 36_26
 HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV1.HCLK_IOI_RCLK1 32_26 36_27
 HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV1.HCLK_IOI_RCLK2 32_26 34_23
 HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV1.HCLK_IOI_RCLK3 32_26 34_24
+HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV2.HCLK_IOI_RCLK_IMUX0 32_20 34_17
+HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV2.HCLK_IOI_RCLK_IMUX1 32_20 34_18
+HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV2.HCLK_IOI_RCLK_IMUX2 32_20 34_19
+HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV2.HCLK_IOI_RCLK_IMUX3 32_20 34_20
 HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV2.HCLK_IOI_RCLK0 32_20 36_24
 HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV2.HCLK_IOI_RCLK1 32_20 36_25
 HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV2.HCLK_IOI_RCLK2 32_20 34_15
 HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV2.HCLK_IOI_RCLK3 32_20 34_16
+HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV3.HCLK_IOI_RCLK_IMUX0 32_19 35_18
+HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV3.HCLK_IOI_RCLK_IMUX1 32_19 35_17
+HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV3.HCLK_IOI_RCLK_IMUX2 32_19 35_16
+HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV3.HCLK_IOI_RCLK_IMUX3 32_19 35_15
 HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV3.HCLK_IOI_RCLK0 32_16 32_19
 HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV3.HCLK_IOI_RCLK1 32_19 35_21
 HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV3.HCLK_IOI_RCLK2 31_20 32_19
diff --git a/kintex7/segbits_hclk_ioi3.origin_info.db b/kintex7/segbits_hclk_ioi3.origin_info.db
index 1ada548..eeb07e9 100644
--- a/kintex7/segbits_hclk_ioi3.origin_info.db
+++ b/kintex7/segbits_hclk_ioi3.origin_info.db
@@ -50,18 +50,18 @@
 HCLK_IOI3.HCLK_IOI_CK_IGCLK7.HCLK_IOI_CK_BUFHCLK7 origin:047-hclk-ioi-pips 29_31
 HCLK_IOI3.HCLK_IOI_CK_IGCLK8.HCLK_IOI_CK_BUFHCLK8 origin:047-hclk-ioi-pips 28_14
 HCLK_IOI3.HCLK_IOI_CK_IGCLK9.HCLK_IOI_CK_BUFHCLK9 origin:047-hclk-ioi-pips 29_15
-HCLK_IOI3.HCLK_IOI_IDELAYCTRL_REFCLK.HCLK_IOI_LEAF_GCLK_BOT0 origin:047-hclk-ioi-pips 26_20 37_28 37_29
-HCLK_IOI3.HCLK_IOI_IDELAYCTRL_REFCLK.HCLK_IOI_LEAF_GCLK_BOT1 origin:047-hclk-ioi-pips 26_21 37_28 37_29
-HCLK_IOI3.HCLK_IOI_IDELAYCTRL_REFCLK.HCLK_IOI_LEAF_GCLK_BOT2 origin:047-hclk-ioi-pips 26_22 37_28 37_29
-HCLK_IOI3.HCLK_IOI_IDELAYCTRL_REFCLK.HCLK_IOI_LEAF_GCLK_BOT3 origin:047-hclk-ioi-pips 26_23 37_28 37_29
-HCLK_IOI3.HCLK_IOI_IDELAYCTRL_REFCLK.HCLK_IOI_LEAF_GCLK_BOT4 origin:047-hclk-ioi-pips 26_24 37_28 37_29
-HCLK_IOI3.HCLK_IOI_IDELAYCTRL_REFCLK.HCLK_IOI_LEAF_GCLK_BOT5 origin:047-hclk-ioi-pips 26_25 37_28 37_29
-HCLK_IOI3.HCLK_IOI_IDELAYCTRL_REFCLK.HCLK_IOI_LEAF_GCLK_TOP0 origin:047-hclk-ioi-pips 26_26 37_28 37_29
-HCLK_IOI3.HCLK_IOI_IDELAYCTRL_REFCLK.HCLK_IOI_LEAF_GCLK_TOP1 origin:047-hclk-ioi-pips 26_27 37_28 37_29
-HCLK_IOI3.HCLK_IOI_IDELAYCTRL_REFCLK.HCLK_IOI_LEAF_GCLK_TOP2 origin:047-hclk-ioi-pips 26_28 37_28 37_29
-HCLK_IOI3.HCLK_IOI_IDELAYCTRL_REFCLK.HCLK_IOI_LEAF_GCLK_TOP3 origin:047-hclk-ioi-pips 26_29 37_28 37_29
-HCLK_IOI3.HCLK_IOI_IDELAYCTRL_REFCLK.HCLK_IOI_LEAF_GCLK_TOP4 origin:047-hclk-ioi-pips 26_30 37_28 37_29
-HCLK_IOI3.HCLK_IOI_IDELAYCTRL_REFCLK.HCLK_IOI_LEAF_GCLK_TOP5 origin:047-hclk-ioi-pips 26_31 37_28 37_29
+HCLK_IOI3.HCLK_IOI_IDELAYCTRL_REFCLK.HCLK_IOI_LEAF_GCLK_BOT0 origin:047a-hclk-idelayctrl-pips 26_20 37_28 37_29
+HCLK_IOI3.HCLK_IOI_IDELAYCTRL_REFCLK.HCLK_IOI_LEAF_GCLK_BOT1 origin:047a-hclk-idelayctrl-pips 26_21 37_28 37_29
+HCLK_IOI3.HCLK_IOI_IDELAYCTRL_REFCLK.HCLK_IOI_LEAF_GCLK_BOT2 origin:047a-hclk-idelayctrl-pips 26_22 37_28 37_29
+HCLK_IOI3.HCLK_IOI_IDELAYCTRL_REFCLK.HCLK_IOI_LEAF_GCLK_BOT3 origin:047a-hclk-idelayctrl-pips 26_23 37_28 37_29
+HCLK_IOI3.HCLK_IOI_IDELAYCTRL_REFCLK.HCLK_IOI_LEAF_GCLK_BOT4 origin:047a-hclk-idelayctrl-pips 26_24 37_28 37_29
+HCLK_IOI3.HCLK_IOI_IDELAYCTRL_REFCLK.HCLK_IOI_LEAF_GCLK_BOT5 origin:047a-hclk-idelayctrl-pips 26_25 37_28 37_29
+HCLK_IOI3.HCLK_IOI_IDELAYCTRL_REFCLK.HCLK_IOI_LEAF_GCLK_TOP0 origin:047a-hclk-idelayctrl-pips 26_26 37_28 37_29
+HCLK_IOI3.HCLK_IOI_IDELAYCTRL_REFCLK.HCLK_IOI_LEAF_GCLK_TOP1 origin:047a-hclk-idelayctrl-pips 26_27 37_28 37_29
+HCLK_IOI3.HCLK_IOI_IDELAYCTRL_REFCLK.HCLK_IOI_LEAF_GCLK_TOP2 origin:047a-hclk-idelayctrl-pips 26_28 37_28 37_29
+HCLK_IOI3.HCLK_IOI_IDELAYCTRL_REFCLK.HCLK_IOI_LEAF_GCLK_TOP3 origin:047a-hclk-idelayctrl-pips 26_29 37_28 37_29
+HCLK_IOI3.HCLK_IOI_IDELAYCTRL_REFCLK.HCLK_IOI_LEAF_GCLK_TOP4 origin:047a-hclk-idelayctrl-pips 26_30 37_28 37_29
+HCLK_IOI3.HCLK_IOI_IDELAYCTRL_REFCLK.HCLK_IOI_LEAF_GCLK_TOP5 origin:047a-hclk-idelayctrl-pips 26_31 37_28 37_29
 HCLK_IOI3.HCLK_IOI_IO_PLL_CLK0_DMUX.HCLK_IOI_IOCLK_PLL0 origin:047-hclk-ioi-pips 36_28 36_29
 HCLK_IOI3.HCLK_IOI_IO_PLL_CLK1_DMUX.HCLK_IOI_IOCLK_PLL1 origin:047-hclk-ioi-pips 36_20 37_21
 HCLK_IOI3.HCLK_IOI_IO_PLL_CLK2_DMUX.HCLK_IOI_IOCLK_PLL2 origin:047-hclk-ioi-pips 36_14 36_17
@@ -214,18 +214,34 @@
 HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV0.HCLK_IOI_RCLK1 origin:047-hclk-ioi-pips 32_30 35_24
 HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV0.HCLK_IOI_RCLK2 origin:047-hclk-ioi-pips 32_30 34_31
 HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV0.HCLK_IOI_RCLK3 origin:047-hclk-ioi-pips 32_30 35_25
+HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV0.HCLK_IOI_RCLK_IMUX0 origin:047-hclk-ioi-pips 32_30 35_26
+HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV0.HCLK_IOI_RCLK_IMUX1 origin:047-hclk-ioi-pips 32_30 35_27
+HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV0.HCLK_IOI_RCLK_IMUX2 origin:047-hclk-ioi-pips 32_30 35_28
+HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV0.HCLK_IOI_RCLK_IMUX3 origin:047-hclk-ioi-pips 32_30 35_29
 HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV1.HCLK_IOI_RCLK0 origin:047-hclk-ioi-pips 32_26 36_26
 HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV1.HCLK_IOI_RCLK1 origin:047-hclk-ioi-pips 32_26 36_27
 HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV1.HCLK_IOI_RCLK2 origin:047-hclk-ioi-pips 32_26 34_23
 HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV1.HCLK_IOI_RCLK3 origin:047-hclk-ioi-pips 32_26 34_24
+HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV1.HCLK_IOI_RCLK_IMUX0 origin:047-hclk-ioi-pips 32_26 34_25
+HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV1.HCLK_IOI_RCLK_IMUX1 origin:047-hclk-ioi-pips 32_26 34_26
+HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV1.HCLK_IOI_RCLK_IMUX2 origin:047-hclk-ioi-pips 32_26 34_30
+HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV1.HCLK_IOI_RCLK_IMUX3 origin:047-hclk-ioi-pips 32_26 34_29
 HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV2.HCLK_IOI_RCLK0 origin:047-hclk-ioi-pips 32_20 36_24
 HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV2.HCLK_IOI_RCLK1 origin:047-hclk-ioi-pips 32_20 36_25
 HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV2.HCLK_IOI_RCLK2 origin:047-hclk-ioi-pips 32_20 34_15
 HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV2.HCLK_IOI_RCLK3 origin:047-hclk-ioi-pips 32_20 34_16
+HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV2.HCLK_IOI_RCLK_IMUX0 origin:047-hclk-ioi-pips 32_20 34_17
+HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV2.HCLK_IOI_RCLK_IMUX1 origin:047-hclk-ioi-pips 32_20 34_18
+HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV2.HCLK_IOI_RCLK_IMUX2 origin:047-hclk-ioi-pips 32_20 34_19
+HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV2.HCLK_IOI_RCLK_IMUX3 origin:047-hclk-ioi-pips 32_20 34_20
 HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV3.HCLK_IOI_RCLK0 origin:047-hclk-ioi-pips 32_16 32_19
 HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV3.HCLK_IOI_RCLK1 origin:047-hclk-ioi-pips 32_19 35_21
 HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV3.HCLK_IOI_RCLK2 origin:047-hclk-ioi-pips 31_20 32_19
 HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV3.HCLK_IOI_RCLK3 origin:047-hclk-ioi-pips 32_19 35_19
+HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV3.HCLK_IOI_RCLK_IMUX0 origin:047-hclk-ioi-pips 32_19 35_18
+HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV3.HCLK_IOI_RCLK_IMUX1 origin:047-hclk-ioi-pips 32_19 35_17
+HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV3.HCLK_IOI_RCLK_IMUX2 origin:047-hclk-ioi-pips 32_19 35_16
+HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV3.HCLK_IOI_RCLK_IMUX3 origin:047-hclk-ioi-pips 32_19 35_15
 HCLK_IOI3.STEPDOWN origin:030-iob 38_15 39_14 39_15 39_16
 HCLK_IOI3.VREF.V_600_MV origin:030-iob 38_26 39_30
 HCLK_IOI3.VREF.V_675_MV origin:030-iob 38_26 39_22
diff --git a/kintex7/segbits_int_l.db b/kintex7/segbits_int_l.db
index 43670e7..6147fe8 100644
--- a/kintex7/segbits_int_l.db
+++ b/kintex7/segbits_int_l.db
@@ -1524,7 +1524,7 @@
 INT_L.IMUX_L43.FAN_BOUNCE5 20_30 22_30 !23_30 24_30 25_30
 INT_L.IMUX_L43.LOGIC_OUTS_L1 21_30 22_30 !23_30 24_30 25_30
 INT_L.IMUX_L43.LOGIC_OUTS_L13 21_30 !22_30 23_30 24_30 25_30
-INT_L.IMUX_L43.LOGIC_OUTS_L23 21_30 !22_30 !23_30 24_30 !25_30
+INT_L.IMUX_L43.LOGIC_OUTS_L23 20_00 21_30 !22_30 !23_30 24_30 !25_30
 INT_L.IMUX_L43.EE2END1 19_31 !22_30 !23_30 !24_30 25_30
 INT_L.IMUX_L43.EL1END2 19_31 !22_30 23_30 24_30 25_30
 INT_L.IMUX_L43.ER1END1 18_31 22_30 !23_30 24_30 25_30
diff --git a/kintex7/segbits_int_l.origin_info.db b/kintex7/segbits_int_l.origin_info.db
index 1f4db7a..3a77205 100644
--- a/kintex7/segbits_int_l.origin_info.db
+++ b/kintex7/segbits_int_l.origin_info.db
@@ -584,7 +584,7 @@
 INT_L.FAN_ALT0.GFAN0 origin:054-pip-fan-alt !22_00 !23_00 !24_00 21_00 25_00
 INT_L.FAN_ALT0.LOGIC_OUTS_L0 origin:050-pip-seed !23_00 21_00 22_00 24_00 25_00
 INT_L.FAN_ALT0.LOGIC_OUTS_L12 origin:050-pip-seed !22_00 21_00 23_00 24_00 25_00
-INT_L.FAN_ALT0.LOGIC_OUTS_L22 origin:056-pip-rem !22_00 !23_00 !25_00 21_00 24_00
+INT_L.FAN_ALT0.LOGIC_OUTS_L22 origin:050-pip-seed !22_00 !23_00 !25_00 21_00 24_00
 INT_L.FAN_ALT0.NE2END0 origin:050-pip-seed !22_00 !23_00 !25_00 18_01 24_00
 INT_L.FAN_ALT0.NL1END0 origin:050-pip-seed !22_00 19_01 23_00 24_00 25_00
 INT_L.FAN_ALT0.NN2END0 origin:050-pip-seed !22_00 !23_00 !24_00 18_01 25_00
@@ -1720,7 +1720,7 @@
 INT_L.IMUX_L43.GFAN0 origin:049-int-imux-gfan !22_30 !23_30 !24_30 21_30 25_30
 INT_L.IMUX_L43.LOGIC_OUTS_L1 origin:051-pip-imuxlout-bypalts !23_30 21_30 22_30 24_30 25_30
 INT_L.IMUX_L43.LOGIC_OUTS_L13 origin:051-pip-imuxlout-bypalts !22_30 21_30 23_30 24_30 25_30
-INT_L.IMUX_L43.LOGIC_OUTS_L23 origin:051-pip-imuxlout-bypalts !22_30 !23_30 !25_30 21_30 24_30
+INT_L.IMUX_L43.LOGIC_OUTS_L23 origin:051-pip-imuxlout-bypalts !22_30 !23_30 !25_30 20_00 21_30 24_30
 INT_L.IMUX_L43.NE2END2 origin:050-pip-seed !22_30 !23_30 !25_30 18_31 24_30
 INT_L.IMUX_L43.NL1END2 origin:050-pip-seed !22_30 16_30 23_30 24_30 25_30
 INT_L.IMUX_L43.NN2END2 origin:050-pip-seed !22_30 !23_30 !24_30 18_31 25_30
@@ -3603,7 +3603,7 @@
 INT_L.WW4BEG2.LVB_L0 origin:056-pip-rem 04_34 05_32
 INT_L.WW4BEG2.LVB_L12 origin:056-pip-rem 05_32 07_33
 INT_L.WW4BEG2.NE2END2 origin:050-pip-seed 02_33 05_35
-INT_L.WW4BEG2.NE6END2 origin:050-pip-seed 05_32 05_35
+INT_L.WW4BEG2.NE6END2 origin:056-pip-rem 05_32 05_35
 INT_L.WW4BEG2.NN2END2 origin:050-pip-seed 03_32 05_35
 INT_L.WW4BEG2.NN6END2 origin:050-pip-seed 05_35 06_32
 INT_L.WW4BEG2.NW2END2 origin:050-pip-seed 02_33 03_33
diff --git a/kintex7/segbits_int_r.origin_info.db b/kintex7/segbits_int_r.origin_info.db
index 1852d2c..9437b3a 100644
--- a/kintex7/segbits_int_r.origin_info.db
+++ b/kintex7/segbits_int_r.origin_info.db
@@ -373,7 +373,7 @@
 INT_R.EE4BEG1.SS2END1 origin:050-pip-seed 03_24 05_27
 INT_R.EE4BEG1.SS6END1 origin:050-pip-seed 05_27 06_24
 INT_R.EE4BEG1.SW2END1 origin:050-pip-seed 02_25 05_27
-INT_R.EE4BEG1.SW6END1 origin:056-pip-rem 05_24 05_27
+INT_R.EE4BEG1.SW6END1 origin:050-pip-seed 05_24 05_27
 INT_R.EE4BEG2.EE2END2 origin:050-pip-seed 03_40 03_41
 INT_R.EE4BEG2.EE4END2 origin:050-pip-seed 03_41 05_40
 INT_R.EE4BEG2.LOGIC_OUTS10 origin:050-pip-seed 03_40 07_41
@@ -393,7 +393,7 @@
 INT_R.EE4BEG2.SS2END2 origin:050-pip-seed 03_40 05_43
 INT_R.EE4BEG2.SS6END2 origin:050-pip-seed 05_43 06_40
 INT_R.EE4BEG2.SW2END2 origin:050-pip-seed 02_41 05_43
-INT_R.EE4BEG2.SW6END2 origin:056-pip-rem 05_40 05_43
+INT_R.EE4BEG2.SW6END2 origin:050-pip-seed 05_40 05_43
 INT_R.EE4BEG3.EE2END3 origin:050-pip-seed 03_56 03_57
 INT_R.EE4BEG3.EE4END3 origin:050-pip-seed 03_57 05_56
 INT_R.EE4BEG3.LH0 origin:056-pip-rem 04_58 05_56
@@ -584,7 +584,7 @@
 INT_R.FAN_ALT0.GFAN0 origin:054-pip-fan-alt !22_00 !23_00 !24_00 21_00 25_00
 INT_R.FAN_ALT0.LOGIC_OUTS0 origin:050-pip-seed !23_00 21_00 22_00 24_00 25_00
 INT_R.FAN_ALT0.LOGIC_OUTS12 origin:050-pip-seed !22_00 21_00 23_00 24_00 25_00
-INT_R.FAN_ALT0.LOGIC_OUTS22 origin:050-pip-seed !22_00 !23_00 !25_00 21_00 24_00
+INT_R.FAN_ALT0.LOGIC_OUTS22 origin:056-pip-rem !22_00 !23_00 !25_00 21_00 24_00
 INT_R.FAN_ALT0.NE2END0 origin:050-pip-seed !22_00 !23_00 !25_00 18_01 24_00
 INT_R.FAN_ALT0.NL1END0 origin:050-pip-seed !22_00 19_01 23_00 24_00 25_00
 INT_R.FAN_ALT0.NN2END0 origin:050-pip-seed !22_00 !23_00 !24_00 18_01 25_00
@@ -676,7 +676,7 @@
 INT_R.FAN_ALT4.EL1END0 origin:050-pip-seed !22_08 16_08 23_08 24_08 25_08
 INT_R.FAN_ALT4.ER1END0 origin:050-pip-seed !23_08 17_08 22_08 24_08 25_08
 INT_R.FAN_ALT4.FAN_BOUNCE2 origin:050-pip-seed !23_08 20_08 22_08 24_08 25_08
-INT_R.FAN_ALT4.FAN_BOUNCE7 origin:056-pip-rem !22_08 20_08 23_08 24_08 25_08
+INT_R.FAN_ALT4.FAN_BOUNCE7 origin:050-pip-seed !22_08 20_08 23_08 24_08 25_08
 INT_R.FAN_ALT4.GFAN0 origin:054-pip-fan-alt !22_08 !23_08 !24_08 21_08 25_08
 INT_R.FAN_ALT4.LOGIC_OUTS18 origin:050-pip-seed !22_08 !23_08 !25_08 21_08 24_08
 INT_R.FAN_ALT4.LOGIC_OUTS4 origin:050-pip-seed !23_08 21_08 22_08 24_08 25_08
@@ -2191,9 +2191,9 @@
 INT_R.NE6BEG3.NW2END3 origin:050-pip-seed 02_53 04_53
 INT_R.NE6BEG3.NW6END3 origin:050-pip-seed 04_53 06_52
 INT_R.NE6BEG3.SE2END3 origin:050-pip-seed 02_53 05_55
-INT_R.NE6BEG3.SE6END3 origin:050-pip-seed 05_55 06_52
+INT_R.NE6BEG3.SE6END3 origin:056-pip-rem 05_55 06_52
 INT_R.NE6BEG3.WW2END2 origin:050-pip-seed 03_52 04_53
-INT_R.NE6BEG3.WW4END3 origin:050-pip-seed 04_53 05_52
+INT_R.NE6BEG3.WW4END3 origin:056-pip-rem 04_53 05_52
 INT_R.NL1BEG0.LOGIC_OUTS1 origin:050-pip-seed 07_16 14_17
 INT_R.NL1BEG0.LOGIC_OUTS13 origin:050-pip-seed 10_17 14_17
 INT_R.NL1BEG0.LOGIC_OUTS19 origin:050-pip-seed 08_17 14_17
@@ -2827,7 +2827,7 @@
 INT_R.SE6BEG3.NE2END3 origin:050-pip-seed 03_58 04_56
 INT_R.SE6BEG3.NE6END3 origin:050-pip-seed 04_56 04_59
 INT_R.SE6BEG3.NN2END3 origin:050-pip-seed 02_59 04_56
-INT_R.SE6BEG3.NN6END3 origin:056-pip-rem 04_56 07_59
+INT_R.SE6BEG3.NN6END3 origin:050-pip-seed 04_56 07_59
 INT_R.SE6BEG3.SE2END3 origin:050-pip-seed 02_58 03_58
 INT_R.SE6BEG3.SE6END3 origin:050-pip-seed 02_58 07_59
 INT_R.SE6BEG3.SS2END3 origin:050-pip-seed 02_59 05_58
@@ -3563,7 +3563,7 @@
 INT_R.WW4BEG0.LOGIC_OUTS8 origin:050-pip-seed 03_00 07_01
 INT_R.WW4BEG0.LV0 origin:056-pip-rem 04_02 05_00
 INT_R.WW4BEG0.NE2END0 origin:050-pip-seed 02_01 05_03
-INT_R.WW4BEG0.NE6END0 origin:050-pip-seed 05_00 05_03
+INT_R.WW4BEG0.NE6END0 origin:056-pip-rem 05_00 05_03
 INT_R.WW4BEG0.NN2END0 origin:050-pip-seed 03_00 05_03
 INT_R.WW4BEG0.NN6END0 origin:050-pip-seed 05_03 06_00
 INT_R.WW4BEG0.NW2END0 origin:050-pip-seed 02_01 03_01
@@ -3623,7 +3623,7 @@
 INT_R.WW4BEG3.LOGIC_OUTS7 origin:050-pip-seed 02_49 04_50
 INT_R.WW4BEG3.LV18 origin:056-pip-rem 05_48 07_49
 INT_R.WW4BEG3.NE2END3 origin:050-pip-seed 02_49 05_51
-INT_R.WW4BEG3.NE6END3 origin:050-pip-seed 05_48 05_51
+INT_R.WW4BEG3.NE6END3 origin:056-pip-rem 05_48 05_51
 INT_R.WW4BEG3.NN2END3 origin:050-pip-seed 03_48 05_51
 INT_R.WW4BEG3.NN6END3 origin:050-pip-seed 05_51 06_48
 INT_R.WW4BEG3.NW2END3 origin:050-pip-seed 02_49 03_49
diff --git a/kintex7/segbits_liob33.db b/kintex7/segbits_liob33.db
index 3693490..5e26f36 100644
--- a/kintex7/segbits_liob33.db
+++ b/kintex7/segbits_liob33.db
@@ -15,13 +15,16 @@
 LIOB33.IOB_Y0.LVCMOS12_LVCMOS15_LVCMOS18_LVCMOS25_LVCMOS33_LVTTL_SSTL135.SLEW.SLOW 38_106 38_110 39_105 !39_107 39_109 !39_111
 LIOB33.IOB_Y0.LVCMOS12_LVCMOS15_LVCMOS18_SSTL135.STEPDOWN 39_95
 LIOB33.IOB_Y0.LVCMOS12_LVCMOS25.DRIVE.I8 38_64 38_112 !38_118 !38_126 39_65 !39_117 39_119 !39_125 !39_127
-LIOB33.IOB_Y0.LVCMOS15.DRIVE.I8 38_64 38_112 !38_118 38_126 39_65 !39_117 39_119 39_125 39_127
-LIOB33.IOB_Y0.LVCMOS15.DRIVE.I12 38_64 38_112 !38_118 !38_126 39_65 !39_117 !39_119 !39_125 39_127
-LIOB33.IOB_Y0.LVCMOS15.DRIVE.I16 38_64 38_112 38_118 38_126 39_65 39_117 !39_119 !39_125 39_127
-LIOB33.IOB_Y0.LVCMOS15_LVCMOS18_LVCMOS25.DRIVE.I4 38_64 38_112 38_118 !38_126 39_65 !39_117 !39_119 39_125 39_127
+LIOB33.IOB_Y0.LVCMOS15.DRIVE.I4 38_64 38_112 38_118 !38_126 39_65 39_113 !39_117 !39_119 39_125 39_127
+LIOB33.IOB_Y0.LVCMOS15.DRIVE.I8 38_64 38_112 !38_118 38_126 39_65 39_113 !39_117 39_119 39_125 39_127
+LIOB33.IOB_Y0.LVCMOS15.DRIVE.I12 38_64 38_112 !38_118 !38_126 39_65 39_113 !39_117 !39_119 !39_125 39_127
+LIOB33.IOB_Y0.LVCMOS15.DRIVE.I16 38_64 38_112 38_118 38_126 39_65 39_113 39_117 !39_119 !39_125 39_127
+LIOB33.IOB_Y0.LVCMOS15.IN 38_86 39_85 !39_87
+LIOB33.IOB_Y0.LVCMOS15_SSTL135.IN_ONLY !38_64 !38_112 38_118 !38_126 !39_65 39_113 !39_117 39_119 39_125 !39_127
 LIOB33.IOB_Y0.LVCMOS18.DRIVE.I12_I8 38_64 38_112 !38_118 38_126 39_65 !39_117 39_119 39_125 !39_127
 LIOB33.IOB_Y0.LVCMOS18.DRIVE.I16 38_64 38_112 !38_118 38_126 39_65 !39_117 !39_119 39_125 39_127
 LIOB33.IOB_Y0.LVCMOS18.DRIVE.I24 38_64 38_112 !38_118 38_126 39_65 39_117 39_119 !39_125 !39_127
+LIOB33.IOB_Y0.LVCMOS18_LVCMOS25.DRIVE.I4 38_64 38_112 38_118 !38_126 39_65 !39_117 !39_119 39_125 39_127
 LIOB33.IOB_Y0.LVCMOS25.DRIVE.I12 38_64 38_112 !38_118 !38_126 39_65 !39_117 !39_119 !39_125 !39_127
 LIOB33.IOB_Y0.LVCMOS25.DRIVE.I16 38_64 38_112 38_118 38_126 39_65 39_117 !39_119 !39_125 !39_127
 LIOB33.IOB_Y0.LVCMOS33.DRIVE.I16 38_64 !38_112 38_118 !38_126 39_65 39_117 !39_119 !39_125 39_127
@@ -29,9 +32,8 @@
 LIOB33.IOB_Y0.LVCMOS33_LVTTL.DRIVE.I12_I8 38_64 !38_112 !38_118 38_126 39_65 !39_117 39_119 39_125 !39_127
 LIOB33.IOB_Y0.LVCMOS33_LVTTL.DRIVE.I12_I16 38_64 !38_112 !38_118 38_126 39_65 !39_117 !39_119 39_125 39_127
 LIOB33.IOB_Y0.SSTL135.DRIVE.I_FIXED 38_64 38_112 38_118 38_126 39_65 39_113 39_117 39_119 !39_125 39_127
-LIOB33.IOB_Y0.SSTL135.IN !38_86 39_87
-LIOB33.IOB_Y0.SSTL135.IN_DIFF 38_86 39_87
-LIOB33.IOB_Y0.SSTL135.IN_ONLY !38_64 !38_112 38_118 !38_126 !39_65 39_113 !39_117 39_119 39_125 !39_127
+LIOB33.IOB_Y0.SSTL135.IN !38_86 !39_85 39_87
+LIOB33.IOB_Y0.SSTL135.IN_DIFF 38_86 !39_85 39_87
 LIOB33.IOB_Y0.SSTL135.SLEW.FAST !38_106 38_110 39_105 39_107 39_109 39_111
 LIOB33.IOB_Y1.IBUFDISABLE.I 39_45
 LIOB33.IOB_Y1.IN_TERM.UNTUNED_SPLIT_40 38_04 38_06 39_05 39_07
diff --git a/kintex7/segbits_liob33.origin_info.db b/kintex7/segbits_liob33.origin_info.db
index 2a99777..c69e4eb 100644
--- a/kintex7/segbits_liob33.origin_info.db
+++ b/kintex7/segbits_liob33.origin_info.db
@@ -9,13 +9,16 @@
 LIOB33.IOB_Y0.LVCMOS12_LVCMOS15_LVCMOS18_LVCMOS25_LVCMOS33_LVTTL_SSTL135.SLEW.SLOW origin:030-iob !39_107 !39_111 38_106 38_110 39_105 39_109
 LIOB33.IOB_Y0.LVCMOS12_LVCMOS15_LVCMOS18_SSTL135.STEPDOWN origin:030-iob 39_95
 LIOB33.IOB_Y0.LVCMOS12_LVCMOS25.DRIVE.I8 origin:030-iob !38_118 !38_126 !39_117 !39_125 !39_127 38_112 38_64 39_119 39_65
-LIOB33.IOB_Y0.LVCMOS15.DRIVE.I12 origin:030-iob !38_118 !38_126 !39_117 !39_119 !39_125 38_112 38_64 39_127 39_65
-LIOB33.IOB_Y0.LVCMOS15.DRIVE.I16 origin:030-iob !39_119 !39_125 38_112 38_118 38_126 38_64 39_117 39_127 39_65
-LIOB33.IOB_Y0.LVCMOS15.DRIVE.I8 origin:030-iob !38_118 !39_117 38_112 38_126 38_64 39_119 39_125 39_127 39_65
-LIOB33.IOB_Y0.LVCMOS15_LVCMOS18_LVCMOS25.DRIVE.I4 origin:030-iob !38_126 !39_117 !39_119 38_112 38_118 38_64 39_125 39_127 39_65
+LIOB33.IOB_Y0.LVCMOS15.DRIVE.I12 origin:030-iob !38_118 !38_126 !39_117 !39_119 !39_125 38_112 38_64 39_113 39_127 39_65
+LIOB33.IOB_Y0.LVCMOS15.DRIVE.I16 origin:030-iob !39_119 !39_125 38_112 38_118 38_126 38_64 39_113 39_117 39_127 39_65
+LIOB33.IOB_Y0.LVCMOS15.DRIVE.I4 origin:030-iob !38_126 !39_117 !39_119 38_112 38_118 38_64 39_113 39_125 39_127 39_65
+LIOB33.IOB_Y0.LVCMOS15.DRIVE.I8 origin:030-iob !38_118 !39_117 38_112 38_126 38_64 39_113 39_119 39_125 39_127 39_65
+LIOB33.IOB_Y0.LVCMOS15.IN origin:030-iob !39_87 38_86 39_85
+LIOB33.IOB_Y0.LVCMOS15_SSTL135.IN_ONLY origin:030-iob !38_112 !38_126 !38_64 !39_117 !39_127 !39_65 38_118 39_113 39_119 39_125
 LIOB33.IOB_Y0.LVCMOS18.DRIVE.I12_I8 origin:030-iob !38_118 !39_117 !39_127 38_112 38_126 38_64 39_119 39_125 39_65
 LIOB33.IOB_Y0.LVCMOS18.DRIVE.I16 origin:030-iob !38_118 !39_117 !39_119 38_112 38_126 38_64 39_125 39_127 39_65
 LIOB33.IOB_Y0.LVCMOS18.DRIVE.I24 origin:030-iob !38_118 !39_125 !39_127 38_112 38_126 38_64 39_117 39_119 39_65
+LIOB33.IOB_Y0.LVCMOS18_LVCMOS25.DRIVE.I4 origin:030-iob !38_126 !39_117 !39_119 38_112 38_118 38_64 39_125 39_127 39_65
 LIOB33.IOB_Y0.LVCMOS25.DRIVE.I12 origin:030-iob !38_118 !38_126 !39_117 !39_119 !39_125 !39_127 38_112 38_64 39_65
 LIOB33.IOB_Y0.LVCMOS25.DRIVE.I16 origin:030-iob !39_119 !39_125 !39_127 38_112 38_118 38_126 38_64 39_117 39_65
 LIOB33.IOB_Y0.LVCMOS33.DRIVE.I16 origin:030-iob !38_112 !38_126 !39_119 !39_125 38_118 38_64 39_117 39_127 39_65
@@ -28,9 +31,8 @@
 LIOB33.IOB_Y0.PULLTYPE.PULLDOWN origin:030-iob !38_92 !38_94 !39_93
 LIOB33.IOB_Y0.PULLTYPE.PULLUP origin:030-iob !38_92 38_94 39_93
 LIOB33.IOB_Y0.SSTL135.DRIVE.I_FIXED origin:030-iob !39_125 38_112 38_118 38_126 38_64 39_113 39_117 39_119 39_127 39_65
-LIOB33.IOB_Y0.SSTL135.IN origin:030-iob !38_86 39_87
-LIOB33.IOB_Y0.SSTL135.IN_DIFF origin:030-iob 38_86 39_87
-LIOB33.IOB_Y0.SSTL135.IN_ONLY origin:030-iob !38_112 !38_126 !38_64 !39_117 !39_127 !39_65 38_118 39_113 39_119 39_125
+LIOB33.IOB_Y0.SSTL135.IN origin:030-iob !38_86 !39_85 39_87
+LIOB33.IOB_Y0.SSTL135.IN_DIFF origin:030-iob !39_85 38_86 39_87
 LIOB33.IOB_Y0.SSTL135.SLEW.FAST origin:030-iob !38_106 38_110 39_105 39_107 39_109 39_111
 LIOB33.IOB_Y0.ZIBUF_LOW_PWR origin:030-iob 38_84
 LIOB33.IOB_Y1.IBUFDISABLE.I origin:030-iob 39_45
diff --git a/kintex7/segbits_riob33.db b/kintex7/segbits_riob33.db
index 08ecab5..e200eda 100644
--- a/kintex7/segbits_riob33.db
+++ b/kintex7/segbits_riob33.db
@@ -15,13 +15,16 @@
 RIOB33.IOB_Y0.LVCMOS12_LVCMOS15_LVCMOS18_LVCMOS25_LVCMOS33_LVTTL_SSTL135.SLEW.SLOW 38_106 38_110 39_105 !39_107 39_109 !39_111
 RIOB33.IOB_Y0.LVCMOS12_LVCMOS15_LVCMOS18_SSTL135.STEPDOWN 39_95
 RIOB33.IOB_Y0.LVCMOS12_LVCMOS25.DRIVE.I8 38_64 38_112 !38_118 !38_126 39_65 !39_117 39_119 !39_125 !39_127
-RIOB33.IOB_Y0.LVCMOS15.DRIVE.I8 38_64 38_112 !38_118 38_126 39_65 !39_117 39_119 39_125 39_127
-RIOB33.IOB_Y0.LVCMOS15.DRIVE.I12 38_64 38_112 !38_118 !38_126 39_65 !39_117 !39_119 !39_125 39_127
-RIOB33.IOB_Y0.LVCMOS15.DRIVE.I16 38_64 38_112 38_118 38_126 39_65 39_117 !39_119 !39_125 39_127
-RIOB33.IOB_Y0.LVCMOS15_LVCMOS18_LVCMOS25.DRIVE.I4 38_64 38_112 38_118 !38_126 39_65 !39_117 !39_119 39_125 39_127
+RIOB33.IOB_Y0.LVCMOS15.DRIVE.I4 38_64 38_112 38_118 !38_126 39_65 39_113 !39_117 !39_119 39_125 39_127
+RIOB33.IOB_Y0.LVCMOS15.DRIVE.I8 38_64 38_112 !38_118 38_126 39_65 39_113 !39_117 39_119 39_125 39_127
+RIOB33.IOB_Y0.LVCMOS15.DRIVE.I12 38_64 38_112 !38_118 !38_126 39_65 39_113 !39_117 !39_119 !39_125 39_127
+RIOB33.IOB_Y0.LVCMOS15.DRIVE.I16 38_64 38_112 38_118 38_126 39_65 39_113 39_117 !39_119 !39_125 39_127
+RIOB33.IOB_Y0.LVCMOS15.IN 38_86 39_85 !39_87
+RIOB33.IOB_Y0.LVCMOS15_SSTL135.IN_ONLY !38_64 !38_112 38_118 !38_126 !39_65 39_113 !39_117 39_119 39_125 !39_127
 RIOB33.IOB_Y0.LVCMOS18.DRIVE.I12_I8 38_64 38_112 !38_118 38_126 39_65 !39_117 39_119 39_125 !39_127
 RIOB33.IOB_Y0.LVCMOS18.DRIVE.I16 38_64 38_112 !38_118 38_126 39_65 !39_117 !39_119 39_125 39_127
 RIOB33.IOB_Y0.LVCMOS18.DRIVE.I24 38_64 38_112 !38_118 38_126 39_65 39_117 39_119 !39_125 !39_127
+RIOB33.IOB_Y0.LVCMOS18_LVCMOS25.DRIVE.I4 38_64 38_112 38_118 !38_126 39_65 !39_117 !39_119 39_125 39_127
 RIOB33.IOB_Y0.LVCMOS25.DRIVE.I12 38_64 38_112 !38_118 !38_126 39_65 !39_117 !39_119 !39_125 !39_127
 RIOB33.IOB_Y0.LVCMOS25.DRIVE.I16 38_64 38_112 38_118 38_126 39_65 39_117 !39_119 !39_125 !39_127
 RIOB33.IOB_Y0.LVCMOS33.DRIVE.I16 38_64 !38_112 38_118 !38_126 39_65 39_117 !39_119 !39_125 39_127
@@ -29,9 +32,8 @@
 RIOB33.IOB_Y0.LVCMOS33_LVTTL.DRIVE.I12_I8 38_64 !38_112 !38_118 38_126 39_65 !39_117 39_119 39_125 !39_127
 RIOB33.IOB_Y0.LVCMOS33_LVTTL.DRIVE.I12_I16 38_64 !38_112 !38_118 38_126 39_65 !39_117 !39_119 39_125 39_127
 RIOB33.IOB_Y0.SSTL135.DRIVE.I_FIXED 38_64 38_112 38_118 38_126 39_65 39_113 39_117 39_119 !39_125 39_127
-RIOB33.IOB_Y0.SSTL135.IN !38_86 39_87
-RIOB33.IOB_Y0.SSTL135.IN_DIFF 38_86 39_87
-RIOB33.IOB_Y0.SSTL135.IN_ONLY !38_64 !38_112 38_118 !38_126 !39_65 39_113 !39_117 39_119 39_125 !39_127
+RIOB33.IOB_Y0.SSTL135.IN !38_86 !39_85 39_87
+RIOB33.IOB_Y0.SSTL135.IN_DIFF 38_86 !39_85 39_87
 RIOB33.IOB_Y0.SSTL135.SLEW.FAST !38_106 38_110 39_105 39_107 39_109 39_111
 RIOB33.IOB_Y1.IBUFDISABLE.I 39_45
 RIOB33.IOB_Y1.IN_TERM.UNTUNED_SPLIT_40 38_04 38_06 39_05 39_07
diff --git a/kintex7/segbits_riob33.origin_info.db b/kintex7/segbits_riob33.origin_info.db
index 29016dc..5704988 100644
--- a/kintex7/segbits_riob33.origin_info.db
+++ b/kintex7/segbits_riob33.origin_info.db
@@ -9,13 +9,16 @@
 RIOB33.IOB_Y0.LVCMOS12_LVCMOS15_LVCMOS18_LVCMOS25_LVCMOS33_LVTTL_SSTL135.SLEW.SLOW origin:030-iob !39_107 !39_111 38_106 38_110 39_105 39_109
 RIOB33.IOB_Y0.LVCMOS12_LVCMOS15_LVCMOS18_SSTL135.STEPDOWN origin:030-iob 39_95
 RIOB33.IOB_Y0.LVCMOS12_LVCMOS25.DRIVE.I8 origin:030-iob !38_118 !38_126 !39_117 !39_125 !39_127 38_112 38_64 39_119 39_65
-RIOB33.IOB_Y0.LVCMOS15.DRIVE.I12 origin:030-iob !38_118 !38_126 !39_117 !39_119 !39_125 38_112 38_64 39_127 39_65
-RIOB33.IOB_Y0.LVCMOS15.DRIVE.I16 origin:030-iob !39_119 !39_125 38_112 38_118 38_126 38_64 39_117 39_127 39_65
-RIOB33.IOB_Y0.LVCMOS15.DRIVE.I8 origin:030-iob !38_118 !39_117 38_112 38_126 38_64 39_119 39_125 39_127 39_65
-RIOB33.IOB_Y0.LVCMOS15_LVCMOS18_LVCMOS25.DRIVE.I4 origin:030-iob !38_126 !39_117 !39_119 38_112 38_118 38_64 39_125 39_127 39_65
+RIOB33.IOB_Y0.LVCMOS15.DRIVE.I12 origin:030-iob !38_118 !38_126 !39_117 !39_119 !39_125 38_112 38_64 39_113 39_127 39_65
+RIOB33.IOB_Y0.LVCMOS15.DRIVE.I16 origin:030-iob !39_119 !39_125 38_112 38_118 38_126 38_64 39_113 39_117 39_127 39_65
+RIOB33.IOB_Y0.LVCMOS15.DRIVE.I4 origin:030-iob !38_126 !39_117 !39_119 38_112 38_118 38_64 39_113 39_125 39_127 39_65
+RIOB33.IOB_Y0.LVCMOS15.DRIVE.I8 origin:030-iob !38_118 !39_117 38_112 38_126 38_64 39_113 39_119 39_125 39_127 39_65
+RIOB33.IOB_Y0.LVCMOS15.IN origin:030-iob !39_87 38_86 39_85
+RIOB33.IOB_Y0.LVCMOS15_SSTL135.IN_ONLY origin:030-iob !38_112 !38_126 !38_64 !39_117 !39_127 !39_65 38_118 39_113 39_119 39_125
 RIOB33.IOB_Y0.LVCMOS18.DRIVE.I12_I8 origin:030-iob !38_118 !39_117 !39_127 38_112 38_126 38_64 39_119 39_125 39_65
 RIOB33.IOB_Y0.LVCMOS18.DRIVE.I16 origin:030-iob !38_118 !39_117 !39_119 38_112 38_126 38_64 39_125 39_127 39_65
 RIOB33.IOB_Y0.LVCMOS18.DRIVE.I24 origin:030-iob !38_118 !39_125 !39_127 38_112 38_126 38_64 39_117 39_119 39_65
+RIOB33.IOB_Y0.LVCMOS18_LVCMOS25.DRIVE.I4 origin:030-iob !38_126 !39_117 !39_119 38_112 38_118 38_64 39_125 39_127 39_65
 RIOB33.IOB_Y0.LVCMOS25.DRIVE.I12 origin:030-iob !38_118 !38_126 !39_117 !39_119 !39_125 !39_127 38_112 38_64 39_65
 RIOB33.IOB_Y0.LVCMOS25.DRIVE.I16 origin:030-iob !39_119 !39_125 !39_127 38_112 38_118 38_126 38_64 39_117 39_65
 RIOB33.IOB_Y0.LVCMOS33.DRIVE.I16 origin:030-iob !38_112 !38_126 !39_119 !39_125 38_118 38_64 39_117 39_127 39_65
@@ -28,9 +31,8 @@
 RIOB33.IOB_Y0.PULLTYPE.PULLDOWN origin:030-iob !38_92 !38_94 !39_93
 RIOB33.IOB_Y0.PULLTYPE.PULLUP origin:030-iob !38_92 38_94 39_93
 RIOB33.IOB_Y0.SSTL135.DRIVE.I_FIXED origin:030-iob !39_125 38_112 38_118 38_126 38_64 39_113 39_117 39_119 39_127 39_65
-RIOB33.IOB_Y0.SSTL135.IN origin:030-iob !38_86 39_87
-RIOB33.IOB_Y0.SSTL135.IN_DIFF origin:030-iob 38_86 39_87
-RIOB33.IOB_Y0.SSTL135.IN_ONLY origin:030-iob !38_112 !38_126 !38_64 !39_117 !39_127 !39_65 38_118 39_113 39_119 39_125
+RIOB33.IOB_Y0.SSTL135.IN origin:030-iob !38_86 !39_85 39_87
+RIOB33.IOB_Y0.SSTL135.IN_DIFF origin:030-iob !39_85 38_86 39_87
 RIOB33.IOB_Y0.SSTL135.SLEW.FAST origin:030-iob !38_106 38_110 39_105 39_107 39_109 39_111
 RIOB33.IOB_Y0.ZIBUF_LOW_PWR origin:030-iob 38_84
 RIOB33.IOB_Y1.IBUFDISABLE.I origin:030-iob 39_45
diff --git a/zynq7/mask_dsp_l.db b/zynq7/mask_dsp_l.db
index ea47238..f504eb1 100644
--- a/zynq7/mask_dsp_l.db
+++ b/zynq7/mask_dsp_l.db
@@ -1,259 +1,233 @@
-bit 00_11
-bit 00_35
-bit 00_39
 bit 00_42
-bit 00_75
 bit 00_89
 bit 00_90
-bit 00_99
-bit 00_103
 bit 00_106
-bit 00_139
-bit 00_163
-bit 00_167
 bit 00_170
-bit 00_203
 bit 00_209
 bit 00_217
 bit 00_218
-bit 00_227
-bit 00_231
 bit 00_234
 bit 00_273
-bit 00_293
-bit 00_295
 bit 00_298
-bit 01_14
 bit 01_32
-bit 01_36
 bit 01_37
 bit 01_38
-bit 01_41
-bit 01_78
 bit 01_85
 bit 01_88
 bit 01_96
-bit 01_100
 bit 01_101
 bit 01_102
-bit 01_105
-bit 01_142
 bit 01_160
-bit 01_164
 bit 01_165
 bit 01_166
-bit 01_169
 bit 01_205
-bit 01_206
 bit 01_213
 bit 01_216
 bit 01_224
-bit 01_228
 bit 01_229
 bit 01_230
-bit 01_233
 bit 01_269
 bit 01_288
 bit 01_293
 bit 01_294
-bit 01_296
-bit 01_297
-bit 20_65
-bit 20_73
-bit 20_81
-bit 20_89
-bit 20_129
-bit 20_137
-bit 20_195
-bit 20_203
-bit 20_213
-bit 20_219
 bit 20_293
-bit 20_307
-bit 20_315
-bit 21_70
-bit 21_78
-bit 21_86
-bit 21_94
-bit 21_134
-bit 21_142
-bit 21_194
-bit 21_202
-bit 21_212
-bit 21_218
 bit 21_242
 bit 21_244
 bit 21_292
-bit 21_306
-bit 21_314
-bit 24_65
-bit 24_73
-bit 24_81
-bit 24_89
-bit 24_129
-bit 24_137
-bit 24_195
-bit 24_203
-bit 24_213
-bit 24_219
 bit 24_293
-bit 24_307
-bit 24_315
-bit 25_70
-bit 25_78
-bit 25_86
-bit 25_94
-bit 25_134
-bit 25_142
-bit 25_194
-bit 25_202
-bit 25_212
-bit 25_218
 bit 25_242
 bit 25_244
 bit 25_292
-bit 25_306
-bit 25_314
 bit 26_01
+bit 26_02
 bit 26_03
 bit 26_04
 bit 26_05
 bit 26_07
 bit 26_09
 bit 26_10
+bit 26_11
 bit 26_12
 bit 26_17
 bit 26_18
+bit 26_19
 bit 26_20
+bit 26_21
 bit 26_22
+bit 26_25
 bit 26_26
 bit 26_28
 bit 26_29
+bit 26_38
+bit 26_40
 bit 26_41
 bit 26_43
+bit 26_44
 bit 26_45
+bit 26_46
 bit 26_47
+bit 26_48
 bit 26_49
+bit 26_50
 bit 26_51
+bit 26_54
 bit 26_57
-bit 26_58
 bit 26_59
 bit 26_60
 bit 26_61
 bit 26_62
 bit 26_64
-bit 26_65
 bit 26_66
+bit 26_67
 bit 26_68
-bit 26_69
+bit 26_70
+bit 26_71
 bit 26_72
-bit 26_75
-bit 26_82
+bit 26_73
+bit 26_76
+bit 26_77
+bit 26_78
+bit 26_79
+bit 26_81
+bit 26_83
+bit 26_84
+bit 26_85
 bit 26_86
+bit 26_87
 bit 26_88
-bit 26_89
 bit 26_90
+bit 26_91
 bit 26_92
 bit 26_94
+bit 26_95
 bit 26_96
 bit 26_97
-bit 26_98
-bit 26_101
+bit 26_99
+bit 26_103
 bit 26_104
-bit 26_105
 bit 26_106
-bit 26_107
 bit 26_108
 bit 26_110
+bit 26_111
 bit 26_112
-bit 26_118
+bit 26_113
+bit 26_114
+bit 26_125
 bit 26_127
 bit 26_129
 bit 26_130
+bit 26_131
 bit 26_132
-bit 26_133
 bit 26_134
-bit 26_135
 bit 26_136
+bit 26_137
 bit 26_138
 bit 26_139
+bit 26_140
+bit 26_143
 bit 26_144
-bit 26_145
 bit 26_146
+bit 26_147
 bit 26_148
 bit 26_149
+bit 26_150
 bit 26_151
 bit 26_153
 bit 26_154
 bit 26_155
 bit 26_161
+bit 26_162
 bit 26_163
 bit 26_164
 bit 26_165
 bit 26_167
 bit 26_169
 bit 26_170
+bit 26_171
 bit 26_172
 bit 26_177
 bit 26_178
+bit 26_179
 bit 26_180
+bit 26_181
 bit 26_182
+bit 26_185
 bit 26_186
 bit 26_188
 bit 26_189
+bit 26_198
+bit 26_200
 bit 26_201
 bit 26_203
+bit 26_204
 bit 26_205
+bit 26_206
 bit 26_207
+bit 26_208
 bit 26_209
+bit 26_210
 bit 26_211
+bit 26_214
 bit 26_217
-bit 26_218
 bit 26_219
 bit 26_220
 bit 26_221
 bit 26_222
 bit 26_224
-bit 26_225
 bit 26_226
+bit 26_227
 bit 26_228
-bit 26_229
+bit 26_230
+bit 26_231
 bit 26_232
-bit 26_235
-bit 26_242
+bit 26_233
+bit 26_236
+bit 26_237
+bit 26_238
+bit 26_239
+bit 26_241
+bit 26_243
+bit 26_244
+bit 26_245
 bit 26_246
+bit 26_247
 bit 26_248
-bit 26_249
 bit 26_250
+bit 26_251
 bit 26_252
 bit 26_254
+bit 26_255
 bit 26_256
 bit 26_257
-bit 26_258
-bit 26_261
+bit 26_259
+bit 26_263
 bit 26_264
-bit 26_265
 bit 26_266
-bit 26_267
 bit 26_268
 bit 26_270
+bit 26_271
 bit 26_272
-bit 26_278
+bit 26_273
+bit 26_274
+bit 26_285
 bit 26_287
 bit 26_289
 bit 26_290
+bit 26_291
 bit 26_292
-bit 26_293
 bit 26_294
-bit 26_295
 bit 26_296
+bit 26_297
 bit 26_298
 bit 26_299
+bit 26_300
+bit 26_303
 bit 26_304
-bit 26_305
 bit 26_306
+bit 26_307
 bit 26_308
 bit 26_309
+bit 26_310
 bit 26_311
 bit 26_313
 bit 26_314
@@ -261,154 +235,174 @@
 bit 27_01
 bit 27_06
 bit 27_08
+bit 27_09
+bit 27_10
 bit 27_11
-bit 27_12
 bit 27_13
 bit 27_17
 bit 27_19
+bit 27_20
 bit 27_21
+bit 27_22
 bit 27_23
 bit 27_24
 bit 27_26
+bit 27_29
 bit 27_38
 bit 27_40
+bit 27_41
 bit 27_42
 bit 27_44
 bit 27_46
+bit 27_47
 bit 27_48
 bit 27_49
 bit 27_50
-bit 27_51
+bit 27_52
 bit 27_53
 bit 27_54
 bit 27_56
 bit 27_57
+bit 27_58
 bit 27_60
 bit 27_61
 bit 27_62
 bit 27_63
+bit 27_64
 bit 27_65
 bit 27_66
 bit 27_67
-bit 27_68
 bit 27_69
-bit 27_71
-bit 27_78
-bit 27_79
-bit 27_80
+bit 27_70
+bit 27_74
+bit 27_75
+bit 27_77
+bit 27_81
+bit 27_82
+bit 27_84
+bit 27_85
 bit 27_86
 bit 27_88
+bit 27_89
 bit 27_90
-bit 27_91
 bit 27_92
 bit 27_93
 bit 27_94
 bit 27_95
-bit 27_96
+bit 27_97
 bit 27_101
 bit 27_102
 bit 27_104
+bit 27_105
 bit 27_106
-bit 27_107
 bit 27_108
 bit 27_110
 bit 27_111
 bit 27_112
-bit 27_113
+bit 27_116
 bit 27_118
 bit 27_119
-bit 27_122
-bit 27_125
+bit 27_120
+bit 27_126
 bit 27_127
-bit 27_128
+bit 27_130
 bit 27_131
 bit 27_133
-bit 27_134
 bit 27_135
+bit 27_136
 bit 27_137
-bit 27_140
+bit 27_143
 bit 27_144
+bit 27_145
 bit 27_146
-bit 27_147
 bit 27_150
-bit 27_151
 bit 27_152
-bit 27_154
-bit 27_158
+bit 27_153
+bit 27_155
 bit 27_161
 bit 27_166
 bit 27_168
+bit 27_169
+bit 27_170
 bit 27_171
-bit 27_172
 bit 27_173
 bit 27_177
 bit 27_179
+bit 27_180
 bit 27_181
+bit 27_182
 bit 27_183
 bit 27_184
 bit 27_186
+bit 27_189
 bit 27_198
 bit 27_200
+bit 27_201
 bit 27_202
 bit 27_204
 bit 27_206
+bit 27_207
 bit 27_208
 bit 27_209
 bit 27_210
-bit 27_211
+bit 27_212
 bit 27_213
 bit 27_214
 bit 27_216
 bit 27_217
+bit 27_218
 bit 27_220
 bit 27_221
 bit 27_222
 bit 27_223
+bit 27_224
 bit 27_225
 bit 27_226
 bit 27_227
-bit 27_228
 bit 27_229
-bit 27_231
-bit 27_238
-bit 27_239
-bit 27_240
+bit 27_230
+bit 27_234
+bit 27_235
+bit 27_237
+bit 27_241
+bit 27_242
+bit 27_244
+bit 27_245
 bit 27_246
 bit 27_248
+bit 27_249
 bit 27_250
-bit 27_251
 bit 27_252
 bit 27_253
 bit 27_254
 bit 27_255
-bit 27_256
+bit 27_257
 bit 27_261
 bit 27_262
 bit 27_264
+bit 27_265
 bit 27_266
-bit 27_267
 bit 27_268
 bit 27_270
 bit 27_271
 bit 27_272
-bit 27_273
+bit 27_276
 bit 27_278
 bit 27_279
-bit 27_282
-bit 27_285
+bit 27_280
+bit 27_286
 bit 27_287
-bit 27_288
+bit 27_290
 bit 27_291
 bit 27_293
-bit 27_294
 bit 27_295
+bit 27_296
 bit 27_297
-bit 27_300
+bit 27_303
 bit 27_304
+bit 27_305
 bit 27_306
-bit 27_307
 bit 27_310
-bit 27_311
 bit 27_312
-bit 27_314
-bit 27_318
+bit 27_313
+bit 27_315
diff --git a/zynq7/mask_dsp_r.db b/zynq7/mask_dsp_r.db
index ea47238..f504eb1 100644
--- a/zynq7/mask_dsp_r.db
+++ b/zynq7/mask_dsp_r.db
@@ -1,259 +1,233 @@
-bit 00_11
-bit 00_35
-bit 00_39
 bit 00_42
-bit 00_75
 bit 00_89
 bit 00_90
-bit 00_99
-bit 00_103
 bit 00_106
-bit 00_139
-bit 00_163
-bit 00_167
 bit 00_170
-bit 00_203
 bit 00_209
 bit 00_217
 bit 00_218
-bit 00_227
-bit 00_231
 bit 00_234
 bit 00_273
-bit 00_293
-bit 00_295
 bit 00_298
-bit 01_14
 bit 01_32
-bit 01_36
 bit 01_37
 bit 01_38
-bit 01_41
-bit 01_78
 bit 01_85
 bit 01_88
 bit 01_96
-bit 01_100
 bit 01_101
 bit 01_102
-bit 01_105
-bit 01_142
 bit 01_160
-bit 01_164
 bit 01_165
 bit 01_166
-bit 01_169
 bit 01_205
-bit 01_206
 bit 01_213
 bit 01_216
 bit 01_224
-bit 01_228
 bit 01_229
 bit 01_230
-bit 01_233
 bit 01_269
 bit 01_288
 bit 01_293
 bit 01_294
-bit 01_296
-bit 01_297
-bit 20_65
-bit 20_73
-bit 20_81
-bit 20_89
-bit 20_129
-bit 20_137
-bit 20_195
-bit 20_203
-bit 20_213
-bit 20_219
 bit 20_293
-bit 20_307
-bit 20_315
-bit 21_70
-bit 21_78
-bit 21_86
-bit 21_94
-bit 21_134
-bit 21_142
-bit 21_194
-bit 21_202
-bit 21_212
-bit 21_218
 bit 21_242
 bit 21_244
 bit 21_292
-bit 21_306
-bit 21_314
-bit 24_65
-bit 24_73
-bit 24_81
-bit 24_89
-bit 24_129
-bit 24_137
-bit 24_195
-bit 24_203
-bit 24_213
-bit 24_219
 bit 24_293
-bit 24_307
-bit 24_315
-bit 25_70
-bit 25_78
-bit 25_86
-bit 25_94
-bit 25_134
-bit 25_142
-bit 25_194
-bit 25_202
-bit 25_212
-bit 25_218
 bit 25_242
 bit 25_244
 bit 25_292
-bit 25_306
-bit 25_314
 bit 26_01
+bit 26_02
 bit 26_03
 bit 26_04
 bit 26_05
 bit 26_07
 bit 26_09
 bit 26_10
+bit 26_11
 bit 26_12
 bit 26_17
 bit 26_18
+bit 26_19
 bit 26_20
+bit 26_21
 bit 26_22
+bit 26_25
 bit 26_26
 bit 26_28
 bit 26_29
+bit 26_38
+bit 26_40
 bit 26_41
 bit 26_43
+bit 26_44
 bit 26_45
+bit 26_46
 bit 26_47
+bit 26_48
 bit 26_49
+bit 26_50
 bit 26_51
+bit 26_54
 bit 26_57
-bit 26_58
 bit 26_59
 bit 26_60
 bit 26_61
 bit 26_62
 bit 26_64
-bit 26_65
 bit 26_66
+bit 26_67
 bit 26_68
-bit 26_69
+bit 26_70
+bit 26_71
 bit 26_72
-bit 26_75
-bit 26_82
+bit 26_73
+bit 26_76
+bit 26_77
+bit 26_78
+bit 26_79
+bit 26_81
+bit 26_83
+bit 26_84
+bit 26_85
 bit 26_86
+bit 26_87
 bit 26_88
-bit 26_89
 bit 26_90
+bit 26_91
 bit 26_92
 bit 26_94
+bit 26_95
 bit 26_96
 bit 26_97
-bit 26_98
-bit 26_101
+bit 26_99
+bit 26_103
 bit 26_104
-bit 26_105
 bit 26_106
-bit 26_107
 bit 26_108
 bit 26_110
+bit 26_111
 bit 26_112
-bit 26_118
+bit 26_113
+bit 26_114
+bit 26_125
 bit 26_127
 bit 26_129
 bit 26_130
+bit 26_131
 bit 26_132
-bit 26_133
 bit 26_134
-bit 26_135
 bit 26_136
+bit 26_137
 bit 26_138
 bit 26_139
+bit 26_140
+bit 26_143
 bit 26_144
-bit 26_145
 bit 26_146
+bit 26_147
 bit 26_148
 bit 26_149
+bit 26_150
 bit 26_151
 bit 26_153
 bit 26_154
 bit 26_155
 bit 26_161
+bit 26_162
 bit 26_163
 bit 26_164
 bit 26_165
 bit 26_167
 bit 26_169
 bit 26_170
+bit 26_171
 bit 26_172
 bit 26_177
 bit 26_178
+bit 26_179
 bit 26_180
+bit 26_181
 bit 26_182
+bit 26_185
 bit 26_186
 bit 26_188
 bit 26_189
+bit 26_198
+bit 26_200
 bit 26_201
 bit 26_203
+bit 26_204
 bit 26_205
+bit 26_206
 bit 26_207
+bit 26_208
 bit 26_209
+bit 26_210
 bit 26_211
+bit 26_214
 bit 26_217
-bit 26_218
 bit 26_219
 bit 26_220
 bit 26_221
 bit 26_222
 bit 26_224
-bit 26_225
 bit 26_226
+bit 26_227
 bit 26_228
-bit 26_229
+bit 26_230
+bit 26_231
 bit 26_232
-bit 26_235
-bit 26_242
+bit 26_233
+bit 26_236
+bit 26_237
+bit 26_238
+bit 26_239
+bit 26_241
+bit 26_243
+bit 26_244
+bit 26_245
 bit 26_246
+bit 26_247
 bit 26_248
-bit 26_249
 bit 26_250
+bit 26_251
 bit 26_252
 bit 26_254
+bit 26_255
 bit 26_256
 bit 26_257
-bit 26_258
-bit 26_261
+bit 26_259
+bit 26_263
 bit 26_264
-bit 26_265
 bit 26_266
-bit 26_267
 bit 26_268
 bit 26_270
+bit 26_271
 bit 26_272
-bit 26_278
+bit 26_273
+bit 26_274
+bit 26_285
 bit 26_287
 bit 26_289
 bit 26_290
+bit 26_291
 bit 26_292
-bit 26_293
 bit 26_294
-bit 26_295
 bit 26_296
+bit 26_297
 bit 26_298
 bit 26_299
+bit 26_300
+bit 26_303
 bit 26_304
-bit 26_305
 bit 26_306
+bit 26_307
 bit 26_308
 bit 26_309
+bit 26_310
 bit 26_311
 bit 26_313
 bit 26_314
@@ -261,154 +235,174 @@
 bit 27_01
 bit 27_06
 bit 27_08
+bit 27_09
+bit 27_10
 bit 27_11
-bit 27_12
 bit 27_13
 bit 27_17
 bit 27_19
+bit 27_20
 bit 27_21
+bit 27_22
 bit 27_23
 bit 27_24
 bit 27_26
+bit 27_29
 bit 27_38
 bit 27_40
+bit 27_41
 bit 27_42
 bit 27_44
 bit 27_46
+bit 27_47
 bit 27_48
 bit 27_49
 bit 27_50
-bit 27_51
+bit 27_52
 bit 27_53
 bit 27_54
 bit 27_56
 bit 27_57
+bit 27_58
 bit 27_60
 bit 27_61
 bit 27_62
 bit 27_63
+bit 27_64
 bit 27_65
 bit 27_66
 bit 27_67
-bit 27_68
 bit 27_69
-bit 27_71
-bit 27_78
-bit 27_79
-bit 27_80
+bit 27_70
+bit 27_74
+bit 27_75
+bit 27_77
+bit 27_81
+bit 27_82
+bit 27_84
+bit 27_85
 bit 27_86
 bit 27_88
+bit 27_89
 bit 27_90
-bit 27_91
 bit 27_92
 bit 27_93
 bit 27_94
 bit 27_95
-bit 27_96
+bit 27_97
 bit 27_101
 bit 27_102
 bit 27_104
+bit 27_105
 bit 27_106
-bit 27_107
 bit 27_108
 bit 27_110
 bit 27_111
 bit 27_112
-bit 27_113
+bit 27_116
 bit 27_118
 bit 27_119
-bit 27_122
-bit 27_125
+bit 27_120
+bit 27_126
 bit 27_127
-bit 27_128
+bit 27_130
 bit 27_131
 bit 27_133
-bit 27_134
 bit 27_135
+bit 27_136
 bit 27_137
-bit 27_140
+bit 27_143
 bit 27_144
+bit 27_145
 bit 27_146
-bit 27_147
 bit 27_150
-bit 27_151
 bit 27_152
-bit 27_154
-bit 27_158
+bit 27_153
+bit 27_155
 bit 27_161
 bit 27_166
 bit 27_168
+bit 27_169
+bit 27_170
 bit 27_171
-bit 27_172
 bit 27_173
 bit 27_177
 bit 27_179
+bit 27_180
 bit 27_181
+bit 27_182
 bit 27_183
 bit 27_184
 bit 27_186
+bit 27_189
 bit 27_198
 bit 27_200
+bit 27_201
 bit 27_202
 bit 27_204
 bit 27_206
+bit 27_207
 bit 27_208
 bit 27_209
 bit 27_210
-bit 27_211
+bit 27_212
 bit 27_213
 bit 27_214
 bit 27_216
 bit 27_217
+bit 27_218
 bit 27_220
 bit 27_221
 bit 27_222
 bit 27_223
+bit 27_224
 bit 27_225
 bit 27_226
 bit 27_227
-bit 27_228
 bit 27_229
-bit 27_231
-bit 27_238
-bit 27_239
-bit 27_240
+bit 27_230
+bit 27_234
+bit 27_235
+bit 27_237
+bit 27_241
+bit 27_242
+bit 27_244
+bit 27_245
 bit 27_246
 bit 27_248
+bit 27_249
 bit 27_250
-bit 27_251
 bit 27_252
 bit 27_253
 bit 27_254
 bit 27_255
-bit 27_256
+bit 27_257
 bit 27_261
 bit 27_262
 bit 27_264
+bit 27_265
 bit 27_266
-bit 27_267
 bit 27_268
 bit 27_270
 bit 27_271
 bit 27_272
-bit 27_273
+bit 27_276
 bit 27_278
 bit 27_279
-bit 27_282
-bit 27_285
+bit 27_280
+bit 27_286
 bit 27_287
-bit 27_288
+bit 27_290
 bit 27_291
 bit 27_293
-bit 27_294
 bit 27_295
+bit 27_296
 bit 27_297
-bit 27_300
+bit 27_303
 bit 27_304
+bit 27_305
 bit 27_306
-bit 27_307
 bit 27_310
-bit 27_311
 bit 27_312
-bit 27_314
-bit 27_318
+bit 27_313
+bit 27_315
diff --git a/zynq7/mask_hclk_ioi.db b/zynq7/mask_hclk_ioi.db
index b86f81d..c94181d 100644
--- a/zynq7/mask_hclk_ioi.db
+++ b/zynq7/mask_hclk_ioi.db
@@ -105,23 +105,59 @@
 bit 32_14
 bit 32_15
 bit 32_16
+bit 32_17
 bit 32_19
 bit 32_20
+bit 32_22
 bit 32_23
 bit 32_24
 bit 32_25
 bit 32_26
+bit 32_28
 bit 32_30
+bit 33_14
+bit 33_15
+bit 33_16
+bit 33_17
+bit 33_18
+bit 33_19
+bit 33_20
+bit 33_21
+bit 33_23
+bit 33_24
+bit 33_25
+bit 33_26
+bit 33_27
+bit 33_28
+bit 33_29
+bit 33_30
+bit 33_31
 bit 34_15
 bit 34_16
+bit 34_17
+bit 34_18
+bit 34_19
+bit 34_20
 bit 34_23
 bit 34_24
+bit 34_25
+bit 34_26
+bit 34_29
+bit 34_30
 bit 34_31
+bit 35_15
+bit 35_16
+bit 35_17
+bit 35_18
 bit 35_19
 bit 35_21
 bit 35_23
 bit 35_24
 bit 35_25
+bit 35_26
+bit 35_27
+bit 35_28
+bit 35_29
 bit 36_14
 bit 36_16
 bit 36_17
diff --git a/zynq7/mask_lioi3.db b/zynq7/mask_lioi3.db
index 0fc283f..b6d3cdd 100644
--- a/zynq7/mask_lioi3.db
+++ b/zynq7/mask_lioi3.db
@@ -1,4 +1,3 @@
-bit 25_00
 bit 25_07
 bit 25_16
 bit 25_20
@@ -8,6 +7,7 @@
 bit 25_32
 bit 25_34
 bit 25_35
+bit 25_47
 bit 25_48
 bit 25_51
 bit 25_52
@@ -20,7 +20,6 @@
 bit 25_96
 bit 25_98
 bit 25_99
-bit 25_103
 bit 25_115
 bit 25_116
 bit 25_122
diff --git a/zynq7/mask_lioi3_tbytesrc.db b/zynq7/mask_lioi3_tbytesrc.db
index 0fc283f..b6d3cdd 100644
--- a/zynq7/mask_lioi3_tbytesrc.db
+++ b/zynq7/mask_lioi3_tbytesrc.db
@@ -1,4 +1,3 @@
-bit 25_00
 bit 25_07
 bit 25_16
 bit 25_20
@@ -8,6 +7,7 @@
 bit 25_32
 bit 25_34
 bit 25_35
+bit 25_47
 bit 25_48
 bit 25_51
 bit 25_52
@@ -20,7 +20,6 @@
 bit 25_96
 bit 25_98
 bit 25_99
-bit 25_103
 bit 25_115
 bit 25_116
 bit 25_122
diff --git a/zynq7/mask_lioi3_tbyteterm.db b/zynq7/mask_lioi3_tbyteterm.db
index 0fc283f..b6d3cdd 100644
--- a/zynq7/mask_lioi3_tbyteterm.db
+++ b/zynq7/mask_lioi3_tbyteterm.db
@@ -1,4 +1,3 @@
-bit 25_00
 bit 25_07
 bit 25_16
 bit 25_20
@@ -8,6 +7,7 @@
 bit 25_32
 bit 25_34
 bit 25_35
+bit 25_47
 bit 25_48
 bit 25_51
 bit 25_52
@@ -20,7 +20,6 @@
 bit 25_96
 bit 25_98
 bit 25_99
-bit 25_103
 bit 25_115
 bit 25_116
 bit 25_122
diff --git a/zynq7/mask_rioi3.db b/zynq7/mask_rioi3.db
index 0fc283f..b6d3cdd 100644
--- a/zynq7/mask_rioi3.db
+++ b/zynq7/mask_rioi3.db
@@ -1,4 +1,3 @@
-bit 25_00
 bit 25_07
 bit 25_16
 bit 25_20
@@ -8,6 +7,7 @@
 bit 25_32
 bit 25_34
 bit 25_35
+bit 25_47
 bit 25_48
 bit 25_51
 bit 25_52
@@ -20,7 +20,6 @@
 bit 25_96
 bit 25_98
 bit 25_99
-bit 25_103
 bit 25_115
 bit 25_116
 bit 25_122
diff --git a/zynq7/mask_rioi3_tbytesrc.db b/zynq7/mask_rioi3_tbytesrc.db
index 0fc283f..b6d3cdd 100644
--- a/zynq7/mask_rioi3_tbytesrc.db
+++ b/zynq7/mask_rioi3_tbytesrc.db
@@ -1,4 +1,3 @@
-bit 25_00
 bit 25_07
 bit 25_16
 bit 25_20
@@ -8,6 +7,7 @@
 bit 25_32
 bit 25_34
 bit 25_35
+bit 25_47
 bit 25_48
 bit 25_51
 bit 25_52
@@ -20,7 +20,6 @@
 bit 25_96
 bit 25_98
 bit 25_99
-bit 25_103
 bit 25_115
 bit 25_116
 bit 25_122
diff --git a/zynq7/mask_rioi3_tbyteterm.db b/zynq7/mask_rioi3_tbyteterm.db
index 0fc283f..b6d3cdd 100644
--- a/zynq7/mask_rioi3_tbyteterm.db
+++ b/zynq7/mask_rioi3_tbyteterm.db
@@ -1,4 +1,3 @@
-bit 25_00
 bit 25_07
 bit 25_16
 bit 25_20
@@ -8,6 +7,7 @@
 bit 25_32
 bit 25_34
 bit 25_35
+bit 25_47
 bit 25_48
 bit 25_51
 bit 25_52
@@ -20,7 +20,6 @@
 bit 25_96
 bit 25_98
 bit 25_99
-bit 25_103
 bit 25_115
 bit 25_116
 bit 25_122
diff --git a/zynq7/ppips_hclk_ioi3.db b/zynq7/ppips_hclk_ioi3.db
index 71375b7..b376a67 100644
--- a/zynq7/ppips_hclk_ioi3.db
+++ b/zynq7/ppips_hclk_ioi3.db
@@ -2,18 +2,6 @@
 HCLK_IOI3.HCLK_IOI_CK_BUFRCLK1.HCLK_IOI_RCLK2RCLK1 always
 HCLK_IOI3.HCLK_IOI_CK_BUFRCLK2.HCLK_IOI_RCLK2RCLK2 always
 HCLK_IOI3.HCLK_IOI_CK_BUFRCLK3.HCLK_IOI_RCLK2RCLK3 always
-HCLK_IOI3.HCLK_IOI_CK_IGCLK0.HCLK_IOI_CK_BUFHCLK0 always
-HCLK_IOI3.HCLK_IOI_CK_IGCLK1.HCLK_IOI_CK_BUFHCLK1 always
-HCLK_IOI3.HCLK_IOI_CK_IGCLK2.HCLK_IOI_CK_BUFHCLK2 always
-HCLK_IOI3.HCLK_IOI_CK_IGCLK3.HCLK_IOI_CK_BUFHCLK3 always
-HCLK_IOI3.HCLK_IOI_CK_IGCLK4.HCLK_IOI_CK_BUFHCLK4 always
-HCLK_IOI3.HCLK_IOI_CK_IGCLK5.HCLK_IOI_CK_BUFHCLK5 always
-HCLK_IOI3.HCLK_IOI_CK_IGCLK6.HCLK_IOI_CK_BUFHCLK6 always
-HCLK_IOI3.HCLK_IOI_CK_IGCLK7.HCLK_IOI_CK_BUFHCLK7 always
-HCLK_IOI3.HCLK_IOI_CK_IGCLK8.HCLK_IOI_CK_BUFHCLK8 always
-HCLK_IOI3.HCLK_IOI_CK_IGCLK9.HCLK_IOI_CK_BUFHCLK9 always
-HCLK_IOI3.HCLK_IOI_CK_IGCLK10.HCLK_IOI_CK_BUFHCLK10 always
-HCLK_IOI3.HCLK_IOI_CK_IGCLK11.HCLK_IOI_CK_BUFHCLK11 always
 HCLK_IOI3.HCLK_IOI_IO_PLL_CLK0.HCLK_IOI_IO_PLL_CLK0_DMUX always
 HCLK_IOI3.HCLK_IOI_IO_PLL_CLK1.HCLK_IOI_IO_PLL_CLK1_DMUX always
 HCLK_IOI3.HCLK_IOI_IO_PLL_CLK2.HCLK_IOI_IO_PLL_CLK2_DMUX always
diff --git a/zynq7/segbits_dsp_l.db b/zynq7/segbits_dsp_l.db
index 78d5d77..26e1f3b 100644
--- a/zynq7/segbits_dsp_l.db
+++ b/zynq7/segbits_dsp_l.db
@@ -1,3 +1,6 @@
+DSP_L.DSP48.DSP_0.A_INPUT[0] 27_84
+DSP_L.DSP48.DSP_0.AUTORESET_PATDET[0] 26_78
+DSP_L.DSP48.DSP_0.B_INPUT[0] 26_11
 DSP_L.DSP48.DSP_0.MASK[0] 27_01
 DSP_L.DSP48.DSP_0.MASK[1] 26_03
 DSP_L.DSP48.DSP_0.MASK[2] 27_06
@@ -94,6 +97,20 @@
 DSP_L.DSP48.DSP_0.PATTERN[45] 26_151
 DSP_L.DSP48.DSP_0.PATTERN[46] 27_152
 DSP_L.DSP48.DSP_0.PATTERN[47] 26_155
+DSP_L.DSP48.DSP_0.SEL_MASK[1] 27_82
+DSP_L.DSP48.DSP_0.USE_DPORT[0] 26_95
+DSP_L.DSP48.DSP_0.USE_SIMD[1] 26_143 27_52
+DSP_L.DSP48.DSP_0.ZALUMODEREG[0] 26_54
+DSP_L.DSP48.DSP_0.ZCARRYINREG[0] 26_02
+DSP_L.DSP48.DSP_0.ZCARRYINSELREG[0] 27_10
+DSP_L.DSP48.DSP_0.ZCREG[0] 26_76
+DSP_L.DSP48.DSP_0.ZINMODEREG[0] 26_87
+DSP_L.DSP48.DSP_0.ZMREG[0] 26_38
+DSP_L.DSP48.DSP_0.ZOPMODEREG[0] 26_25
+DSP_L.DSP48.DSP_0.ZPREG[0] 27_75
+DSP_L.DSP48.DSP_1.A_INPUT[0] 27_244
+DSP_L.DSP48.DSP_1.AUTORESET_PATDET[0] 26_238
+DSP_L.DSP48.DSP_1.B_INPUT[0] 26_171
 DSP_L.DSP48.DSP_1.MASK[0] 27_161
 DSP_L.DSP48.DSP_1.MASK[1] 26_163
 DSP_L.DSP48.DSP_1.MASK[2] 27_166
@@ -190,3 +207,14 @@
 DSP_L.DSP48.DSP_1.PATTERN[45] 26_311
 DSP_L.DSP48.DSP_1.PATTERN[46] 27_312
 DSP_L.DSP48.DSP_1.PATTERN[47] 26_315
+DSP_L.DSP48.DSP_1.SEL_MASK[1] 27_242
+DSP_L.DSP48.DSP_1.USE_DPORT[0] 26_255
+DSP_L.DSP48.DSP_1.USE_SIMD[1] 26_303 27_212
+DSP_L.DSP48.DSP_1.ZALUMODEREG[0] 26_214
+DSP_L.DSP48.DSP_1.ZCARRYINREG[0] 26_162
+DSP_L.DSP48.DSP_1.ZCARRYINSELREG[0] 27_170
+DSP_L.DSP48.DSP_1.ZCREG[0] 26_236
+DSP_L.DSP48.DSP_1.ZINMODEREG[0] 26_247
+DSP_L.DSP48.DSP_1.ZMREG[0] 26_198
+DSP_L.DSP48.DSP_1.ZOPMODEREG[0] 26_185
+DSP_L.DSP48.DSP_1.ZPREG[0] 27_235
diff --git a/zynq7/segbits_dsp_l.origin_info.db b/zynq7/segbits_dsp_l.origin_info.db
index b96d449..6648abf 100644
--- a/zynq7/segbits_dsp_l.origin_info.db
+++ b/zynq7/segbits_dsp_l.origin_info.db
@@ -1,3 +1,6 @@
+DSP_L.DSP48.DSP_0.AUTORESET_PATDET[0] origin:100-dsp-mskpat 26_78
+DSP_L.DSP48.DSP_0.A_INPUT[0] origin:100-dsp-mskpat 27_84
+DSP_L.DSP48.DSP_0.B_INPUT[0] origin:100-dsp-mskpat 26_11
 DSP_L.DSP48.DSP_0.MASK[0] origin:100-dsp-mskpat 27_01
 DSP_L.DSP48.DSP_0.MASK[10] origin:100-dsp-mskpat 27_26
 DSP_L.DSP48.DSP_0.MASK[11] origin:100-dsp-mskpat 26_28
@@ -94,6 +97,20 @@
 DSP_L.DSP48.DSP_0.PATTERN[7] origin:100-dsp-mskpat 26_20
 DSP_L.DSP48.DSP_0.PATTERN[8] origin:100-dsp-mskpat 27_21
 DSP_L.DSP48.DSP_0.PATTERN[9] origin:100-dsp-mskpat 27_24
+DSP_L.DSP48.DSP_0.SEL_MASK[1] origin:100-dsp-mskpat 27_82
+DSP_L.DSP48.DSP_0.USE_DPORT[0] origin:100-dsp-mskpat 26_95
+DSP_L.DSP48.DSP_0.USE_SIMD[1] origin:100-dsp-mskpat 26_143 27_52
+DSP_L.DSP48.DSP_0.ZALUMODEREG[0] origin:100-dsp-mskpat 26_54
+DSP_L.DSP48.DSP_0.ZCARRYINREG[0] origin:100-dsp-mskpat 26_02
+DSP_L.DSP48.DSP_0.ZCARRYINSELREG[0] origin:100-dsp-mskpat 27_10
+DSP_L.DSP48.DSP_0.ZCREG[0] origin:100-dsp-mskpat 26_76
+DSP_L.DSP48.DSP_0.ZINMODEREG[0] origin:100-dsp-mskpat 26_87
+DSP_L.DSP48.DSP_0.ZMREG[0] origin:100-dsp-mskpat 26_38
+DSP_L.DSP48.DSP_0.ZOPMODEREG[0] origin:100-dsp-mskpat 26_25
+DSP_L.DSP48.DSP_0.ZPREG[0] origin:100-dsp-mskpat 27_75
+DSP_L.DSP48.DSP_1.AUTORESET_PATDET[0] origin:100-dsp-mskpat 26_238
+DSP_L.DSP48.DSP_1.A_INPUT[0] origin:100-dsp-mskpat 27_244
+DSP_L.DSP48.DSP_1.B_INPUT[0] origin:100-dsp-mskpat 26_171
 DSP_L.DSP48.DSP_1.MASK[0] origin:100-dsp-mskpat 27_161
 DSP_L.DSP48.DSP_1.MASK[10] origin:100-dsp-mskpat 27_186
 DSP_L.DSP48.DSP_1.MASK[11] origin:100-dsp-mskpat 26_188
@@ -190,3 +207,14 @@
 DSP_L.DSP48.DSP_1.PATTERN[7] origin:100-dsp-mskpat 26_180
 DSP_L.DSP48.DSP_1.PATTERN[8] origin:100-dsp-mskpat 27_181
 DSP_L.DSP48.DSP_1.PATTERN[9] origin:100-dsp-mskpat 27_184
+DSP_L.DSP48.DSP_1.SEL_MASK[1] origin:100-dsp-mskpat 27_242
+DSP_L.DSP48.DSP_1.USE_DPORT[0] origin:100-dsp-mskpat 26_255
+DSP_L.DSP48.DSP_1.USE_SIMD[1] origin:100-dsp-mskpat 26_303 27_212
+DSP_L.DSP48.DSP_1.ZALUMODEREG[0] origin:100-dsp-mskpat 26_214
+DSP_L.DSP48.DSP_1.ZCARRYINREG[0] origin:100-dsp-mskpat 26_162
+DSP_L.DSP48.DSP_1.ZCARRYINSELREG[0] origin:100-dsp-mskpat 27_170
+DSP_L.DSP48.DSP_1.ZCREG[0] origin:100-dsp-mskpat 26_236
+DSP_L.DSP48.DSP_1.ZINMODEREG[0] origin:100-dsp-mskpat 26_247
+DSP_L.DSP48.DSP_1.ZMREG[0] origin:100-dsp-mskpat 26_198
+DSP_L.DSP48.DSP_1.ZOPMODEREG[0] origin:100-dsp-mskpat 26_185
+DSP_L.DSP48.DSP_1.ZPREG[0] origin:100-dsp-mskpat 27_235
diff --git a/zynq7/segbits_dsp_r.db b/zynq7/segbits_dsp_r.db
index 050f6fa..db04273 100644
--- a/zynq7/segbits_dsp_r.db
+++ b/zynq7/segbits_dsp_r.db
@@ -1,3 +1,6 @@
+DSP_R.DSP48.DSP_0.A_INPUT[0] 27_84
+DSP_R.DSP48.DSP_0.AUTORESET_PATDET[0] 26_78
+DSP_R.DSP48.DSP_0.B_INPUT[0] 26_11
 DSP_R.DSP48.DSP_0.MASK[0] 27_01
 DSP_R.DSP48.DSP_0.MASK[1] 26_03
 DSP_R.DSP48.DSP_0.MASK[2] 27_06
@@ -94,6 +97,20 @@
 DSP_R.DSP48.DSP_0.PATTERN[45] 26_151
 DSP_R.DSP48.DSP_0.PATTERN[46] 27_152
 DSP_R.DSP48.DSP_0.PATTERN[47] 26_155
+DSP_R.DSP48.DSP_0.SEL_MASK[1] 27_82
+DSP_R.DSP48.DSP_0.USE_DPORT[0] 26_95
+DSP_R.DSP48.DSP_0.USE_SIMD[1] 26_143 27_52
+DSP_R.DSP48.DSP_0.ZALUMODEREG[0] 26_54
+DSP_R.DSP48.DSP_0.ZCARRYINREG[0] 26_02
+DSP_R.DSP48.DSP_0.ZCARRYINSELREG[0] 27_10
+DSP_R.DSP48.DSP_0.ZCREG[0] 26_76
+DSP_R.DSP48.DSP_0.ZINMODEREG[0] 26_87
+DSP_R.DSP48.DSP_0.ZMREG[0] 26_38
+DSP_R.DSP48.DSP_0.ZOPMODEREG[0] 26_25
+DSP_R.DSP48.DSP_0.ZPREG[0] 27_75
+DSP_R.DSP48.DSP_1.A_INPUT[0] 27_244
+DSP_R.DSP48.DSP_1.AUTORESET_PATDET[0] 26_238
+DSP_R.DSP48.DSP_1.B_INPUT[0] 26_171
 DSP_R.DSP48.DSP_1.MASK[0] 27_161
 DSP_R.DSP48.DSP_1.MASK[1] 26_163
 DSP_R.DSP48.DSP_1.MASK[2] 27_166
@@ -190,3 +207,14 @@
 DSP_R.DSP48.DSP_1.PATTERN[45] 26_311
 DSP_R.DSP48.DSP_1.PATTERN[46] 27_312
 DSP_R.DSP48.DSP_1.PATTERN[47] 26_315
+DSP_R.DSP48.DSP_1.SEL_MASK[1] 27_242
+DSP_R.DSP48.DSP_1.USE_DPORT[0] 26_255
+DSP_R.DSP48.DSP_1.USE_SIMD[1] 26_303 27_212
+DSP_R.DSP48.DSP_1.ZALUMODEREG[0] 26_214
+DSP_R.DSP48.DSP_1.ZCARRYINREG[0] 26_162
+DSP_R.DSP48.DSP_1.ZCARRYINSELREG[0] 27_170
+DSP_R.DSP48.DSP_1.ZCREG[0] 26_236
+DSP_R.DSP48.DSP_1.ZINMODEREG[0] 26_247
+DSP_R.DSP48.DSP_1.ZMREG[0] 26_198
+DSP_R.DSP48.DSP_1.ZOPMODEREG[0] 26_185
+DSP_R.DSP48.DSP_1.ZPREG[0] 27_235
diff --git a/zynq7/segbits_dsp_r.origin_info.db b/zynq7/segbits_dsp_r.origin_info.db
index b2686fc..03bbb6e 100644
--- a/zynq7/segbits_dsp_r.origin_info.db
+++ b/zynq7/segbits_dsp_r.origin_info.db
@@ -1,3 +1,6 @@
+DSP_R.DSP48.DSP_0.AUTORESET_PATDET[0] origin:100-dsp-mskpat 26_78
+DSP_R.DSP48.DSP_0.A_INPUT[0] origin:100-dsp-mskpat 27_84
+DSP_R.DSP48.DSP_0.B_INPUT[0] origin:100-dsp-mskpat 26_11
 DSP_R.DSP48.DSP_0.MASK[0] origin:100-dsp-mskpat 27_01
 DSP_R.DSP48.DSP_0.MASK[10] origin:100-dsp-mskpat 27_26
 DSP_R.DSP48.DSP_0.MASK[11] origin:100-dsp-mskpat 26_28
@@ -94,6 +97,20 @@
 DSP_R.DSP48.DSP_0.PATTERN[7] origin:100-dsp-mskpat 26_20
 DSP_R.DSP48.DSP_0.PATTERN[8] origin:100-dsp-mskpat 27_21
 DSP_R.DSP48.DSP_0.PATTERN[9] origin:100-dsp-mskpat 27_24
+DSP_R.DSP48.DSP_0.SEL_MASK[1] origin:100-dsp-mskpat 27_82
+DSP_R.DSP48.DSP_0.USE_DPORT[0] origin:100-dsp-mskpat 26_95
+DSP_R.DSP48.DSP_0.USE_SIMD[1] origin:100-dsp-mskpat 26_143 27_52
+DSP_R.DSP48.DSP_0.ZALUMODEREG[0] origin:100-dsp-mskpat 26_54
+DSP_R.DSP48.DSP_0.ZCARRYINREG[0] origin:100-dsp-mskpat 26_02
+DSP_R.DSP48.DSP_0.ZCARRYINSELREG[0] origin:100-dsp-mskpat 27_10
+DSP_R.DSP48.DSP_0.ZCREG[0] origin:100-dsp-mskpat 26_76
+DSP_R.DSP48.DSP_0.ZINMODEREG[0] origin:100-dsp-mskpat 26_87
+DSP_R.DSP48.DSP_0.ZMREG[0] origin:100-dsp-mskpat 26_38
+DSP_R.DSP48.DSP_0.ZOPMODEREG[0] origin:100-dsp-mskpat 26_25
+DSP_R.DSP48.DSP_0.ZPREG[0] origin:100-dsp-mskpat 27_75
+DSP_R.DSP48.DSP_1.AUTORESET_PATDET[0] origin:100-dsp-mskpat 26_238
+DSP_R.DSP48.DSP_1.A_INPUT[0] origin:100-dsp-mskpat 27_244
+DSP_R.DSP48.DSP_1.B_INPUT[0] origin:100-dsp-mskpat 26_171
 DSP_R.DSP48.DSP_1.MASK[0] origin:100-dsp-mskpat 27_161
 DSP_R.DSP48.DSP_1.MASK[10] origin:100-dsp-mskpat 27_186
 DSP_R.DSP48.DSP_1.MASK[11] origin:100-dsp-mskpat 26_188
@@ -190,3 +207,14 @@
 DSP_R.DSP48.DSP_1.PATTERN[7] origin:100-dsp-mskpat 26_180
 DSP_R.DSP48.DSP_1.PATTERN[8] origin:100-dsp-mskpat 27_181
 DSP_R.DSP48.DSP_1.PATTERN[9] origin:100-dsp-mskpat 27_184
+DSP_R.DSP48.DSP_1.SEL_MASK[1] origin:100-dsp-mskpat 27_242
+DSP_R.DSP48.DSP_1.USE_DPORT[0] origin:100-dsp-mskpat 26_255
+DSP_R.DSP48.DSP_1.USE_SIMD[1] origin:100-dsp-mskpat 26_303 27_212
+DSP_R.DSP48.DSP_1.ZALUMODEREG[0] origin:100-dsp-mskpat 26_214
+DSP_R.DSP48.DSP_1.ZCARRYINREG[0] origin:100-dsp-mskpat 26_162
+DSP_R.DSP48.DSP_1.ZCARRYINSELREG[0] origin:100-dsp-mskpat 27_170
+DSP_R.DSP48.DSP_1.ZCREG[0] origin:100-dsp-mskpat 26_236
+DSP_R.DSP48.DSP_1.ZINMODEREG[0] origin:100-dsp-mskpat 26_247
+DSP_R.DSP48.DSP_1.ZMREG[0] origin:100-dsp-mskpat 26_198
+DSP_R.DSP48.DSP_1.ZOPMODEREG[0] origin:100-dsp-mskpat 26_185
+DSP_R.DSP48.DSP_1.ZPREG[0] origin:100-dsp-mskpat 27_235
diff --git a/zynq7/segbits_hclk_ioi3.db b/zynq7/segbits_hclk_ioi3.db
index 6fde459..f4b3453 100644
--- a/zynq7/segbits_hclk_ioi3.db
+++ b/zynq7/segbits_hclk_ioi3.db
@@ -208,18 +208,34 @@
 HCLK_IOI3.HCLK_IOI_LEAF_GCLK_TOP5.HCLK_IOI_CK_IGCLK9 30_19 31_15
 HCLK_IOI3.HCLK_IOI_LEAF_GCLK_TOP5.HCLK_IOI_CK_IGCLK10 30_14 30_19
 HCLK_IOI3.HCLK_IOI_LEAF_GCLK_TOP5.HCLK_IOI_CK_IGCLK11 30_16 30_19
+HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV0.HCLK_IOI_RCLK_IMUX0 32_30 35_26
+HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV0.HCLK_IOI_RCLK_IMUX1 32_30 35_27
+HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV0.HCLK_IOI_RCLK_IMUX2 32_30 35_28
+HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV0.HCLK_IOI_RCLK_IMUX3 32_30 35_29
 HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV0.HCLK_IOI_RCLK0 32_30 35_23
 HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV0.HCLK_IOI_RCLK1 32_30 35_24
 HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV0.HCLK_IOI_RCLK2 32_30 34_31
 HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV0.HCLK_IOI_RCLK3 32_30 35_25
+HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV1.HCLK_IOI_RCLK_IMUX0 32_26 34_25
+HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV1.HCLK_IOI_RCLK_IMUX1 32_26 34_26
+HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV1.HCLK_IOI_RCLK_IMUX2 32_26 34_30
+HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV1.HCLK_IOI_RCLK_IMUX3 32_26 34_29
 HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV1.HCLK_IOI_RCLK0 32_26 36_26
 HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV1.HCLK_IOI_RCLK1 32_26 36_27
 HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV1.HCLK_IOI_RCLK2 32_26 34_23
 HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV1.HCLK_IOI_RCLK3 32_26 34_24
+HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV2.HCLK_IOI_RCLK_IMUX0 32_20 34_17
+HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV2.HCLK_IOI_RCLK_IMUX1 32_20 34_18
+HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV2.HCLK_IOI_RCLK_IMUX2 32_20 34_19
+HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV2.HCLK_IOI_RCLK_IMUX3 32_20 34_20
 HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV2.HCLK_IOI_RCLK0 32_20 36_24
 HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV2.HCLK_IOI_RCLK1 32_20 36_25
 HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV2.HCLK_IOI_RCLK2 32_20 34_15
 HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV2.HCLK_IOI_RCLK3 32_20 34_16
+HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV3.HCLK_IOI_RCLK_IMUX0 32_19 35_18
+HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV3.HCLK_IOI_RCLK_IMUX1 32_19 35_17
+HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV3.HCLK_IOI_RCLK_IMUX2 32_19 35_16
+HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV3.HCLK_IOI_RCLK_IMUX3 32_19 35_15
 HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV3.HCLK_IOI_RCLK0 32_16 32_19
 HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV3.HCLK_IOI_RCLK1 32_19 35_21
 HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV3.HCLK_IOI_RCLK2 31_20 32_19
diff --git a/zynq7/segbits_hclk_ioi3.origin_info.db b/zynq7/segbits_hclk_ioi3.origin_info.db
index 934ecd3..7347916 100644
--- a/zynq7/segbits_hclk_ioi3.origin_info.db
+++ b/zynq7/segbits_hclk_ioi3.origin_info.db
@@ -48,18 +48,18 @@
 HCLK_IOI3.HCLK_IOI_CK_IGCLK7.HCLK_IOI_CK_BUFHCLK7 origin:047-hclk-ioi-pips 29_31
 HCLK_IOI3.HCLK_IOI_CK_IGCLK8.HCLK_IOI_CK_BUFHCLK8 origin:047-hclk-ioi-pips 28_14
 HCLK_IOI3.HCLK_IOI_CK_IGCLK9.HCLK_IOI_CK_BUFHCLK9 origin:047-hclk-ioi-pips 29_15
-HCLK_IOI3.HCLK_IOI_IDELAYCTRL_REFCLK.HCLK_IOI_LEAF_GCLK_BOT0 origin:047-hclk-ioi-pips 26_20 37_28 37_29
-HCLK_IOI3.HCLK_IOI_IDELAYCTRL_REFCLK.HCLK_IOI_LEAF_GCLK_BOT1 origin:047-hclk-ioi-pips 26_21 37_28 37_29
-HCLK_IOI3.HCLK_IOI_IDELAYCTRL_REFCLK.HCLK_IOI_LEAF_GCLK_BOT2 origin:047-hclk-ioi-pips 26_22 37_28 37_29
-HCLK_IOI3.HCLK_IOI_IDELAYCTRL_REFCLK.HCLK_IOI_LEAF_GCLK_BOT3 origin:047-hclk-ioi-pips 26_23 37_28 37_29
-HCLK_IOI3.HCLK_IOI_IDELAYCTRL_REFCLK.HCLK_IOI_LEAF_GCLK_BOT4 origin:047-hclk-ioi-pips 26_24 37_28 37_29
-HCLK_IOI3.HCLK_IOI_IDELAYCTRL_REFCLK.HCLK_IOI_LEAF_GCLK_BOT5 origin:047-hclk-ioi-pips 26_25 37_28 37_29
-HCLK_IOI3.HCLK_IOI_IDELAYCTRL_REFCLK.HCLK_IOI_LEAF_GCLK_TOP0 origin:047-hclk-ioi-pips 26_26 37_28 37_29
-HCLK_IOI3.HCLK_IOI_IDELAYCTRL_REFCLK.HCLK_IOI_LEAF_GCLK_TOP1 origin:047-hclk-ioi-pips 26_27 37_28 37_29
-HCLK_IOI3.HCLK_IOI_IDELAYCTRL_REFCLK.HCLK_IOI_LEAF_GCLK_TOP2 origin:047-hclk-ioi-pips 26_28 37_28 37_29
-HCLK_IOI3.HCLK_IOI_IDELAYCTRL_REFCLK.HCLK_IOI_LEAF_GCLK_TOP3 origin:047-hclk-ioi-pips 26_29 37_28 37_29
-HCLK_IOI3.HCLK_IOI_IDELAYCTRL_REFCLK.HCLK_IOI_LEAF_GCLK_TOP4 origin:047-hclk-ioi-pips 26_30 37_28 37_29
-HCLK_IOI3.HCLK_IOI_IDELAYCTRL_REFCLK.HCLK_IOI_LEAF_GCLK_TOP5 origin:047-hclk-ioi-pips 26_31 37_28 37_29
+HCLK_IOI3.HCLK_IOI_IDELAYCTRL_REFCLK.HCLK_IOI_LEAF_GCLK_BOT0 origin:047a-hclk-idelayctrl-pips 26_20 37_28 37_29
+HCLK_IOI3.HCLK_IOI_IDELAYCTRL_REFCLK.HCLK_IOI_LEAF_GCLK_BOT1 origin:047a-hclk-idelayctrl-pips 26_21 37_28 37_29
+HCLK_IOI3.HCLK_IOI_IDELAYCTRL_REFCLK.HCLK_IOI_LEAF_GCLK_BOT2 origin:047a-hclk-idelayctrl-pips 26_22 37_28 37_29
+HCLK_IOI3.HCLK_IOI_IDELAYCTRL_REFCLK.HCLK_IOI_LEAF_GCLK_BOT3 origin:047a-hclk-idelayctrl-pips 26_23 37_28 37_29
+HCLK_IOI3.HCLK_IOI_IDELAYCTRL_REFCLK.HCLK_IOI_LEAF_GCLK_BOT4 origin:047a-hclk-idelayctrl-pips 26_24 37_28 37_29
+HCLK_IOI3.HCLK_IOI_IDELAYCTRL_REFCLK.HCLK_IOI_LEAF_GCLK_BOT5 origin:047a-hclk-idelayctrl-pips 26_25 37_28 37_29
+HCLK_IOI3.HCLK_IOI_IDELAYCTRL_REFCLK.HCLK_IOI_LEAF_GCLK_TOP0 origin:047a-hclk-idelayctrl-pips 26_26 37_28 37_29
+HCLK_IOI3.HCLK_IOI_IDELAYCTRL_REFCLK.HCLK_IOI_LEAF_GCLK_TOP1 origin:047a-hclk-idelayctrl-pips 26_27 37_28 37_29
+HCLK_IOI3.HCLK_IOI_IDELAYCTRL_REFCLK.HCLK_IOI_LEAF_GCLK_TOP2 origin:047a-hclk-idelayctrl-pips 26_28 37_28 37_29
+HCLK_IOI3.HCLK_IOI_IDELAYCTRL_REFCLK.HCLK_IOI_LEAF_GCLK_TOP3 origin:047a-hclk-idelayctrl-pips 26_29 37_28 37_29
+HCLK_IOI3.HCLK_IOI_IDELAYCTRL_REFCLK.HCLK_IOI_LEAF_GCLK_TOP4 origin:047a-hclk-idelayctrl-pips 26_30 37_28 37_29
+HCLK_IOI3.HCLK_IOI_IDELAYCTRL_REFCLK.HCLK_IOI_LEAF_GCLK_TOP5 origin:047a-hclk-idelayctrl-pips 26_31 37_28 37_29
 HCLK_IOI3.HCLK_IOI_IO_PLL_CLK0_DMUX.HCLK_IOI_IOCLK_PLL0 origin:047-hclk-ioi-pips 36_28 36_29
 HCLK_IOI3.HCLK_IOI_IO_PLL_CLK1_DMUX.HCLK_IOI_IOCLK_PLL1 origin:047-hclk-ioi-pips 36_20 37_21
 HCLK_IOI3.HCLK_IOI_IO_PLL_CLK2_DMUX.HCLK_IOI_IOCLK_PLL2 origin:047-hclk-ioi-pips 36_14 36_17
@@ -212,18 +212,34 @@
 HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV0.HCLK_IOI_RCLK1 origin:047-hclk-ioi-pips 32_30 35_24
 HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV0.HCLK_IOI_RCLK2 origin:047-hclk-ioi-pips 32_30 34_31
 HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV0.HCLK_IOI_RCLK3 origin:047-hclk-ioi-pips 32_30 35_25
+HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV0.HCLK_IOI_RCLK_IMUX0 origin:047-hclk-ioi-pips 32_30 35_26
+HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV0.HCLK_IOI_RCLK_IMUX1 origin:047-hclk-ioi-pips 32_30 35_27
+HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV0.HCLK_IOI_RCLK_IMUX2 origin:047-hclk-ioi-pips 32_30 35_28
+HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV0.HCLK_IOI_RCLK_IMUX3 origin:047-hclk-ioi-pips 32_30 35_29
 HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV1.HCLK_IOI_RCLK0 origin:047-hclk-ioi-pips 32_26 36_26
 HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV1.HCLK_IOI_RCLK1 origin:047-hclk-ioi-pips 32_26 36_27
 HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV1.HCLK_IOI_RCLK2 origin:047-hclk-ioi-pips 32_26 34_23
 HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV1.HCLK_IOI_RCLK3 origin:047-hclk-ioi-pips 32_26 34_24
+HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV1.HCLK_IOI_RCLK_IMUX0 origin:047-hclk-ioi-pips 32_26 34_25
+HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV1.HCLK_IOI_RCLK_IMUX1 origin:047-hclk-ioi-pips 32_26 34_26
+HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV1.HCLK_IOI_RCLK_IMUX2 origin:047-hclk-ioi-pips 32_26 34_30
+HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV1.HCLK_IOI_RCLK_IMUX3 origin:047-hclk-ioi-pips 32_26 34_29
 HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV2.HCLK_IOI_RCLK0 origin:047-hclk-ioi-pips 32_20 36_24
 HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV2.HCLK_IOI_RCLK1 origin:047-hclk-ioi-pips 32_20 36_25
 HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV2.HCLK_IOI_RCLK2 origin:047-hclk-ioi-pips 32_20 34_15
 HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV2.HCLK_IOI_RCLK3 origin:047-hclk-ioi-pips 32_20 34_16
+HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV2.HCLK_IOI_RCLK_IMUX0 origin:047-hclk-ioi-pips 32_20 34_17
+HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV2.HCLK_IOI_RCLK_IMUX1 origin:047-hclk-ioi-pips 32_20 34_18
+HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV2.HCLK_IOI_RCLK_IMUX2 origin:047-hclk-ioi-pips 32_20 34_19
+HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV2.HCLK_IOI_RCLK_IMUX3 origin:047-hclk-ioi-pips 32_20 34_20
 HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV3.HCLK_IOI_RCLK0 origin:047-hclk-ioi-pips 32_16 32_19
 HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV3.HCLK_IOI_RCLK1 origin:047-hclk-ioi-pips 32_19 35_21
 HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV3.HCLK_IOI_RCLK2 origin:047-hclk-ioi-pips 31_20 32_19
 HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV3.HCLK_IOI_RCLK3 origin:047-hclk-ioi-pips 32_19 35_19
+HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV3.HCLK_IOI_RCLK_IMUX0 origin:047-hclk-ioi-pips 32_19 35_18
+HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV3.HCLK_IOI_RCLK_IMUX1 origin:047-hclk-ioi-pips 32_19 35_17
+HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV3.HCLK_IOI_RCLK_IMUX2 origin:047-hclk-ioi-pips 32_19 35_16
+HCLK_IOI3.HCLK_IOI_RCLK_BEFORE_DIV3.HCLK_IOI_RCLK_IMUX3 origin:047-hclk-ioi-pips 32_19 35_15
 HCLK_IOI3.STEPDOWN origin:030-iob 38_15 39_14 39_15 39_16
 HCLK_IOI3.VREF.V_600_MV origin:030-iob 38_26 39_30
 HCLK_IOI3.VREF.V_675_MV origin:030-iob 38_26 39_22
diff --git a/zynq7/segbits_int_l.origin_info.db b/zynq7/segbits_int_l.origin_info.db
index 48a18dd..f8fc627 100644
--- a/zynq7/segbits_int_l.origin_info.db
+++ b/zynq7/segbits_int_l.origin_info.db
@@ -2431,7 +2431,7 @@
 INT_L.NN6BEG3.NW2END3 origin:050-pip-seed 03_54 04_52
 INT_L.NN6BEG3.NW6END3 origin:050-pip-seed 04_52 07_55
 INT_L.NN6BEG3.SE2END3 origin:050-pip-seed 03_54 05_54
-INT_L.NN6BEG3.SE6END3 origin:056-pip-rem 05_54 07_55
+INT_L.NN6BEG3.SE6END3 origin:050-pip-seed 05_54 07_55
 INT_L.NN6BEG3.WW2END2 origin:050-pip-seed 02_55 04_52
 INT_L.NN6BEG3.WW4END3 origin:050-pip-seed 04_52 04_55
 INT_L.NR1BEG0.EE2END0 origin:050-pip-seed 10_07 15_07
@@ -3603,7 +3603,7 @@
 INT_L.WW4BEG2.LVB_L0 origin:056-pip-rem 04_34 05_32
 INT_L.WW4BEG2.LVB_L12 origin:056-pip-rem 05_32 07_33
 INT_L.WW4BEG2.NE2END2 origin:050-pip-seed 02_33 05_35
-INT_L.WW4BEG2.NE6END2 origin:050-pip-seed 05_32 05_35
+INT_L.WW4BEG2.NE6END2 origin:056-pip-rem 05_32 05_35
 INT_L.WW4BEG2.NN2END2 origin:050-pip-seed 03_32 05_35
 INT_L.WW4BEG2.NN6END2 origin:050-pip-seed 05_35 06_32
 INT_L.WW4BEG2.NW2END2 origin:050-pip-seed 02_33 03_33
diff --git a/zynq7/segbits_int_r.origin_info.db b/zynq7/segbits_int_r.origin_info.db
index 21a63e5..0926399 100644
--- a/zynq7/segbits_int_r.origin_info.db
+++ b/zynq7/segbits_int_r.origin_info.db
@@ -413,7 +413,7 @@
 INT_R.EE4BEG3.SS2END3 origin:050-pip-seed 03_56 05_59
 INT_R.EE4BEG3.SS6END3 origin:050-pip-seed 05_59 06_56
 INT_R.EE4BEG3.SW2END3 origin:050-pip-seed 02_57 05_59
-INT_R.EE4BEG3.SW6END3 origin:050-pip-seed 05_56 05_59
+INT_R.EE4BEG3.SW6END3 origin:056-pip-rem 05_56 05_59
 INT_R.EL1BEG0.EE2END1 origin:050-pip-seed 07_20 15_21
 INT_R.EL1BEG0.EE4END1 origin:050-pip-seed 07_20 12_21
 INT_R.EL1BEG0.EL1END1 origin:050-pip-seed 11_21 13_21
@@ -584,7 +584,7 @@
 INT_R.FAN_ALT0.GFAN0 origin:054-pip-fan-alt !22_00 !23_00 !24_00 21_00 25_00
 INT_R.FAN_ALT0.LOGIC_OUTS0 origin:050-pip-seed !23_00 21_00 22_00 24_00 25_00
 INT_R.FAN_ALT0.LOGIC_OUTS12 origin:050-pip-seed !22_00 21_00 23_00 24_00 25_00
-INT_R.FAN_ALT0.LOGIC_OUTS22 origin:056-pip-rem !22_00 !23_00 !25_00 21_00 24_00
+INT_R.FAN_ALT0.LOGIC_OUTS22 origin:050-pip-seed !22_00 !23_00 !25_00 21_00 24_00
 INT_R.FAN_ALT0.NE2END0 origin:050-pip-seed !22_00 !23_00 !25_00 18_01 24_00
 INT_R.FAN_ALT0.NL1END0 origin:050-pip-seed !22_00 19_01 23_00 24_00 25_00
 INT_R.FAN_ALT0.NN2END0 origin:050-pip-seed !22_00 !23_00 !24_00 18_01 25_00
@@ -2609,7 +2609,7 @@
 INT_R.NW6BEG0.NW2END0 origin:050-pip-seed 02_02 03_02
 INT_R.NW6BEG0.NW6END0 origin:050-pip-seed 02_02 07_03
 INT_R.NW6BEG0.SS2END_N0_3 origin:050-pip-seed 02_03 04_00
-INT_R.NW6BEG0.SS6END_N0_3 origin:056-pip-rem 04_00 07_03
+INT_R.NW6BEG0.SS6END_N0_3 origin:050-pip-seed 04_00 07_03
 INT_R.NW6BEG0.SW2END_N0_3 origin:050-pip-seed 03_02 04_00
 INT_R.NW6BEG0.SW6END_N0_3 origin:050-pip-seed 04_00 04_03
 INT_R.NW6BEG0.WW2END_N0_3 origin:050-pip-seed 02_02 02_03
@@ -2827,7 +2827,7 @@
 INT_R.SE6BEG3.NE2END3 origin:050-pip-seed 03_58 04_56
 INT_R.SE6BEG3.NE6END3 origin:050-pip-seed 04_56 04_59
 INT_R.SE6BEG3.NN2END3 origin:050-pip-seed 02_59 04_56
-INT_R.SE6BEG3.NN6END3 origin:050-pip-seed 04_56 07_59
+INT_R.SE6BEG3.NN6END3 origin:056-pip-rem 04_56 07_59
 INT_R.SE6BEG3.SE2END3 origin:050-pip-seed 02_58 03_58
 INT_R.SE6BEG3.SE6END3 origin:050-pip-seed 02_58 07_59
 INT_R.SE6BEG3.SS2END3 origin:050-pip-seed 02_59 05_58