diff --git a/Info.md b/Info.md
index 5474507..1c4e92d 100644
--- a/Info.md
+++ b/Info.md
@@ -37,20 +37,20 @@
 
 # Details
 
-Last updated on Wed 05 May 2021 12:00:52 PM UTC (2021-05-05T12:00:52+00:00).
+Last updated on Wed 23 Jun 2021 04:57:09 PM UTC (2021-06-23T16:57:09+00:00).
 
-Created using [Project X-Ray](https://github.com/SymbiFlow/prjxray) version [80726cb7](https://github.com/SymbiFlow/prjxray/commit/80726cb73ba5c156549d98a2055f1ee3eff94530).
+Created using [Project X-Ray](https://github.com/SymbiFlow/prjxray) version [6e6bff0b](https://github.com/SymbiFlow/prjxray/commit/6e6bff0b160e6417da1bd9332f1ebf7ed52bc913).
 
 Latest commit was;
 ```
-commit 80726cb73ba5c156549d98a2055f1ee3eff94530
-Merge: 66d357b9 ce6470cb
-Author: Tim Ansell <tansell@google.com>
-Date:   Sun May 2 10:48:11 2021 -0700
+commit 6e6bff0b160e6417da1bd9332f1ebf7ed52bc913
+Merge: da7bf6a0 769645f0
+Author: Alessandro Comodi <44773360+acomodi@users.noreply.github.com>
+Date:   Wed Jun 16 09:42:17 2021 +0200
 
-    Merge pull request #1538 from SymbiFlow/dependabot/submodules/third_party/yaml-cpp-a6bbe0e
+    Merge pull request #1692 from antmicro/fix-pll-clkfb
     
-    Bump third_party/yaml-cpp from `33316d5` to `a6bbe0e`
+    034-cmt: fix conflicting PIPs
 ```
 
 
@@ -59,7 +59,7 @@
 
 ### Settings
 
-Created using following [settings/artix7.sh (sha256: fc677f338196f4cecea5f963feb41c09d281505828d0cde9740f2a4bb305532a)](https://github.com/SymbiFlow/prjxray/blob/80726cb73ba5c156549d98a2055f1ee3eff94530/settings/artix7.sh)
+Created using following [settings/artix7.sh (sha256: fc677f338196f4cecea5f963feb41c09d281505828d0cde9740f2a4bb305532a)](https://github.com/SymbiFlow/prjxray/blob/6e6bff0b160e6417da1bd9332f1ebf7ed52bc913/settings/artix7.sh)
 ```shell
 #!/bin/bash
 # Copyright (C) 2017-2020  The Project X-Ray Authors.
@@ -302,8 +302,8 @@
  * [`eb47f86d4be61c185bb3f390d742a99ea9e4577d6ffa225c2c0f4835b4f8a920  ./artix7/segbits_cmt_top_l_upper_t.origin_info.db`](./artix7/segbits_cmt_top_l_upper_t.origin_info.db)
  * [`4a350d31eb78785fbd6b65044c02d623d6f787606c31a2f01a2efaf9cc2daad7  ./artix7/segbits_cmt_top_r_lower_b.db`](./artix7/segbits_cmt_top_r_lower_b.db)
  * [`e712f48558e63ca7b078df3c357344b7977797a47b560f6b65bc953cfc93b815  ./artix7/segbits_cmt_top_r_lower_b.origin_info.db`](./artix7/segbits_cmt_top_r_lower_b.origin_info.db)
- * [`6be3a84f654fa195720e2bde7e227711f9798afc48ec680cca57dd0810871cb9  ./artix7/segbits_cmt_top_r_upper_t.db`](./artix7/segbits_cmt_top_r_upper_t.db)
- * [`882c5ed49538c83baed0003b8e3108e3c69d5324866c0566ce9f9160b5293f3f  ./artix7/segbits_cmt_top_r_upper_t.origin_info.db`](./artix7/segbits_cmt_top_r_upper_t.origin_info.db)
+ * [`f21548e8dcb3f9b2887f0521499998399af78075fa3632e1f0af2e3c7a6aeeb9  ./artix7/segbits_cmt_top_r_upper_t.db`](./artix7/segbits_cmt_top_r_upper_t.db)
+ * [`e6d131d9e039302a602e846a0c3dfc06439b9593d3ab0e5e814847a4254fa5ab  ./artix7/segbits_cmt_top_r_upper_t.origin_info.db`](./artix7/segbits_cmt_top_r_upper_t.origin_info.db)
  * [`81e0623ff13a253e3f9303de3d5dfbcf2fc92cf5cba277bd7de69e70c3c527e3  ./artix7/segbits_dsp_l.db`](./artix7/segbits_dsp_l.db)
  * [`18cfd5dd8f59ca704cabeeddb2365486c755185b16a41714cc18ad08818c4f62  ./artix7/segbits_dsp_l.origin_info.db`](./artix7/segbits_dsp_l.origin_info.db)
  * [`5297906aaafefd3be356682dc03cc4f8c85d0ec238a7d66bafc8b1b50a6c0c96  ./artix7/segbits_dsp_r.db`](./artix7/segbits_dsp_r.db)
@@ -355,9 +355,9 @@
  * [`51288ec0be63172fcb2a12a92853150c62a21e894c2d42a2586046c462bf57a9  ./artix7/segbits_hclk_r.db`](./artix7/segbits_hclk_r.db)
  * [`61d05145f3613042e8f0c1d97d63f6c185cfb66df609b621b44422ebb27c77a0  ./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)
- * [`987bd62b389ec40b9e56826997018f4014c54ae27f964ec342b97cb6fe653a41  ./artix7/segbits_int_l.origin_info.db`](./artix7/segbits_int_l.origin_info.db)
+ * [`20c5e98e8cdcc702225d020f94cc067c03f80e8fcc974769354e6932ca407c98  ./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)
- * [`02f535625c43324a23c50887b6e0f4c32edb0650400ec0203ed674cdf5693e79  ./artix7/segbits_int_r.origin_info.db`](./artix7/segbits_int_r.origin_info.db)
+ * [`ec2b8db5e39fb545b0364e32d5101ca6cdd47b6c8533e37eb53ec7f26c50270f  ./artix7/segbits_int_r.origin_info.db`](./artix7/segbits_int_r.origin_info.db)
  * [`432e956da48016ba647631ff91975eb501f98e3961330bdaa35c686d780300d9  ./artix7/segbits_liob33.db`](./artix7/segbits_liob33.db)
  * [`606867ace72307cf773d819f40696862301419fda3d6d748746d2bfc58579731  ./artix7/segbits_liob33.origin_info.db`](./artix7/segbits_liob33.origin_info.db)
  * [`d369c1e614ef6ab1a464c0ab01d07456f73e88ca5a0c3c0dc524bb3b4f4364ff  ./artix7/segbits_lioi3.db`](./artix7/segbits_lioi3.db)
@@ -882,7 +882,7 @@
 
 ### Settings
 
-Created using following [settings/kintex7.sh (sha256: 26dfa36e49b4528298fc43411d654aa647076ce8160f4d8cfe71727594eb3848)](https://github.com/SymbiFlow/prjxray/blob/80726cb73ba5c156549d98a2055f1ee3eff94530/settings/kintex7.sh)
+Created using following [settings/kintex7.sh (sha256: 26dfa36e49b4528298fc43411d654aa647076ce8160f4d8cfe71727594eb3848)](https://github.com/SymbiFlow/prjxray/blob/6e6bff0b160e6417da1bd9332f1ebf7ed52bc913/settings/kintex7.sh)
 ```shell
 # Copyright (C) 2017-2020  The Project X-Ray Authors.
 #
@@ -1057,8 +1057,8 @@
  * [`7e121848ca4a34942ed87fa352db9b9ec41ddf4f420de235633367e6c0494962  ./kintex7/segbits_cmt_top_l_upper_t.origin_info.db`](./kintex7/segbits_cmt_top_l_upper_t.origin_info.db)
  * [`4a350d31eb78785fbd6b65044c02d623d6f787606c31a2f01a2efaf9cc2daad7  ./kintex7/segbits_cmt_top_r_lower_b.db`](./kintex7/segbits_cmt_top_r_lower_b.db)
  * [`e712f48558e63ca7b078df3c357344b7977797a47b560f6b65bc953cfc93b815  ./kintex7/segbits_cmt_top_r_lower_b.origin_info.db`](./kintex7/segbits_cmt_top_r_lower_b.origin_info.db)
- * [`8f938e8163274dc2b39298c571bc6f35bc65ae6e1b6314803ccfc3bb1eb6cf4e  ./kintex7/segbits_cmt_top_r_upper_t.db`](./kintex7/segbits_cmt_top_r_upper_t.db)
- * [`cca311d41050776907fd73cf41d1933287b65dfd291f3072a6923ad0fc222067  ./kintex7/segbits_cmt_top_r_upper_t.origin_info.db`](./kintex7/segbits_cmt_top_r_upper_t.origin_info.db)
+ * [`52b08bfbce71785306508bf094566b79906dd81d303795d1d393e2ff110310a6  ./kintex7/segbits_cmt_top_r_upper_t.db`](./kintex7/segbits_cmt_top_r_upper_t.db)
+ * [`20eb50725d47f85d2cabf6960814a5fad7a748ad5d5e8e2f3b7ac71e0403cf17  ./kintex7/segbits_cmt_top_r_upper_t.origin_info.db`](./kintex7/segbits_cmt_top_r_upper_t.origin_info.db)
  * [`81e0623ff13a253e3f9303de3d5dfbcf2fc92cf5cba277bd7de69e70c3c527e3  ./kintex7/segbits_dsp_l.db`](./kintex7/segbits_dsp_l.db)
  * [`18cfd5dd8f59ca704cabeeddb2365486c755185b16a41714cc18ad08818c4f62  ./kintex7/segbits_dsp_l.origin_info.db`](./kintex7/segbits_dsp_l.origin_info.db)
  * [`5297906aaafefd3be356682dc03cc4f8c85d0ec238a7d66bafc8b1b50a6c0c96  ./kintex7/segbits_dsp_r.db`](./kintex7/segbits_dsp_r.db)
@@ -1074,9 +1074,9 @@
  * [`51288ec0be63172fcb2a12a92853150c62a21e894c2d42a2586046c462bf57a9  ./kintex7/segbits_hclk_r.db`](./kintex7/segbits_hclk_r.db)
  * [`61d05145f3613042e8f0c1d97d63f6c185cfb66df609b621b44422ebb27c77a0  ./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)
- * [`40c1a9a073f9d0d5ff8aed7687ab2d1e6223bf5441bcbaab614347bd743937cf  ./kintex7/segbits_int_l.origin_info.db`](./kintex7/segbits_int_l.origin_info.db)
+ * [`032cd8747af65ede08cf07e3f0d53c218e5cf1623003f2411dd9fa57e56c2649  ./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)
- * [`f1cfa773b3bc404484d8eae833956971834fadb4c833f4be9aaea7c5342e6287  ./kintex7/segbits_int_r.origin_info.db`](./kintex7/segbits_int_r.origin_info.db)
+ * [`d0ba2a1820b865c6bc448646495a582b055a0f7c2d75eb5d6330f4003208b259  ./kintex7/segbits_int_r.origin_info.db`](./kintex7/segbits_int_r.origin_info.db)
  * [`432e956da48016ba647631ff91975eb501f98e3961330bdaa35c686d780300d9  ./kintex7/segbits_liob33.db`](./kintex7/segbits_liob33.db)
  * [`606867ace72307cf773d819f40696862301419fda3d6d748746d2bfc58579731  ./kintex7/segbits_liob33.origin_info.db`](./kintex7/segbits_liob33.origin_info.db)
  * [`d369c1e614ef6ab1a464c0ab01d07456f73e88ca5a0c3c0dc524bb3b4f4364ff  ./kintex7/segbits_lioi3.db`](./kintex7/segbits_lioi3.db)
@@ -1315,7 +1315,7 @@
 
 ### Settings
 
-Created using following [settings/zynq7.sh (sha256: d3953bf67abbbaa760df1dd60a71f2edf66da37e2bf63220a70fada25188d3c9)](https://github.com/SymbiFlow/prjxray/blob/80726cb73ba5c156549d98a2055f1ee3eff94530/settings/zynq7.sh)
+Created using following [settings/zynq7.sh (sha256: d3953bf67abbbaa760df1dd60a71f2edf66da37e2bf63220a70fada25188d3c9)](https://github.com/SymbiFlow/prjxray/blob/6e6bff0b160e6417da1bd9332f1ebf7ed52bc913/settings/zynq7.sh)
 ```shell
 # Copyright (C) 2017-2020  The Project X-Ray Authors.
 #
@@ -1499,8 +1499,8 @@
  * [`7e121848ca4a34942ed87fa352db9b9ec41ddf4f420de235633367e6c0494962  ./zynq7/segbits_cmt_top_l_upper_t.origin_info.db`](./zynq7/segbits_cmt_top_l_upper_t.origin_info.db)
  * [`316ec3a054a9bb371a9315aaf7e7ee2a351ef43098fc4510880e332d6286c90e  ./zynq7/segbits_cmt_top_r_lower_b.db`](./zynq7/segbits_cmt_top_r_lower_b.db)
  * [`db6e283a3f418b2e9c5c1946bdb7145183ed70b783018b0013ff04f676d37a47  ./zynq7/segbits_cmt_top_r_lower_b.origin_info.db`](./zynq7/segbits_cmt_top_r_lower_b.origin_info.db)
- * [`8f938e8163274dc2b39298c571bc6f35bc65ae6e1b6314803ccfc3bb1eb6cf4e  ./zynq7/segbits_cmt_top_r_upper_t.db`](./zynq7/segbits_cmt_top_r_upper_t.db)
- * [`cca311d41050776907fd73cf41d1933287b65dfd291f3072a6923ad0fc222067  ./zynq7/segbits_cmt_top_r_upper_t.origin_info.db`](./zynq7/segbits_cmt_top_r_upper_t.origin_info.db)
+ * [`52b08bfbce71785306508bf094566b79906dd81d303795d1d393e2ff110310a6  ./zynq7/segbits_cmt_top_r_upper_t.db`](./zynq7/segbits_cmt_top_r_upper_t.db)
+ * [`20eb50725d47f85d2cabf6960814a5fad7a748ad5d5e8e2f3b7ac71e0403cf17  ./zynq7/segbits_cmt_top_r_upper_t.origin_info.db`](./zynq7/segbits_cmt_top_r_upper_t.origin_info.db)
  * [`81e0623ff13a253e3f9303de3d5dfbcf2fc92cf5cba277bd7de69e70c3c527e3  ./zynq7/segbits_dsp_l.db`](./zynq7/segbits_dsp_l.db)
  * [`18cfd5dd8f59ca704cabeeddb2365486c755185b16a41714cc18ad08818c4f62  ./zynq7/segbits_dsp_l.origin_info.db`](./zynq7/segbits_dsp_l.origin_info.db)
  * [`5297906aaafefd3be356682dc03cc4f8c85d0ec238a7d66bafc8b1b50a6c0c96  ./zynq7/segbits_dsp_r.db`](./zynq7/segbits_dsp_r.db)
@@ -1516,9 +1516,9 @@
  * [`51288ec0be63172fcb2a12a92853150c62a21e894c2d42a2586046c462bf57a9  ./zynq7/segbits_hclk_r.db`](./zynq7/segbits_hclk_r.db)
  * [`61d05145f3613042e8f0c1d97d63f6c185cfb66df609b621b44422ebb27c77a0  ./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)
- * [`11988546d04551002a9db779e13f0de6ca1eb599478dc2b2a5a21e2985bd224a  ./zynq7/segbits_int_l.origin_info.db`](./zynq7/segbits_int_l.origin_info.db)
+ * [`55d9d49fac005b3df70e0bbf6fe869be9c7887918def9d0d1bd109158e4cc0e4  ./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)
- * [`a8633630ab6ae338839dbd2dec9d7374a597bd6d96e5482ad7e9e1af39e16b6b  ./zynq7/segbits_int_r.origin_info.db`](./zynq7/segbits_int_r.origin_info.db)
+ * [`8d45bc41d7f4217c9eee35d6f44058d15fd6bda822c0b76ba24f34c679dc7863  ./zynq7/segbits_int_r.origin_info.db`](./zynq7/segbits_int_r.origin_info.db)
  * [`432e956da48016ba647631ff91975eb501f98e3961330bdaa35c686d780300d9  ./zynq7/segbits_liob33.db`](./zynq7/segbits_liob33.db)
  * [`606867ace72307cf773d819f40696862301419fda3d6d748746d2bfc58579731  ./zynq7/segbits_liob33.origin_info.db`](./zynq7/segbits_liob33.origin_info.db)
  * [`d369c1e614ef6ab1a464c0ab01d07456f73e88ca5a0c3c0dc524bb3b4f4364ff  ./zynq7/segbits_lioi3.db`](./zynq7/segbits_lioi3.db)
diff --git a/artix7/segbits_cmt_top_r_upper_t.db b/artix7/segbits_cmt_top_r_upper_t.db
index 1e6ceaa..4f9ddef 100644
--- a/artix7/segbits_cmt_top_r_upper_t.db
+++ b/artix7/segbits_cmt_top_r_upper_t.db
@@ -1,22 +1,22 @@
-CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKFBIN.CMT_TOP_R_CLKFBOUT2IN !28_01 !28_02 !28_43 28_75 !28_76 !29_00 !29_01 !29_09 !29_10 !29_11 !29_12 !29_17 !29_18 !29_19 !29_20 !29_42 !29_43 29_74 29_75
-CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKFBIN.CMT_TOP_R_UPPER_T_CLKFBIN !28_01 !28_02 !28_43 !28_75 28_76 !29_00 !29_01 !29_09 !29_10 !29_11 !29_12 !29_17 !29_18 !29_19 !29_20 !29_42 29_43 !29_74 !29_75
-CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKFBIN.CMT_TOP_R_UPPER_T_FREQ_BB0 !28_01 !28_02 !28_43 !28_75 28_76 29_00 !29_01 29_09 !29_10 !29_11 !29_12 29_17 !29_18 !29_19 !29_20 !29_42 !29_43 !29_74 !29_75
-CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKFBIN.CMT_TOP_R_UPPER_T_FREQ_BB1 28_01 !28_02 !28_43 !28_75 28_76 !29_00 !29_01 !29_09 29_10 !29_11 !29_12 !29_17 29_18 !29_19 !29_20 29_42 !29_43 !29_74 !29_75
-CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKFBIN.CMT_TOP_R_UPPER_T_FREQ_BB2 !28_01 !28_02 28_43 !28_75 28_76 !29_00 29_01 !29_09 !29_10 29_11 !29_12 !29_17 !29_18 29_19 !29_20 !29_42 !29_43 !29_74 !29_75
-CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKFBIN.CMT_TOP_R_UPPER_T_FREQ_BB3 !28_01 28_02 28_43 !28_75 28_76 !29_00 !29_01 !29_09 !29_10 !29_11 29_12 !29_17 !29_18 !29_19 29_20 29_42 !29_43 !29_74 !29_75
-CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKFBIN.CMT_TOP_R_UPPER_T_PLLE2_CLK_FB_INT !28_01 !28_02 !28_43 !28_75 28_76 !29_00 !29_01 !29_09 !29_10 !29_11 !29_12 !29_17 !29_18 !29_19 !29_20 29_42 29_43 !29_74 !29_75
-CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN1.CMT_TOP_R_UPPER_T_FREQ_BB0 !28_01 !28_02 !28_41 !28_42 29_00 !29_01 29_09 !29_10 !29_11 !29_12 29_17 !29_18 !29_19 !29_20 !29_41
-CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN1.CMT_TOP_R_UPPER_T_FREQ_BB1 28_01 !28_02 28_41 !28_42 !29_00 !29_01 !29_09 29_10 !29_11 !29_12 !29_17 29_18 !29_19 !29_20 !29_41
-CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN1.CMT_TOP_R_UPPER_T_FREQ_BB2 !28_01 !28_02 !28_41 !28_42 !29_00 29_01 !29_09 !29_10 29_11 !29_12 !29_17 !29_18 29_19 !29_20 29_41
-CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN1.CMT_TOP_R_UPPER_T_FREQ_BB3 !28_01 28_02 28_41 !28_42 !29_00 !29_01 !29_09 !29_10 !29_11 29_12 !29_17 !29_18 !29_19 29_20 29_41
-CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN1.CMT_TOP_R_UPPER_T_CLKIN1 !28_01 !28_02 !28_41 28_42 !29_00 !29_01 !29_09 !29_10 !29_11 !29_12 !29_17 !29_18 !29_19 !29_20 !29_41
-CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN1.CMT_TOP_R_UPPER_T_PLLE2_CLK_IN1_INT !28_01 !28_02 28_41 28_42 !29_00 !29_01 !29_09 !29_10 !29_11 !29_12 !29_17 !29_18 !29_19 !29_20 !29_41
-CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN2.CMT_TOP_R_UPPER_T_FREQ_BB0 !28_01 !28_02 !28_40 29_00 !29_01 29_09 !29_10 !29_11 !29_12 29_17 !29_18 !29_19 !29_20 !29_39 !29_40
-CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN2.CMT_TOP_R_UPPER_T_FREQ_BB1 28_01 !28_02 !28_40 !29_00 !29_01 !29_09 29_10 !29_11 !29_12 !29_17 29_18 !29_19 !29_20 29_39 !29_40
-CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN2.CMT_TOP_R_UPPER_T_FREQ_BB2 !28_01 !28_02 28_40 !29_00 29_01 !29_09 !29_10 29_11 !29_12 !29_17 !29_18 29_19 !29_20 !29_39 !29_40
-CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN2.CMT_TOP_R_UPPER_T_FREQ_BB3 !28_01 28_02 28_40 !29_00 !29_01 !29_09 !29_10 !29_11 29_12 !29_17 !29_18 !29_19 29_20 29_39 !29_40
-CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN2.CMT_TOP_R_UPPER_T_CLKIN2 !28_01 !28_02 !28_40 !29_00 !29_01 !29_09 !29_10 !29_11 !29_12 !29_17 !29_18 !29_19 !29_20 !29_39 29_40
-CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN2.CMT_TOP_R_UPPER_T_PLLE2_CLK_IN2_INT !28_01 !28_02 !28_40 !29_00 !29_01 !29_09 !29_10 !29_11 !29_12 !29_17 !29_18 !29_19 !29_20 29_39 29_40
+CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKFBIN.CMT_TOP_R_CLKFBOUT2IN !28_43 28_75 !28_76 !29_42 !29_43 29_74 29_75
+CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKFBIN.CMT_TOP_R_UPPER_T_CLKFBIN !28_43 !28_75 28_76 !29_42 29_43 !29_74 !29_75
+CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKFBIN.CMT_TOP_R_UPPER_T_FREQ_BB0 !28_43 !28_75 28_76 !29_42 !29_43 !29_74 !29_75
+CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKFBIN.CMT_TOP_R_UPPER_T_FREQ_BB1 !28_43 !28_75 28_76 29_42 !29_43 !29_74 !29_75
+CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKFBIN.CMT_TOP_R_UPPER_T_FREQ_BB2 28_43 !28_75 28_76 !29_42 !29_43 !29_74 !29_75
+CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKFBIN.CMT_TOP_R_UPPER_T_FREQ_BB3 28_43 !28_75 28_76 29_42 !29_43 !29_74 !29_75
+CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKFBIN.CMT_TOP_R_UPPER_T_PLLE2_CLK_FB_INT !28_43 !28_75 28_76 29_42 29_43 !29_74 !29_75
+CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN1.CMT_TOP_R_UPPER_T_FREQ_BB0 !28_41 !28_42 !29_41
+CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN1.CMT_TOP_R_UPPER_T_FREQ_BB1 28_41 !28_42 !29_41
+CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN1.CMT_TOP_R_UPPER_T_FREQ_BB2 !28_41 !28_42 29_41
+CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN1.CMT_TOP_R_UPPER_T_FREQ_BB3 28_41 !28_42 29_41
+CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN1.CMT_TOP_R_UPPER_T_CLKIN1 !28_41 28_42 !29_41
+CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN1.CMT_TOP_R_UPPER_T_PLLE2_CLK_IN1_INT 28_41 28_42 !29_41
+CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN2.CMT_TOP_R_UPPER_T_FREQ_BB0 !28_40 !29_39 !29_40
+CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN2.CMT_TOP_R_UPPER_T_FREQ_BB1 !28_40 29_39 !29_40
+CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN2.CMT_TOP_R_UPPER_T_FREQ_BB2 28_40 !29_39 !29_40
+CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN2.CMT_TOP_R_UPPER_T_FREQ_BB3 28_40 29_39 !29_40
+CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN2.CMT_TOP_R_UPPER_T_CLKIN2 !28_40 !29_39 29_40
+CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN2.CMT_TOP_R_UPPER_T_PLLE2_CLK_IN2_INT !28_40 29_39 29_40
 CMT_TOP_R_UPPER_T.PLL_CLK_FREQ_BB0_NS_ACTIVE 29_00 29_09 29_17
 CMT_TOP_R_UPPER_T.PLL_CLK_FREQ_BB1_NS_ACTIVE 28_01 29_10 29_18
 CMT_TOP_R_UPPER_T.PLL_CLK_FREQ_BB2_NS_ACTIVE 29_01 29_11 29_19
diff --git a/artix7/segbits_cmt_top_r_upper_t.origin_info.db b/artix7/segbits_cmt_top_r_upper_t.origin_info.db
index 4b0df8c..91e79a7 100644
--- a/artix7/segbits_cmt_top_r_upper_t.origin_info.db
+++ b/artix7/segbits_cmt_top_r_upper_t.origin_info.db
@@ -1,22 +1,22 @@
-CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKFBIN.CMT_TOP_R_CLKFBOUT2IN origin:034-cmt-pll-pips !28_01 !28_02 !28_43 !28_76 !29_00 !29_01 !29_09 !29_10 !29_11 !29_12 !29_17 !29_18 !29_19 !29_20 !29_42 !29_43 28_75 29_74 29_75
-CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKFBIN.CMT_TOP_R_UPPER_T_CLKFBIN origin:034-cmt-pll-pips !28_01 !28_02 !28_43 !28_75 !29_00 !29_01 !29_09 !29_10 !29_11 !29_12 !29_17 !29_18 !29_19 !29_20 !29_42 !29_74 !29_75 28_76 29_43
-CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKFBIN.CMT_TOP_R_UPPER_T_FREQ_BB0 origin:034-cmt-pll-pips !28_01 !28_02 !28_43 !28_75 !29_01 !29_10 !29_11 !29_12 !29_18 !29_19 !29_20 !29_42 !29_43 !29_74 !29_75 28_76 29_00 29_09 29_17
-CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKFBIN.CMT_TOP_R_UPPER_T_FREQ_BB1 origin:034-cmt-pll-pips !28_02 !28_43 !28_75 !29_00 !29_01 !29_09 !29_11 !29_12 !29_17 !29_19 !29_20 !29_43 !29_74 !29_75 28_01 28_76 29_10 29_18 29_42
-CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKFBIN.CMT_TOP_R_UPPER_T_FREQ_BB2 origin:034-cmt-pll-pips !28_01 !28_02 !28_75 !29_00 !29_09 !29_10 !29_12 !29_17 !29_18 !29_20 !29_42 !29_43 !29_74 !29_75 28_43 28_76 29_01 29_11 29_19
-CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKFBIN.CMT_TOP_R_UPPER_T_FREQ_BB3 origin:034-cmt-pll-pips !28_01 !28_75 !29_00 !29_01 !29_09 !29_10 !29_11 !29_17 !29_18 !29_19 !29_43 !29_74 !29_75 28_02 28_43 28_76 29_12 29_20 29_42
-CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKFBIN.CMT_TOP_R_UPPER_T_PLLE2_CLK_FB_INT origin:034-cmt-pll-pips !28_01 !28_02 !28_43 !28_75 !29_00 !29_01 !29_09 !29_10 !29_11 !29_12 !29_17 !29_18 !29_19 !29_20 !29_74 !29_75 28_76 29_42 29_43
-CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN1.CMT_TOP_R_UPPER_T_FREQ_BB0 origin:034-cmt-pll-pips !28_01 !28_02 !28_41 !28_42 !29_01 !29_10 !29_11 !29_12 !29_18 !29_19 !29_20 !29_41 29_00 29_09 29_17
-CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN1.CMT_TOP_R_UPPER_T_FREQ_BB1 origin:034-cmt-pll-pips !28_02 !28_42 !29_00 !29_01 !29_09 !29_11 !29_12 !29_17 !29_19 !29_20 !29_41 28_01 28_41 29_10 29_18
-CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN1.CMT_TOP_R_UPPER_T_FREQ_BB2 origin:034-cmt-pll-pips !28_01 !28_02 !28_41 !28_42 !29_00 !29_09 !29_10 !29_12 !29_17 !29_18 !29_20 29_01 29_11 29_19 29_41
-CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN1.CMT_TOP_R_UPPER_T_FREQ_BB3 origin:034-cmt-pll-pips !28_01 !28_42 !29_00 !29_01 !29_09 !29_10 !29_11 !29_17 !29_18 !29_19 28_02 28_41 29_12 29_20 29_41
-CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN1.CMT_TOP_R_UPPER_T_CLKIN1 origin:034-cmt-pll-pips !28_01 !28_02 !28_41 !29_00 !29_01 !29_09 !29_10 !29_11 !29_12 !29_17 !29_18 !29_19 !29_20 !29_41 28_42
-CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN1.CMT_TOP_R_UPPER_T_PLLE2_CLK_IN1_INT origin:034-cmt-pll-pips !28_01 !28_02 !29_00 !29_01 !29_09 !29_10 !29_11 !29_12 !29_17 !29_18 !29_19 !29_20 !29_41 28_41 28_42
-CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN2.CMT_TOP_R_UPPER_T_FREQ_BB0 origin:034-cmt-pll-pips !28_01 !28_02 !28_40 !29_01 !29_10 !29_11 !29_12 !29_18 !29_19 !29_20 !29_39 !29_40 29_00 29_09 29_17
-CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN2.CMT_TOP_R_UPPER_T_FREQ_BB1 origin:034-cmt-pll-pips !28_02 !28_40 !29_00 !29_01 !29_09 !29_11 !29_12 !29_17 !29_19 !29_20 !29_40 28_01 29_10 29_18 29_39
-CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN2.CMT_TOP_R_UPPER_T_FREQ_BB2 origin:034-cmt-pll-pips !28_01 !28_02 !29_00 !29_09 !29_10 !29_12 !29_17 !29_18 !29_20 !29_39 !29_40 28_40 29_01 29_11 29_19
-CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN2.CMT_TOP_R_UPPER_T_FREQ_BB3 origin:034-cmt-pll-pips !28_01 !29_00 !29_01 !29_09 !29_10 !29_11 !29_17 !29_18 !29_19 !29_40 28_02 28_40 29_12 29_20 29_39
-CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN2.CMT_TOP_R_UPPER_T_CLKIN2 origin:034-cmt-pll-pips !28_01 !28_02 !28_40 !29_00 !29_01 !29_09 !29_10 !29_11 !29_12 !29_17 !29_18 !29_19 !29_20 !29_39 29_40
-CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN2.CMT_TOP_R_UPPER_T_PLLE2_CLK_IN2_INT origin:034-cmt-pll-pips !28_01 !28_02 !28_40 !29_00 !29_01 !29_09 !29_10 !29_11 !29_12 !29_17 !29_18 !29_19 !29_20 29_39 29_40
+CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKFBIN.CMT_TOP_R_CLKFBOUT2IN origin:034-cmt-pll-pips !28_43 !28_76 !29_42 !29_43 28_75 29_74 29_75
+CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKFBIN.CMT_TOP_R_UPPER_T_CLKFBIN origin:034-cmt-pll-pips !28_43 !28_75 !29_42 !29_74 !29_75 28_76 29_43
+CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKFBIN.CMT_TOP_R_UPPER_T_FREQ_BB0 origin:034-cmt-pll-pips !28_43 !28_75 !29_42 !29_43 !29_74 !29_75 28_76
+CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKFBIN.CMT_TOP_R_UPPER_T_FREQ_BB1 origin:034-cmt-pll-pips !28_43 !28_75 !29_43 !29_74 !29_75 28_76 29_42
+CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKFBIN.CMT_TOP_R_UPPER_T_FREQ_BB2 origin:034-cmt-pll-pips !28_75 !29_42 !29_43 !29_74 !29_75 28_43 28_76
+CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKFBIN.CMT_TOP_R_UPPER_T_FREQ_BB3 origin:034-cmt-pll-pips !28_75 !29_43 !29_74 !29_75 28_43 28_76 29_42
+CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKFBIN.CMT_TOP_R_UPPER_T_PLLE2_CLK_FB_INT origin:034-cmt-pll-pips !28_43 !28_75 !29_74 !29_75 28_76 29_42 29_43
+CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN1.CMT_TOP_R_UPPER_T_FREQ_BB0 origin:034-cmt-pll-pips !28_41 !28_42 !29_41
+CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN1.CMT_TOP_R_UPPER_T_FREQ_BB1 origin:034-cmt-pll-pips !28_42 !29_41 28_41
+CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN1.CMT_TOP_R_UPPER_T_FREQ_BB2 origin:034-cmt-pll-pips !28_41 !28_42 29_41
+CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN1.CMT_TOP_R_UPPER_T_FREQ_BB3 origin:034-cmt-pll-pips !28_42 28_41 29_41
+CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN1.CMT_TOP_R_UPPER_T_CLKIN1 origin:034-cmt-pll-pips !28_41 !29_41 28_42
+CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN1.CMT_TOP_R_UPPER_T_PLLE2_CLK_IN1_INT origin:034-cmt-pll-pips !29_41 28_41 28_42
+CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN2.CMT_TOP_R_UPPER_T_FREQ_BB0 origin:034-cmt-pll-pips !28_40 !29_39 !29_40
+CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN2.CMT_TOP_R_UPPER_T_FREQ_BB1 origin:034-cmt-pll-pips !28_40 !29_40 29_39
+CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN2.CMT_TOP_R_UPPER_T_FREQ_BB2 origin:034-cmt-pll-pips !29_39 !29_40 28_40
+CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN2.CMT_TOP_R_UPPER_T_FREQ_BB3 origin:034-cmt-pll-pips !29_40 28_40 29_39
+CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN2.CMT_TOP_R_UPPER_T_CLKIN2 origin:034-cmt-pll-pips !28_40 !29_39 29_40
+CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN2.CMT_TOP_R_UPPER_T_PLLE2_CLK_IN2_INT origin:034-cmt-pll-pips !28_40 29_39 29_40
 CMT_TOP_R_UPPER_T.PLL_CLK_FREQ_BB0_NS_ACTIVE origin:034-cmt-pll-pips 29_00 29_09 29_17
 CMT_TOP_R_UPPER_T.PLL_CLK_FREQ_BB1_NS_ACTIVE origin:034-cmt-pll-pips 28_01 29_10 29_18
 CMT_TOP_R_UPPER_T.PLL_CLK_FREQ_BB2_NS_ACTIVE origin:034-cmt-pll-pips 29_01 29_11 29_19
diff --git a/artix7/segbits_int_l.origin_info.db b/artix7/segbits_int_l.origin_info.db
index a07ae13..6418a8f 100644
--- a/artix7/segbits_int_l.origin_info.db
+++ b/artix7/segbits_int_l.origin_info.db
@@ -170,7 +170,7 @@
 INT_L.BYP_ALT7.BYP_BOUNCE6 origin:050-pip-seed !22_63 !23_63 !25_63 21_63 24_63
 INT_L.BYP_ALT7.EL1END_S3_0 origin:050-pip-seed !23_63 17_63 22_63 24_63 25_63
 INT_L.BYP_ALT7.FAN_BOUNCE_S3_4 origin:050-pip-seed !23_63 21_63 22_63 24_63 25_63
-INT_L.BYP_ALT7.FAN_BOUNCE_S3_6 origin:050-pip-seed !22_63 21_63 23_63 24_63 25_63
+INT_L.BYP_ALT7.FAN_BOUNCE_S3_6 origin:056-pip-rem !22_63 21_63 23_63 24_63 25_63
 INT_L.BYP_ALT7.LOGIC_OUTS_L3 origin:051-pip-imuxlout-bypalts !22_63 20_63 23_63 24_63 25_63
 INT_L.BYP_ALT7.LOGIC_OUTS_L15 origin:051-pip-imuxlout-bypalts !23_63 20_63 22_63 24_63 25_63
 INT_L.BYP_ALT7.LOGIC_OUTS_L21 origin:051-pip-imuxlout-bypalts !22_63 !23_63 !24_63 20_63 25_63
@@ -396,7 +396,7 @@
 INT_L.FAN_ALT4.FAN_BOUNCE7 origin:056-pip-rem !22_08 20_08 23_08 24_08 25_08
 INT_L.FAN_ALT4.LOGIC_OUTS_L4 origin:050-pip-seed !23_08 21_08 22_08 24_08 25_08
 INT_L.FAN_ALT4.LOGIC_OUTS_L8 origin:050-pip-seed !22_08 21_08 23_08 24_08 25_08
-INT_L.FAN_ALT4.LOGIC_OUTS_L18 origin:050-pip-seed !22_08 !23_08 !25_08 21_08 24_08
+INT_L.FAN_ALT4.LOGIC_OUTS_L18 origin:056-pip-rem !22_08 !23_08 !25_08 21_08 24_08
 INT_L.FAN_ALT4.SR1BEG_S0 origin:050-pip-seed !23_08 19_09 22_08 24_08 25_08
 INT_L.FAN_ALT4.EE2END0 origin:050-pip-seed !22_08 !23_08 !24_08 16_08 25_08
 INT_L.FAN_ALT4.EL1END0 origin:050-pip-seed !22_08 16_08 23_08 24_08 25_08
@@ -2253,7 +2253,7 @@
 INT_L.NE6BEG2.SE2END2 origin:050-pip-seed 02_37 05_39
 INT_L.NE6BEG2.SE6END2 origin:050-pip-seed 05_39 06_36
 INT_L.NE6BEG2.WW2END1 origin:050-pip-seed 03_36 04_37
-INT_L.NE6BEG2.WW4END2 origin:050-pip-seed 04_37 05_36
+INT_L.NE6BEG2.WW4END2 origin:056-pip-rem 04_37 05_36
 INT_L.NE6BEG3.LOGIC_OUTS_L3 origin:050-pip-seed 02_53 04_54
 INT_L.NE6BEG3.LOGIC_OUTS_L7 origin:050-pip-seed 02_53 07_53
 INT_L.NE6BEG3.LOGIC_OUTS_L11 origin:050-pip-seed 03_52 07_53
@@ -2887,7 +2887,7 @@
 INT_L.SE6BEG3.NE2END3 origin:050-pip-seed 03_58 04_56
 INT_L.SE6BEG3.NE6END3 origin:050-pip-seed 04_56 04_59
 INT_L.SE6BEG3.NN2END3 origin:050-pip-seed 02_59 04_56
-INT_L.SE6BEG3.NN6END3 origin:056-pip-rem 04_56 07_59
+INT_L.SE6BEG3.NN6END3 origin:050-pip-seed 04_56 07_59
 INT_L.SE6BEG3.SE2END3 origin:050-pip-seed 02_58 03_58
 INT_L.SE6BEG3.SE6END3 origin:050-pip-seed 02_58 07_59
 INT_L.SE6BEG3.SS2END3 origin:050-pip-seed 02_59 05_58
@@ -3323,7 +3323,7 @@
 INT_L.SW6BEG2.LVB_L0 origin:056-pip-rem 04_46 05_44
 INT_L.SW6BEG2.LVB_L12 origin:056-pip-rem 05_44 07_45
 INT_L.SW6BEG2.EE2END2 origin:050-pip-seed 03_44 04_45
-INT_L.SW6BEG2.EE4END2 origin:056-pip-rem 04_45 05_44
+INT_L.SW6BEG2.EE4END2 origin:050-pip-seed 04_45 05_44
 INT_L.SW6BEG2.NW2END3 origin:050-pip-seed 02_45 05_47
 INT_L.SW6BEG2.NW6END3 origin:050-pip-seed 05_47 06_44
 INT_L.SW6BEG2.SE2END2 origin:050-pip-seed 02_45 04_45
@@ -3345,7 +3345,7 @@
 INT_L.SW6BEG3.NW6END_S0_0 origin:050-pip-seed 05_63 06_60
 INT_L.SW6BEG3.WW4END_S0_0 origin:050-pip-seed 05_60 05_63
 INT_L.SW6BEG3.EE2END3 origin:050-pip-seed 03_60 04_61
-INT_L.SW6BEG3.EE4END3 origin:050-pip-seed 04_61 05_60
+INT_L.SW6BEG3.EE4END3 origin:056-pip-rem 04_61 05_60
 INT_L.SW6BEG3.LH0 origin:056-pip-rem 04_62 05_60
 INT_L.SW6BEG3.SE2END3 origin:050-pip-seed 02_61 04_61
 INT_L.SW6BEG3.SE6END3 origin:050-pip-seed 04_61 06_60
diff --git a/artix7/segbits_int_r.origin_info.db b/artix7/segbits_int_r.origin_info.db
index 06d8666..6c0b44c 100644
--- a/artix7/segbits_int_r.origin_info.db
+++ b/artix7/segbits_int_r.origin_info.db
@@ -328,8 +328,8 @@
 INT_R.FAN_ALT3.WW2END3 origin:050-pip-seed !22_56 !23_56 !24_56 19_57 25_56
 INT_R.FAN_ALT4.BYP_BOUNCE_N3_3 origin:059-pip-byp-bounce !22_08 !23_08 !24_08 20_08 25_08
 INT_R.FAN_ALT4.BYP_BOUNCE_N3_7 origin:059-pip-byp-bounce !22_08 !23_08 !25_08 20_08 24_08
-INT_R.FAN_ALT4.FAN_BOUNCE2 origin:056-pip-rem !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_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.LOGIC_OUTS4 origin:050-pip-seed !23_08 21_08 22_08 24_08 25_08
 INT_R.FAN_ALT4.LOGIC_OUTS8 origin:050-pip-seed !22_08 21_08 23_08 24_08 25_08
 INT_R.FAN_ALT4.LOGIC_OUTS18 origin:050-pip-seed !22_08 !23_08 !25_08 21_08 24_08
@@ -2273,7 +2273,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:056-pip-rem 04_53 05_52
+INT_R.NE6BEG3.WW4END3 origin:050-pip-seed 04_53 05_52
 INT_R.NL1BEG0.LOGIC_OUTS1 origin:050-pip-seed 07_16 14_17
 INT_R.NL1BEG0.LOGIC_OUTS5 origin:050-pip-seed 11_17 14_17
 INT_R.NL1BEG0.LOGIC_OUTS9 origin:050-pip-seed 10_17 13_17
@@ -2491,7 +2491,7 @@
 INT_R.NN6BEG3.NW2END3 origin:050-pip-seed 03_54 04_52
 INT_R.NN6BEG3.NW6END3 origin:050-pip-seed 04_52 07_55
 INT_R.NN6BEG3.SE2END3 origin:050-pip-seed 03_54 05_54
-INT_R.NN6BEG3.SE6END3 origin:050-pip-seed 05_54 07_55
+INT_R.NN6BEG3.SE6END3 origin:056-pip-rem 05_54 07_55
 INT_R.NN6BEG3.WW2END2 origin:050-pip-seed 02_55 04_52
 INT_R.NN6BEG3.WW4END3 origin:050-pip-seed 04_52 04_55
 INT_R.NR1BEG0.LOGIC_OUTS0 origin:050-pip-seed 11_07 14_07
@@ -3344,7 +3344,7 @@
 INT_R.SW6BEG3.NW6END_S0_0 origin:050-pip-seed 05_63 06_60
 INT_R.SW6BEG3.WW4END_S0_0 origin:050-pip-seed 05_60 05_63
 INT_R.SW6BEG3.EE2END3 origin:050-pip-seed 03_60 04_61
-INT_R.SW6BEG3.EE4END3 origin:050-pip-seed 04_61 05_60
+INT_R.SW6BEG3.EE4END3 origin:056-pip-rem 04_61 05_60
 INT_R.SW6BEG3.LH0 origin:056-pip-rem 04_62 05_60
 INT_R.SW6BEG3.LV18 origin:056-pip-rem 05_60 07_61
 INT_R.SW6BEG3.SE2END3 origin:050-pip-seed 02_61 04_61
@@ -3603,7 +3603,7 @@
 INT_R.WW4BEG2.LVB0 origin:056-pip-rem 04_34 05_32
 INT_R.WW4BEG2.LVB12 origin:056-pip-rem 05_32 07_33
 INT_R.WW4BEG2.NE2END2 origin:050-pip-seed 02_33 05_35
-INT_R.WW4BEG2.NE6END2 origin:050-pip-seed 05_32 05_35
+INT_R.WW4BEG2.NE6END2 origin:056-pip-rem 05_32 05_35
 INT_R.WW4BEG2.NN2END2 origin:050-pip-seed 03_32 05_35
 INT_R.WW4BEG2.NN6END2 origin:050-pip-seed 05_35 06_32
 INT_R.WW4BEG2.NW2END2 origin:050-pip-seed 02_33 03_33
diff --git a/kintex7/segbits_cmt_top_r_upper_t.db b/kintex7/segbits_cmt_top_r_upper_t.db
index eff93ea..7f2aa4d 100644
--- a/kintex7/segbits_cmt_top_r_upper_t.db
+++ b/kintex7/segbits_cmt_top_r_upper_t.db
@@ -1,22 +1,22 @@
-CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKFBIN.CMT_TOP_R_CLKFBOUT2IN !28_01 !28_02 !28_43 28_75 !28_76 !29_00 !29_01 !29_09 !29_10 !29_11 !29_12 !29_17 !29_18 !29_19 !29_20 !29_42 !29_43 29_74 29_75
-CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKFBIN.CMT_TOP_R_UPPER_T_CLKFBIN !28_01 !28_02 !28_43 !28_75 28_76 !29_00 !29_01 !29_09 !29_10 !29_11 !29_12 !29_17 !29_18 !29_19 !29_20 !29_42 29_43 !29_74 !29_75
-CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKFBIN.CMT_TOP_R_UPPER_T_FREQ_BB0 !28_01 !28_02 !28_43 !28_75 28_76 29_00 !29_01 29_09 !29_10 !29_11 !29_12 29_17 !29_18 !29_19 !29_20 !29_42 !29_43 !29_74 !29_75
-CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKFBIN.CMT_TOP_R_UPPER_T_FREQ_BB1 28_01 !28_02 !28_43 !28_75 28_76 !29_00 !29_01 !29_09 29_10 !29_11 !29_12 !29_17 29_18 !29_19 !29_20 29_42 !29_43 !29_74 !29_75
-CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKFBIN.CMT_TOP_R_UPPER_T_FREQ_BB2 !28_01 !28_02 28_43 !28_75 28_76 !29_00 29_01 !29_09 !29_10 29_11 !29_12 !29_17 !29_18 29_19 !29_20 !29_42 !29_43 !29_74 !29_75
-CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKFBIN.CMT_TOP_R_UPPER_T_FREQ_BB3 !28_01 28_02 28_43 !28_75 28_76 !29_00 !29_01 !29_09 !29_10 !29_11 29_12 !29_17 !29_18 !29_19 29_20 29_42 !29_43 !29_74 !29_75
-CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKFBIN.CMT_TOP_R_UPPER_T_PLLE2_CLK_FB_INT !28_01 !28_02 !28_43 !28_75 28_76 !29_00 !29_01 !29_09 !29_10 !29_11 !29_12 !29_17 !29_18 !29_19 !29_20 29_42 29_43 !29_74 !29_75
-CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN1.CMT_TOP_R_UPPER_T_FREQ_BB0 !28_01 !28_02 !28_41 !28_42 29_00 !29_01 29_09 !29_10 !29_11 !29_12 29_17 !29_18 !29_19 !29_20 !29_41
-CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN1.CMT_TOP_R_UPPER_T_FREQ_BB1 28_01 !28_02 28_41 !28_42 !29_00 !29_01 !29_09 29_10 !29_11 !29_12 !29_17 29_18 !29_19 !29_20 !29_41
-CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN1.CMT_TOP_R_UPPER_T_FREQ_BB2 !28_01 !28_02 !28_41 !28_42 !29_00 29_01 !29_09 !29_10 29_11 !29_12 !29_17 !29_18 29_19 !29_20 29_41
-CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN1.CMT_TOP_R_UPPER_T_FREQ_BB3 !28_01 28_02 28_41 !28_42 !29_00 !29_01 !29_09 !29_10 !29_11 29_12 !29_17 !29_18 !29_19 29_20 29_41
-CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN1.CMT_TOP_R_UPPER_T_CLKIN1 !28_01 !28_02 !28_41 28_42 !29_00 !29_01 !29_09 !29_10 !29_11 !29_12 !29_17 !29_18 !29_19 !29_20 !29_41
-CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN1.CMT_TOP_R_UPPER_T_PLLE2_CLK_IN1_INT !28_01 !28_02 28_41 28_42 !29_00 !29_01 !29_09 !29_10 !29_11 !29_12 !29_17 !29_18 !29_19 !29_20 !29_41
-CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN2.CMT_TOP_R_UPPER_T_FREQ_BB0 !28_01 !28_02 !28_40 29_00 !29_01 29_09 !29_10 !29_11 !29_12 29_17 !29_18 !29_19 !29_20 !29_39 !29_40
-CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN2.CMT_TOP_R_UPPER_T_FREQ_BB1 28_01 !28_02 !28_40 !29_00 !29_01 !29_09 29_10 !29_11 !29_12 !29_17 29_18 !29_19 !29_20 29_39 !29_40
-CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN2.CMT_TOP_R_UPPER_T_FREQ_BB2 !28_01 !28_02 28_40 !29_00 29_01 !29_09 !29_10 29_11 !29_12 !29_17 !29_18 29_19 !29_20 !29_39 !29_40
-CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN2.CMT_TOP_R_UPPER_T_FREQ_BB3 !28_01 28_02 28_40 !29_00 !29_01 !29_09 !29_10 !29_11 29_12 !29_17 !29_18 !29_19 29_20 29_39 !29_40
-CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN2.CMT_TOP_R_UPPER_T_CLKIN2 !28_01 !28_02 !28_40 !29_00 !29_01 !29_09 !29_10 !29_11 !29_12 !29_17 !29_18 !29_19 !29_20 !29_39 29_40
-CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN2.CMT_TOP_R_UPPER_T_PLLE2_CLK_IN2_INT !28_01 !28_02 !28_40 !29_00 !29_01 !29_09 !29_10 !29_11 !29_12 !29_17 !29_18 !29_19 !29_20 29_39 29_40
+CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKFBIN.CMT_TOP_R_CLKFBOUT2IN !28_43 28_75 !28_76 !29_42 !29_43 29_74 29_75
+CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKFBIN.CMT_TOP_R_UPPER_T_CLKFBIN !28_43 !28_75 28_76 !29_42 29_43 !29_74 !29_75
+CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKFBIN.CMT_TOP_R_UPPER_T_FREQ_BB0 !28_43 !28_75 28_76 !29_42 !29_43 !29_74 !29_75
+CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKFBIN.CMT_TOP_R_UPPER_T_FREQ_BB1 !28_43 !28_75 28_76 29_42 !29_43 !29_74 !29_75
+CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKFBIN.CMT_TOP_R_UPPER_T_FREQ_BB2 28_43 !28_75 28_76 !29_42 !29_43 !29_74 !29_75
+CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKFBIN.CMT_TOP_R_UPPER_T_FREQ_BB3 28_43 !28_75 28_76 29_42 !29_43 !29_74 !29_75
+CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKFBIN.CMT_TOP_R_UPPER_T_PLLE2_CLK_FB_INT !28_43 !28_75 28_76 29_42 29_43 !29_74 !29_75
+CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN1.CMT_TOP_R_UPPER_T_FREQ_BB0 !28_41 !28_42 !29_41
+CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN1.CMT_TOP_R_UPPER_T_FREQ_BB1 28_41 !28_42 !29_41
+CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN1.CMT_TOP_R_UPPER_T_FREQ_BB2 !28_41 !28_42 29_41
+CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN1.CMT_TOP_R_UPPER_T_FREQ_BB3 28_41 !28_42 29_41
+CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN1.CMT_TOP_R_UPPER_T_CLKIN1 !28_41 28_42 !29_41
+CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN1.CMT_TOP_R_UPPER_T_PLLE2_CLK_IN1_INT 28_41 28_42 !29_41
+CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN2.CMT_TOP_R_UPPER_T_FREQ_BB0 !28_40 !29_39 !29_40
+CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN2.CMT_TOP_R_UPPER_T_FREQ_BB1 !28_40 29_39 !29_40
+CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN2.CMT_TOP_R_UPPER_T_FREQ_BB2 28_40 !29_39 !29_40
+CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN2.CMT_TOP_R_UPPER_T_FREQ_BB3 28_40 29_39 !29_40
+CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN2.CMT_TOP_R_UPPER_T_CLKIN2 !28_40 !29_39 29_40
+CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN2.CMT_TOP_R_UPPER_T_PLLE2_CLK_IN2_INT !28_40 29_39 29_40
 CMT_TOP_R_UPPER_T.PLL_CLK_FREQ_BB0_NS_ACTIVE 29_00 29_09 29_17
 CMT_TOP_R_UPPER_T.PLL_CLK_FREQ_BB1_NS_ACTIVE 28_01 29_10 29_18
 CMT_TOP_R_UPPER_T.PLL_CLK_FREQ_BB2_NS_ACTIVE 29_01 29_11 29_19
diff --git a/kintex7/segbits_cmt_top_r_upper_t.origin_info.db b/kintex7/segbits_cmt_top_r_upper_t.origin_info.db
index 7a858c2..c4901c6 100644
--- a/kintex7/segbits_cmt_top_r_upper_t.origin_info.db
+++ b/kintex7/segbits_cmt_top_r_upper_t.origin_info.db
@@ -1,22 +1,22 @@
-CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKFBIN.CMT_TOP_R_CLKFBOUT2IN origin:034-cmt-pll-pips !28_01 !28_02 !28_43 !28_76 !29_00 !29_01 !29_09 !29_10 !29_11 !29_12 !29_17 !29_18 !29_19 !29_20 !29_42 !29_43 28_75 29_74 29_75
-CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKFBIN.CMT_TOP_R_UPPER_T_CLKFBIN origin:034-cmt-pll-pips !28_01 !28_02 !28_43 !28_75 !29_00 !29_01 !29_09 !29_10 !29_11 !29_12 !29_17 !29_18 !29_19 !29_20 !29_42 !29_74 !29_75 28_76 29_43
-CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKFBIN.CMT_TOP_R_UPPER_T_FREQ_BB0 origin:034-cmt-pll-pips !28_01 !28_02 !28_43 !28_75 !29_01 !29_10 !29_11 !29_12 !29_18 !29_19 !29_20 !29_42 !29_43 !29_74 !29_75 28_76 29_00 29_09 29_17
-CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKFBIN.CMT_TOP_R_UPPER_T_FREQ_BB1 origin:034-cmt-pll-pips !28_02 !28_43 !28_75 !29_00 !29_01 !29_09 !29_11 !29_12 !29_17 !29_19 !29_20 !29_43 !29_74 !29_75 28_01 28_76 29_10 29_18 29_42
-CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKFBIN.CMT_TOP_R_UPPER_T_FREQ_BB2 origin:034-cmt-pll-pips !28_01 !28_02 !28_75 !29_00 !29_09 !29_10 !29_12 !29_17 !29_18 !29_20 !29_42 !29_43 !29_74 !29_75 28_43 28_76 29_01 29_11 29_19
-CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKFBIN.CMT_TOP_R_UPPER_T_FREQ_BB3 origin:034-cmt-pll-pips !28_01 !28_75 !29_00 !29_01 !29_09 !29_10 !29_11 !29_17 !29_18 !29_19 !29_43 !29_74 !29_75 28_02 28_43 28_76 29_12 29_20 29_42
-CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKFBIN.CMT_TOP_R_UPPER_T_PLLE2_CLK_FB_INT origin:034-cmt-pll-pips !28_01 !28_02 !28_43 !28_75 !29_00 !29_01 !29_09 !29_10 !29_11 !29_12 !29_17 !29_18 !29_19 !29_20 !29_74 !29_75 28_76 29_42 29_43
-CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN1.CMT_TOP_R_UPPER_T_FREQ_BB0 origin:034-cmt-pll-pips !28_01 !28_02 !28_41 !28_42 !29_01 !29_10 !29_11 !29_12 !29_18 !29_19 !29_20 !29_41 29_00 29_09 29_17
-CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN1.CMT_TOP_R_UPPER_T_FREQ_BB1 origin:034-cmt-pll-pips !28_02 !28_42 !29_00 !29_01 !29_09 !29_11 !29_12 !29_17 !29_19 !29_20 !29_41 28_01 28_41 29_10 29_18
-CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN1.CMT_TOP_R_UPPER_T_FREQ_BB2 origin:034-cmt-pll-pips !28_01 !28_02 !28_41 !28_42 !29_00 !29_09 !29_10 !29_12 !29_17 !29_18 !29_20 29_01 29_11 29_19 29_41
-CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN1.CMT_TOP_R_UPPER_T_FREQ_BB3 origin:034-cmt-pll-pips !28_01 !28_42 !29_00 !29_01 !29_09 !29_10 !29_11 !29_17 !29_18 !29_19 28_02 28_41 29_12 29_20 29_41
-CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN1.CMT_TOP_R_UPPER_T_CLKIN1 origin:034-cmt-pll-pips !28_01 !28_02 !28_41 !29_00 !29_01 !29_09 !29_10 !29_11 !29_12 !29_17 !29_18 !29_19 !29_20 !29_41 28_42
-CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN1.CMT_TOP_R_UPPER_T_PLLE2_CLK_IN1_INT origin:034-cmt-pll-pips !28_01 !28_02 !29_00 !29_01 !29_09 !29_10 !29_11 !29_12 !29_17 !29_18 !29_19 !29_20 !29_41 28_41 28_42
-CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN2.CMT_TOP_R_UPPER_T_FREQ_BB0 origin:034-cmt-pll-pips !28_01 !28_02 !28_40 !29_01 !29_10 !29_11 !29_12 !29_18 !29_19 !29_20 !29_39 !29_40 29_00 29_09 29_17
-CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN2.CMT_TOP_R_UPPER_T_FREQ_BB1 origin:034-cmt-pll-pips !28_02 !28_40 !29_00 !29_01 !29_09 !29_11 !29_12 !29_17 !29_19 !29_20 !29_40 28_01 29_10 29_18 29_39
-CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN2.CMT_TOP_R_UPPER_T_FREQ_BB2 origin:034-cmt-pll-pips !28_01 !28_02 !29_00 !29_09 !29_10 !29_12 !29_17 !29_18 !29_20 !29_39 !29_40 28_40 29_01 29_11 29_19
-CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN2.CMT_TOP_R_UPPER_T_FREQ_BB3 origin:034-cmt-pll-pips !28_01 !29_00 !29_01 !29_09 !29_10 !29_11 !29_17 !29_18 !29_19 !29_40 28_02 28_40 29_12 29_20 29_39
-CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN2.CMT_TOP_R_UPPER_T_CLKIN2 origin:034-cmt-pll-pips !28_01 !28_02 !28_40 !29_00 !29_01 !29_09 !29_10 !29_11 !29_12 !29_17 !29_18 !29_19 !29_20 !29_39 29_40
-CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN2.CMT_TOP_R_UPPER_T_PLLE2_CLK_IN2_INT origin:034-cmt-pll-pips !28_01 !28_02 !28_40 !29_00 !29_01 !29_09 !29_10 !29_11 !29_12 !29_17 !29_18 !29_19 !29_20 29_39 29_40
+CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKFBIN.CMT_TOP_R_CLKFBOUT2IN origin:034-cmt-pll-pips !28_43 !28_76 !29_42 !29_43 28_75 29_74 29_75
+CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKFBIN.CMT_TOP_R_UPPER_T_CLKFBIN origin:034-cmt-pll-pips !28_43 !28_75 !29_42 !29_74 !29_75 28_76 29_43
+CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKFBIN.CMT_TOP_R_UPPER_T_FREQ_BB0 origin:034-cmt-pll-pips !28_43 !28_75 !29_42 !29_43 !29_74 !29_75 28_76
+CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKFBIN.CMT_TOP_R_UPPER_T_FREQ_BB1 origin:034-cmt-pll-pips !28_43 !28_75 !29_43 !29_74 !29_75 28_76 29_42
+CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKFBIN.CMT_TOP_R_UPPER_T_FREQ_BB2 origin:034-cmt-pll-pips !28_75 !29_42 !29_43 !29_74 !29_75 28_43 28_76
+CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKFBIN.CMT_TOP_R_UPPER_T_FREQ_BB3 origin:034-cmt-pll-pips !28_75 !29_43 !29_74 !29_75 28_43 28_76 29_42
+CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKFBIN.CMT_TOP_R_UPPER_T_PLLE2_CLK_FB_INT origin:034-cmt-pll-pips !28_43 !28_75 !29_74 !29_75 28_76 29_42 29_43
+CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN1.CMT_TOP_R_UPPER_T_FREQ_BB0 origin:034-cmt-pll-pips !28_41 !28_42 !29_41
+CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN1.CMT_TOP_R_UPPER_T_FREQ_BB1 origin:034-cmt-pll-pips !28_42 !29_41 28_41
+CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN1.CMT_TOP_R_UPPER_T_FREQ_BB2 origin:034-cmt-pll-pips !28_41 !28_42 29_41
+CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN1.CMT_TOP_R_UPPER_T_FREQ_BB3 origin:034-cmt-pll-pips !28_42 28_41 29_41
+CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN1.CMT_TOP_R_UPPER_T_CLKIN1 origin:034-cmt-pll-pips !28_41 !29_41 28_42
+CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN1.CMT_TOP_R_UPPER_T_PLLE2_CLK_IN1_INT origin:034-cmt-pll-pips !29_41 28_41 28_42
+CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN2.CMT_TOP_R_UPPER_T_FREQ_BB0 origin:034-cmt-pll-pips !28_40 !29_39 !29_40
+CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN2.CMT_TOP_R_UPPER_T_FREQ_BB1 origin:034-cmt-pll-pips !28_40 !29_40 29_39
+CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN2.CMT_TOP_R_UPPER_T_FREQ_BB2 origin:034-cmt-pll-pips !29_39 !29_40 28_40
+CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN2.CMT_TOP_R_UPPER_T_FREQ_BB3 origin:034-cmt-pll-pips !29_40 28_40 29_39
+CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN2.CMT_TOP_R_UPPER_T_CLKIN2 origin:034-cmt-pll-pips !28_40 !29_39 29_40
+CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN2.CMT_TOP_R_UPPER_T_PLLE2_CLK_IN2_INT origin:034-cmt-pll-pips !28_40 29_39 29_40
 CMT_TOP_R_UPPER_T.PLL_CLK_FREQ_BB0_NS_ACTIVE origin:034-cmt-pll-pips 29_00 29_09 29_17
 CMT_TOP_R_UPPER_T.PLL_CLK_FREQ_BB1_NS_ACTIVE origin:034-cmt-pll-pips 28_01 29_10 29_18
 CMT_TOP_R_UPPER_T.PLL_CLK_FREQ_BB2_NS_ACTIVE origin:034-cmt-pll-pips 29_01 29_11 29_19
diff --git a/kintex7/segbits_int_l.origin_info.db b/kintex7/segbits_int_l.origin_info.db
index 5ed17f3..6d5dc8d 100644
--- a/kintex7/segbits_int_l.origin_info.db
+++ b/kintex7/segbits_int_l.origin_info.db
@@ -2491,7 +2491,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:050-pip-seed 05_54 07_55
+INT_L.NN6BEG3.SE6END3 origin:056-pip-rem 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.LOGIC_OUTS_L0 origin:050-pip-seed 11_07 14_07
@@ -3345,7 +3345,7 @@
 INT_L.SW6BEG3.NW6END_S0_0 origin:050-pip-seed 05_63 06_60
 INT_L.SW6BEG3.WW4END_S0_0 origin:050-pip-seed 05_60 05_63
 INT_L.SW6BEG3.EE2END3 origin:050-pip-seed 03_60 04_61
-INT_L.SW6BEG3.EE4END3 origin:056-pip-rem 04_61 05_60
+INT_L.SW6BEG3.EE4END3 origin:050-pip-seed 04_61 05_60
 INT_L.SW6BEG3.LH0 origin:056-pip-rem 04_62 05_60
 INT_L.SW6BEG3.SE2END3 origin:050-pip-seed 02_61 04_61
 INT_L.SW6BEG3.SE6END3 origin:050-pip-seed 04_61 06_60
@@ -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:056-pip-rem 05_32 05_35
+INT_L.WW4BEG2.NE6END2 origin:050-pip-seed 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 e7b99ce..24484f6 100644
--- a/kintex7/segbits_int_r.origin_info.db
+++ b/kintex7/segbits_int_r.origin_info.db
@@ -170,7 +170,7 @@
 INT_R.BYP_ALT7.BYP_BOUNCE6 origin:050-pip-seed !22_63 !23_63 !25_63 21_63 24_63
 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.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.LOGIC_OUTS3 origin:051-pip-imuxlout-bypalts !22_63 20_63 23_63 24_63 25_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
@@ -705,7 +705,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.LOGIC_OUTS3 origin:050-pip-seed 02_57 07_57
 INT_R.EE4BEG3.LOGIC_OUTS7 origin:050-pip-seed 02_57 04_58
 INT_R.EE4BEG3.LOGIC_OUTS11 origin:050-pip-seed 03_56 04_58
@@ -725,7 +725,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:056-pip-rem 05_56 05_59
+INT_R.EE4BEG3.SW6END3 origin:050-pip-seed 05_56 05_59
 INT_R.EL1BEG0.LOGIC_OUTS1 origin:050-pip-seed 07_20 14_21
 INT_R.EL1BEG0.LOGIC_OUTS5 origin:050-pip-seed 11_21 14_21
 INT_R.EL1BEG0.LOGIC_OUTS9 origin:050-pip-seed 10_21 13_21
@@ -2273,7 +2273,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_OUTS5 origin:050-pip-seed 11_17 14_17
 INT_R.NL1BEG0.LOGIC_OUTS9 origin:050-pip-seed 10_17 13_17
@@ -2887,7 +2887,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
@@ -3603,7 +3603,7 @@
 INT_R.WW4BEG2.LVB0 origin:056-pip-rem 04_34 05_32
 INT_R.WW4BEG2.LVB12 origin:056-pip-rem 05_32 07_33
 INT_R.WW4BEG2.NE2END2 origin:050-pip-seed 02_33 05_35
-INT_R.WW4BEG2.NE6END2 origin:050-pip-seed 05_32 05_35
+INT_R.WW4BEG2.NE6END2 origin:056-pip-rem 05_32 05_35
 INT_R.WW4BEG2.NN2END2 origin:050-pip-seed 03_32 05_35
 INT_R.WW4BEG2.NN6END2 origin:050-pip-seed 05_35 06_32
 INT_R.WW4BEG2.NW2END2 origin:050-pip-seed 02_33 03_33
diff --git a/zynq7/segbits_cmt_top_r_upper_t.db b/zynq7/segbits_cmt_top_r_upper_t.db
index eff93ea..7f2aa4d 100644
--- a/zynq7/segbits_cmt_top_r_upper_t.db
+++ b/zynq7/segbits_cmt_top_r_upper_t.db
@@ -1,22 +1,22 @@
-CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKFBIN.CMT_TOP_R_CLKFBOUT2IN !28_01 !28_02 !28_43 28_75 !28_76 !29_00 !29_01 !29_09 !29_10 !29_11 !29_12 !29_17 !29_18 !29_19 !29_20 !29_42 !29_43 29_74 29_75
-CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKFBIN.CMT_TOP_R_UPPER_T_CLKFBIN !28_01 !28_02 !28_43 !28_75 28_76 !29_00 !29_01 !29_09 !29_10 !29_11 !29_12 !29_17 !29_18 !29_19 !29_20 !29_42 29_43 !29_74 !29_75
-CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKFBIN.CMT_TOP_R_UPPER_T_FREQ_BB0 !28_01 !28_02 !28_43 !28_75 28_76 29_00 !29_01 29_09 !29_10 !29_11 !29_12 29_17 !29_18 !29_19 !29_20 !29_42 !29_43 !29_74 !29_75
-CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKFBIN.CMT_TOP_R_UPPER_T_FREQ_BB1 28_01 !28_02 !28_43 !28_75 28_76 !29_00 !29_01 !29_09 29_10 !29_11 !29_12 !29_17 29_18 !29_19 !29_20 29_42 !29_43 !29_74 !29_75
-CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKFBIN.CMT_TOP_R_UPPER_T_FREQ_BB2 !28_01 !28_02 28_43 !28_75 28_76 !29_00 29_01 !29_09 !29_10 29_11 !29_12 !29_17 !29_18 29_19 !29_20 !29_42 !29_43 !29_74 !29_75
-CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKFBIN.CMT_TOP_R_UPPER_T_FREQ_BB3 !28_01 28_02 28_43 !28_75 28_76 !29_00 !29_01 !29_09 !29_10 !29_11 29_12 !29_17 !29_18 !29_19 29_20 29_42 !29_43 !29_74 !29_75
-CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKFBIN.CMT_TOP_R_UPPER_T_PLLE2_CLK_FB_INT !28_01 !28_02 !28_43 !28_75 28_76 !29_00 !29_01 !29_09 !29_10 !29_11 !29_12 !29_17 !29_18 !29_19 !29_20 29_42 29_43 !29_74 !29_75
-CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN1.CMT_TOP_R_UPPER_T_FREQ_BB0 !28_01 !28_02 !28_41 !28_42 29_00 !29_01 29_09 !29_10 !29_11 !29_12 29_17 !29_18 !29_19 !29_20 !29_41
-CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN1.CMT_TOP_R_UPPER_T_FREQ_BB1 28_01 !28_02 28_41 !28_42 !29_00 !29_01 !29_09 29_10 !29_11 !29_12 !29_17 29_18 !29_19 !29_20 !29_41
-CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN1.CMT_TOP_R_UPPER_T_FREQ_BB2 !28_01 !28_02 !28_41 !28_42 !29_00 29_01 !29_09 !29_10 29_11 !29_12 !29_17 !29_18 29_19 !29_20 29_41
-CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN1.CMT_TOP_R_UPPER_T_FREQ_BB3 !28_01 28_02 28_41 !28_42 !29_00 !29_01 !29_09 !29_10 !29_11 29_12 !29_17 !29_18 !29_19 29_20 29_41
-CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN1.CMT_TOP_R_UPPER_T_CLKIN1 !28_01 !28_02 !28_41 28_42 !29_00 !29_01 !29_09 !29_10 !29_11 !29_12 !29_17 !29_18 !29_19 !29_20 !29_41
-CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN1.CMT_TOP_R_UPPER_T_PLLE2_CLK_IN1_INT !28_01 !28_02 28_41 28_42 !29_00 !29_01 !29_09 !29_10 !29_11 !29_12 !29_17 !29_18 !29_19 !29_20 !29_41
-CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN2.CMT_TOP_R_UPPER_T_FREQ_BB0 !28_01 !28_02 !28_40 29_00 !29_01 29_09 !29_10 !29_11 !29_12 29_17 !29_18 !29_19 !29_20 !29_39 !29_40
-CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN2.CMT_TOP_R_UPPER_T_FREQ_BB1 28_01 !28_02 !28_40 !29_00 !29_01 !29_09 29_10 !29_11 !29_12 !29_17 29_18 !29_19 !29_20 29_39 !29_40
-CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN2.CMT_TOP_R_UPPER_T_FREQ_BB2 !28_01 !28_02 28_40 !29_00 29_01 !29_09 !29_10 29_11 !29_12 !29_17 !29_18 29_19 !29_20 !29_39 !29_40
-CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN2.CMT_TOP_R_UPPER_T_FREQ_BB3 !28_01 28_02 28_40 !29_00 !29_01 !29_09 !29_10 !29_11 29_12 !29_17 !29_18 !29_19 29_20 29_39 !29_40
-CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN2.CMT_TOP_R_UPPER_T_CLKIN2 !28_01 !28_02 !28_40 !29_00 !29_01 !29_09 !29_10 !29_11 !29_12 !29_17 !29_18 !29_19 !29_20 !29_39 29_40
-CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN2.CMT_TOP_R_UPPER_T_PLLE2_CLK_IN2_INT !28_01 !28_02 !28_40 !29_00 !29_01 !29_09 !29_10 !29_11 !29_12 !29_17 !29_18 !29_19 !29_20 29_39 29_40
+CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKFBIN.CMT_TOP_R_CLKFBOUT2IN !28_43 28_75 !28_76 !29_42 !29_43 29_74 29_75
+CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKFBIN.CMT_TOP_R_UPPER_T_CLKFBIN !28_43 !28_75 28_76 !29_42 29_43 !29_74 !29_75
+CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKFBIN.CMT_TOP_R_UPPER_T_FREQ_BB0 !28_43 !28_75 28_76 !29_42 !29_43 !29_74 !29_75
+CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKFBIN.CMT_TOP_R_UPPER_T_FREQ_BB1 !28_43 !28_75 28_76 29_42 !29_43 !29_74 !29_75
+CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKFBIN.CMT_TOP_R_UPPER_T_FREQ_BB2 28_43 !28_75 28_76 !29_42 !29_43 !29_74 !29_75
+CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKFBIN.CMT_TOP_R_UPPER_T_FREQ_BB3 28_43 !28_75 28_76 29_42 !29_43 !29_74 !29_75
+CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKFBIN.CMT_TOP_R_UPPER_T_PLLE2_CLK_FB_INT !28_43 !28_75 28_76 29_42 29_43 !29_74 !29_75
+CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN1.CMT_TOP_R_UPPER_T_FREQ_BB0 !28_41 !28_42 !29_41
+CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN1.CMT_TOP_R_UPPER_T_FREQ_BB1 28_41 !28_42 !29_41
+CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN1.CMT_TOP_R_UPPER_T_FREQ_BB2 !28_41 !28_42 29_41
+CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN1.CMT_TOP_R_UPPER_T_FREQ_BB3 28_41 !28_42 29_41
+CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN1.CMT_TOP_R_UPPER_T_CLKIN1 !28_41 28_42 !29_41
+CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN1.CMT_TOP_R_UPPER_T_PLLE2_CLK_IN1_INT 28_41 28_42 !29_41
+CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN2.CMT_TOP_R_UPPER_T_FREQ_BB0 !28_40 !29_39 !29_40
+CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN2.CMT_TOP_R_UPPER_T_FREQ_BB1 !28_40 29_39 !29_40
+CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN2.CMT_TOP_R_UPPER_T_FREQ_BB2 28_40 !29_39 !29_40
+CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN2.CMT_TOP_R_UPPER_T_FREQ_BB3 28_40 29_39 !29_40
+CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN2.CMT_TOP_R_UPPER_T_CLKIN2 !28_40 !29_39 29_40
+CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN2.CMT_TOP_R_UPPER_T_PLLE2_CLK_IN2_INT !28_40 29_39 29_40
 CMT_TOP_R_UPPER_T.PLL_CLK_FREQ_BB0_NS_ACTIVE 29_00 29_09 29_17
 CMT_TOP_R_UPPER_T.PLL_CLK_FREQ_BB1_NS_ACTIVE 28_01 29_10 29_18
 CMT_TOP_R_UPPER_T.PLL_CLK_FREQ_BB2_NS_ACTIVE 29_01 29_11 29_19
diff --git a/zynq7/segbits_cmt_top_r_upper_t.origin_info.db b/zynq7/segbits_cmt_top_r_upper_t.origin_info.db
index 7a858c2..c4901c6 100644
--- a/zynq7/segbits_cmt_top_r_upper_t.origin_info.db
+++ b/zynq7/segbits_cmt_top_r_upper_t.origin_info.db
@@ -1,22 +1,22 @@
-CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKFBIN.CMT_TOP_R_CLKFBOUT2IN origin:034-cmt-pll-pips !28_01 !28_02 !28_43 !28_76 !29_00 !29_01 !29_09 !29_10 !29_11 !29_12 !29_17 !29_18 !29_19 !29_20 !29_42 !29_43 28_75 29_74 29_75
-CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKFBIN.CMT_TOP_R_UPPER_T_CLKFBIN origin:034-cmt-pll-pips !28_01 !28_02 !28_43 !28_75 !29_00 !29_01 !29_09 !29_10 !29_11 !29_12 !29_17 !29_18 !29_19 !29_20 !29_42 !29_74 !29_75 28_76 29_43
-CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKFBIN.CMT_TOP_R_UPPER_T_FREQ_BB0 origin:034-cmt-pll-pips !28_01 !28_02 !28_43 !28_75 !29_01 !29_10 !29_11 !29_12 !29_18 !29_19 !29_20 !29_42 !29_43 !29_74 !29_75 28_76 29_00 29_09 29_17
-CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKFBIN.CMT_TOP_R_UPPER_T_FREQ_BB1 origin:034-cmt-pll-pips !28_02 !28_43 !28_75 !29_00 !29_01 !29_09 !29_11 !29_12 !29_17 !29_19 !29_20 !29_43 !29_74 !29_75 28_01 28_76 29_10 29_18 29_42
-CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKFBIN.CMT_TOP_R_UPPER_T_FREQ_BB2 origin:034-cmt-pll-pips !28_01 !28_02 !28_75 !29_00 !29_09 !29_10 !29_12 !29_17 !29_18 !29_20 !29_42 !29_43 !29_74 !29_75 28_43 28_76 29_01 29_11 29_19
-CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKFBIN.CMT_TOP_R_UPPER_T_FREQ_BB3 origin:034-cmt-pll-pips !28_01 !28_75 !29_00 !29_01 !29_09 !29_10 !29_11 !29_17 !29_18 !29_19 !29_43 !29_74 !29_75 28_02 28_43 28_76 29_12 29_20 29_42
-CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKFBIN.CMT_TOP_R_UPPER_T_PLLE2_CLK_FB_INT origin:034-cmt-pll-pips !28_01 !28_02 !28_43 !28_75 !29_00 !29_01 !29_09 !29_10 !29_11 !29_12 !29_17 !29_18 !29_19 !29_20 !29_74 !29_75 28_76 29_42 29_43
-CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN1.CMT_TOP_R_UPPER_T_FREQ_BB0 origin:034-cmt-pll-pips !28_01 !28_02 !28_41 !28_42 !29_01 !29_10 !29_11 !29_12 !29_18 !29_19 !29_20 !29_41 29_00 29_09 29_17
-CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN1.CMT_TOP_R_UPPER_T_FREQ_BB1 origin:034-cmt-pll-pips !28_02 !28_42 !29_00 !29_01 !29_09 !29_11 !29_12 !29_17 !29_19 !29_20 !29_41 28_01 28_41 29_10 29_18
-CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN1.CMT_TOP_R_UPPER_T_FREQ_BB2 origin:034-cmt-pll-pips !28_01 !28_02 !28_41 !28_42 !29_00 !29_09 !29_10 !29_12 !29_17 !29_18 !29_20 29_01 29_11 29_19 29_41
-CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN1.CMT_TOP_R_UPPER_T_FREQ_BB3 origin:034-cmt-pll-pips !28_01 !28_42 !29_00 !29_01 !29_09 !29_10 !29_11 !29_17 !29_18 !29_19 28_02 28_41 29_12 29_20 29_41
-CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN1.CMT_TOP_R_UPPER_T_CLKIN1 origin:034-cmt-pll-pips !28_01 !28_02 !28_41 !29_00 !29_01 !29_09 !29_10 !29_11 !29_12 !29_17 !29_18 !29_19 !29_20 !29_41 28_42
-CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN1.CMT_TOP_R_UPPER_T_PLLE2_CLK_IN1_INT origin:034-cmt-pll-pips !28_01 !28_02 !29_00 !29_01 !29_09 !29_10 !29_11 !29_12 !29_17 !29_18 !29_19 !29_20 !29_41 28_41 28_42
-CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN2.CMT_TOP_R_UPPER_T_FREQ_BB0 origin:034-cmt-pll-pips !28_01 !28_02 !28_40 !29_01 !29_10 !29_11 !29_12 !29_18 !29_19 !29_20 !29_39 !29_40 29_00 29_09 29_17
-CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN2.CMT_TOP_R_UPPER_T_FREQ_BB1 origin:034-cmt-pll-pips !28_02 !28_40 !29_00 !29_01 !29_09 !29_11 !29_12 !29_17 !29_19 !29_20 !29_40 28_01 29_10 29_18 29_39
-CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN2.CMT_TOP_R_UPPER_T_FREQ_BB2 origin:034-cmt-pll-pips !28_01 !28_02 !29_00 !29_09 !29_10 !29_12 !29_17 !29_18 !29_20 !29_39 !29_40 28_40 29_01 29_11 29_19
-CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN2.CMT_TOP_R_UPPER_T_FREQ_BB3 origin:034-cmt-pll-pips !28_01 !29_00 !29_01 !29_09 !29_10 !29_11 !29_17 !29_18 !29_19 !29_40 28_02 28_40 29_12 29_20 29_39
-CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN2.CMT_TOP_R_UPPER_T_CLKIN2 origin:034-cmt-pll-pips !28_01 !28_02 !28_40 !29_00 !29_01 !29_09 !29_10 !29_11 !29_12 !29_17 !29_18 !29_19 !29_20 !29_39 29_40
-CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN2.CMT_TOP_R_UPPER_T_PLLE2_CLK_IN2_INT origin:034-cmt-pll-pips !28_01 !28_02 !28_40 !29_00 !29_01 !29_09 !29_10 !29_11 !29_12 !29_17 !29_18 !29_19 !29_20 29_39 29_40
+CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKFBIN.CMT_TOP_R_CLKFBOUT2IN origin:034-cmt-pll-pips !28_43 !28_76 !29_42 !29_43 28_75 29_74 29_75
+CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKFBIN.CMT_TOP_R_UPPER_T_CLKFBIN origin:034-cmt-pll-pips !28_43 !28_75 !29_42 !29_74 !29_75 28_76 29_43
+CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKFBIN.CMT_TOP_R_UPPER_T_FREQ_BB0 origin:034-cmt-pll-pips !28_43 !28_75 !29_42 !29_43 !29_74 !29_75 28_76
+CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKFBIN.CMT_TOP_R_UPPER_T_FREQ_BB1 origin:034-cmt-pll-pips !28_43 !28_75 !29_43 !29_74 !29_75 28_76 29_42
+CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKFBIN.CMT_TOP_R_UPPER_T_FREQ_BB2 origin:034-cmt-pll-pips !28_75 !29_42 !29_43 !29_74 !29_75 28_43 28_76
+CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKFBIN.CMT_TOP_R_UPPER_T_FREQ_BB3 origin:034-cmt-pll-pips !28_75 !29_43 !29_74 !29_75 28_43 28_76 29_42
+CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKFBIN.CMT_TOP_R_UPPER_T_PLLE2_CLK_FB_INT origin:034-cmt-pll-pips !28_43 !28_75 !29_74 !29_75 28_76 29_42 29_43
+CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN1.CMT_TOP_R_UPPER_T_FREQ_BB0 origin:034-cmt-pll-pips !28_41 !28_42 !29_41
+CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN1.CMT_TOP_R_UPPER_T_FREQ_BB1 origin:034-cmt-pll-pips !28_42 !29_41 28_41
+CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN1.CMT_TOP_R_UPPER_T_FREQ_BB2 origin:034-cmt-pll-pips !28_41 !28_42 29_41
+CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN1.CMT_TOP_R_UPPER_T_FREQ_BB3 origin:034-cmt-pll-pips !28_42 28_41 29_41
+CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN1.CMT_TOP_R_UPPER_T_CLKIN1 origin:034-cmt-pll-pips !28_41 !29_41 28_42
+CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN1.CMT_TOP_R_UPPER_T_PLLE2_CLK_IN1_INT origin:034-cmt-pll-pips !29_41 28_41 28_42
+CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN2.CMT_TOP_R_UPPER_T_FREQ_BB0 origin:034-cmt-pll-pips !28_40 !29_39 !29_40
+CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN2.CMT_TOP_R_UPPER_T_FREQ_BB1 origin:034-cmt-pll-pips !28_40 !29_40 29_39
+CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN2.CMT_TOP_R_UPPER_T_FREQ_BB2 origin:034-cmt-pll-pips !29_39 !29_40 28_40
+CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN2.CMT_TOP_R_UPPER_T_FREQ_BB3 origin:034-cmt-pll-pips !29_40 28_40 29_39
+CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN2.CMT_TOP_R_UPPER_T_CLKIN2 origin:034-cmt-pll-pips !28_40 !29_39 29_40
+CMT_TOP_R_UPPER_T.CMT_TOP_R_UPPER_T_PLLE2_CLKIN2.CMT_TOP_R_UPPER_T_PLLE2_CLK_IN2_INT origin:034-cmt-pll-pips !28_40 29_39 29_40
 CMT_TOP_R_UPPER_T.PLL_CLK_FREQ_BB0_NS_ACTIVE origin:034-cmt-pll-pips 29_00 29_09 29_17
 CMT_TOP_R_UPPER_T.PLL_CLK_FREQ_BB1_NS_ACTIVE origin:034-cmt-pll-pips 28_01 29_10 29_18
 CMT_TOP_R_UPPER_T.PLL_CLK_FREQ_BB2_NS_ACTIVE origin:034-cmt-pll-pips 29_01 29_11 29_19
diff --git a/zynq7/segbits_int_l.origin_info.db b/zynq7/segbits_int_l.origin_info.db
index 8509a85..56a9b1e 100644
--- a/zynq7/segbits_int_l.origin_info.db
+++ b/zynq7/segbits_int_l.origin_info.db
@@ -301,7 +301,7 @@
 INT_L.FAN_ALT0.FAN_BOUNCE6 origin:050-pip-seed !23_00 20_00 22_00 24_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.SR1END_N3_3 origin:050-pip-seed !23_00 19_01 22_00 24_00 25_00
 INT_L.FAN_ALT0.SS2END_N0_3 origin:050-pip-seed !22_00 !23_00 !24_00 17_00 25_00
 INT_L.FAN_ALT0.SW2END_N0_3 origin:050-pip-seed !22_00 !23_00 !25_00 17_00 24_00
@@ -1877,7 +1877,7 @@
 INT_L.EE4BEG0.SS2END0 origin:050-pip-seed 03_08 05_11
 INT_L.EE4BEG0.SS6END0 origin:050-pip-seed 05_11 06_08
 INT_L.EE4BEG0.SW2END0 origin:050-pip-seed 02_09 05_11
-INT_L.EE4BEG0.SW6END0 origin:050-pip-seed 05_08 05_11
+INT_L.EE4BEG0.SW6END0 origin:056-pip-rem 05_08 05_11
 INT_L.EE4BEG1.LOGIC_OUTS_L1 origin:050-pip-seed 02_25 07_25
 INT_L.EE4BEG1.LOGIC_OUTS_L5 origin:050-pip-seed 02_25 04_26
 INT_L.EE4BEG1.LOGIC_OUTS_L9 origin:050-pip-seed 03_24 04_26
@@ -1917,7 +1917,7 @@
 INT_L.EE4BEG2.SS2END2 origin:050-pip-seed 03_40 05_43
 INT_L.EE4BEG2.SS6END2 origin:050-pip-seed 05_43 06_40
 INT_L.EE4BEG2.SW2END2 origin:050-pip-seed 02_41 05_43
-INT_L.EE4BEG2.SW6END2 origin:056-pip-rem 05_40 05_43
+INT_L.EE4BEG2.SW6END2 origin:050-pip-seed 05_40 05_43
 INT_L.EE4BEG3.LOGIC_OUTS_L3 origin:050-pip-seed 02_57 07_57
 INT_L.EE4BEG3.LOGIC_OUTS_L7 origin:050-pip-seed 02_57 04_58
 INT_L.EE4BEG3.LOGIC_OUTS_L11 origin:050-pip-seed 03_56 04_58
@@ -1937,7 +1937,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.LOGIC_OUTS_L1 origin:050-pip-seed 07_20 14_21
 INT_L.EL1BEG0.LOGIC_OUTS_L5 origin:050-pip-seed 11_21 14_21
 INT_L.EL1BEG0.LOGIC_OUTS_L9 origin:050-pip-seed 10_21 13_21
@@ -2491,7 +2491,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.LOGIC_OUTS_L0 origin:050-pip-seed 11_07 14_07
@@ -2662,7 +2662,7 @@
 INT_L.NW6BEG0.LOGIC_OUTS_L22 origin:050-pip-seed 06_02 07_03
 INT_L.NW6BEG0.LV_L0 origin:056-pip-rem 04_03 06_02
 INT_L.NW6BEG0.SS2END_N0_3 origin:050-pip-seed 02_03 04_00
-INT_L.NW6BEG0.SS6END_N0_3 origin:056-pip-rem 04_00 07_03
+INT_L.NW6BEG0.SS6END_N0_3 origin:050-pip-seed 04_00 07_03
 INT_L.NW6BEG0.SW2END_N0_3 origin:050-pip-seed 03_02 04_00
 INT_L.NW6BEG0.SW6END_N0_3 origin:050-pip-seed 04_00 04_03
 INT_L.NW6BEG0.WW2END_N0_3 origin:050-pip-seed 02_02 02_03
diff --git a/zynq7/segbits_int_r.origin_info.db b/zynq7/segbits_int_r.origin_info.db
index c2a6b01..fec46ed 100644
--- a/zynq7/segbits_int_r.origin_info.db
+++ b/zynq7/segbits_int_r.origin_info.db
@@ -237,7 +237,7 @@
 INT_R.FAN_ALT0.FAN_BOUNCE6 origin:050-pip-seed !23_00 20_00 22_00 24_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.SR1END_N3_3 origin:050-pip-seed !23_00 19_01 22_00 24_00 25_00
 INT_R.FAN_ALT0.SS2END_N0_3 origin:050-pip-seed !22_00 !23_00 !24_00 17_00 25_00
 INT_R.FAN_ALT0.SW2END_N0_3 origin:050-pip-seed !22_00 !23_00 !25_00 17_00 24_00
@@ -329,7 +329,7 @@
 INT_R.FAN_ALT4.BYP_BOUNCE_N3_3 origin:059-pip-byp-bounce !22_08 !23_08 !24_08 20_08 25_08
 INT_R.FAN_ALT4.BYP_BOUNCE_N3_7 origin:059-pip-byp-bounce !22_08 !23_08 !25_08 20_08 24_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.LOGIC_OUTS4 origin:050-pip-seed !23_08 21_08 22_08 24_08 25_08
 INT_R.FAN_ALT4.LOGIC_OUTS8 origin:050-pip-seed !22_08 21_08 23_08 24_08 25_08
 INT_R.FAN_ALT4.LOGIC_OUTS18 origin:050-pip-seed !22_08 !23_08 !25_08 21_08 24_08
@@ -665,7 +665,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:056-pip-rem 05_08 05_11
+INT_R.EE4BEG0.SW6END0 origin:050-pip-seed 05_08 05_11
 INT_R.EE4BEG1.LOGIC_OUTS1 origin:050-pip-seed 02_25 07_25
 INT_R.EE4BEG1.LOGIC_OUTS5 origin:050-pip-seed 02_25 04_26
 INT_R.EE4BEG1.LOGIC_OUTS9 origin:050-pip-seed 03_24 04_26
@@ -2253,7 +2253,7 @@
 INT_R.NE6BEG2.SE2END2 origin:050-pip-seed 02_37 05_39
 INT_R.NE6BEG2.SE6END2 origin:050-pip-seed 05_39 06_36
 INT_R.NE6BEG2.WW2END1 origin:050-pip-seed 03_36 04_37
-INT_R.NE6BEG2.WW4END2 origin:050-pip-seed 04_37 05_36
+INT_R.NE6BEG2.WW4END2 origin:056-pip-rem 04_37 05_36
 INT_R.NE6BEG3.LOGIC_OUTS3 origin:050-pip-seed 02_53 04_54
 INT_R.NE6BEG3.LOGIC_OUTS7 origin:050-pip-seed 02_53 07_53
 INT_R.NE6BEG3.LOGIC_OUTS11 origin:050-pip-seed 03_52 07_53
@@ -2887,7 +2887,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