diff --git a/FPGA1212_QLSOFA_HD_PNR/fpga_top/fpga_top_icv_in_design.gds.gz b/FPGA1212_QLSOFA_HD_PNR/fpga_top/fpga_top_icv_in_design.gds.gz
index fb40126..df12726 100644
Binary files a/FPGA1212_QLSOFA_HD_PNR/fpga_top/fpga_top_icv_in_design.gds.gz and b/FPGA1212_QLSOFA_HD_PNR/fpga_top/fpga_top_icv_in_design.gds.gz differ
diff --git a/FPGA1212_QLSOFA_HD_PNR/fpga_top/fpga_top_icv_in_design.lvs.v b/FPGA1212_QLSOFA_HD_PNR/fpga_top/fpga_top_icv_in_design.lvs.v
index e66441b..ec4ab68 100644
--- a/FPGA1212_QLSOFA_HD_PNR/fpga_top/fpga_top_icv_in_design.lvs.v
+++ b/FPGA1212_QLSOFA_HD_PNR/fpga_top/fpga_top_icv_in_design.lvs.v
@@ -5448,18 +5448,6 @@ sky130_fd_sc_hd__decap_12 \xofiller!sky130_fd_sc_hd__decap_12!x358800y27200 (
     .VPWR ( VDD ) , .VGND ( VSS ) ) ;
 sky130_fd_sc_hd__decap_8 \xofiller!sky130_fd_sc_hd__decap_8!x414000y27200 ( 
     .VPWR ( VDD ) , .VGND ( VSS ) ) ;
-sky130_fd_sc_hd__decap_3 \xofiller!sky130_fd_sc_hd__decap_3!x450800y27200 ( 
-    .VPWR ( VDD ) , .VGND ( VSS ) ) ;
-sky130_fd_sc_hd__decap_12 \xofiller!sky130_fd_sc_hd__decap_12!x524400y27200 ( 
-    .VPWR ( VDD ) , .VGND ( VSS ) ) ;
-sky130_fd_sc_hd__decap_3 \xofiller!sky130_fd_sc_hd__decap_3!x579600y27200 ( 
-    .VPWR ( VDD ) , .VGND ( VSS ) ) ;
-sky130_fd_sc_hd__decap_12 \xofiller!sky130_fd_sc_hd__decap_12!x648600y27200 ( 
-    .VPWR ( VDD ) , .VGND ( VSS ) ) ;
-sky130_fd_sc_hd__decap_6 \xofiller!sky130_fd_sc_hd__decap_6!x703800y27200 ( 
-    .VPWR ( VDD ) , .VGND ( VSS ) ) ;
-sky130_fd_sc_hd__decap_12 \xofiller!sky130_fd_sc_hd__decap_12!x0y54400 ( 
-    .VPWR ( VDD ) , .VGND ( VSS ) ) ;
 sky130_fd_sc_hd__buf_8 ropt_mt_inst_1258 ( .A ( ropt_net_114 ) , 
     .X ( chany_bottom_out[28] ) , .VPWR ( VDD ) , .VGND ( VSS ) ) ;
 sky130_fd_sc_hd__buf_8 ropt_mt_inst_1259 ( .A ( ropt_net_115 ) , 
@@ -5486,10 +5474,24 @@ sky130_fd_sc_hd__buf_8 ropt_mt_inst_1269 ( .A ( ropt_net_125 ) ,
     .X ( chany_top_out[16] ) , .VPWR ( VDD ) , .VGND ( VSS ) ) ;
 sky130_fd_sc_hd__buf_8 ropt_mt_inst_1270 ( .A ( ropt_net_126 ) , 
     .X ( chany_bottom_out[14] ) , .VPWR ( VDD ) , .VGND ( VSS ) ) ;
+sky130_fd_sc_hd__decap_3 \xofiller!sky130_fd_sc_hd__decap_3!x450800y27200 ( 
+    .VPWR ( VDD ) , .VGND ( VSS ) ) ;
+sky130_fd_sc_hd__decap_12 \xofiller!sky130_fd_sc_hd__decap_12!x524400y27200 ( 
+    .VPWR ( VDD ) , .VGND ( VSS ) ) ;
+sky130_fd_sc_hd__decap_3 \xofiller!sky130_fd_sc_hd__decap_3!x579600y27200 ( 
+    .VPWR ( VDD ) , .VGND ( VSS ) ) ;
+sky130_fd_sc_hd__decap_12 \xofiller!sky130_fd_sc_hd__decap_12!x648600y27200 ( 
+    .VPWR ( VDD ) , .VGND ( VSS ) ) ;
+sky130_fd_sc_hd__decap_6 \xofiller!sky130_fd_sc_hd__decap_6!x703800y27200 ( 
+    .VPWR ( VDD ) , .VGND ( VSS ) ) ;
+sky130_fd_sc_hd__decap_12 \xofiller!sky130_fd_sc_hd__decap_12!x0y54400 ( 
+    .VPWR ( VDD ) , .VGND ( VSS ) ) ;
 sky130_fd_sc_hd__decap_4 \xofiller!sky130_fd_sc_hd__decap_4!x55200y54400 ( 
     .VPWR ( VDD ) , .VGND ( VSS ) ) ;
 sky130_fd_sc_hd__decap_12 \xofiller!sky130_fd_sc_hd__decap_12!x271400y54400 ( 
     .VPWR ( VDD ) , .VGND ( VSS ) ) ;
+sky130_fd_sc_hd__buf_8 ropt_mt_inst_1280 ( .A ( ropt_net_136 ) , 
+    .X ( chany_top_out[8] ) , .VPWR ( VDD ) , .VGND ( VSS ) ) ;
 sky130_fd_sc_hd__decap_8 \xofiller!sky130_fd_sc_hd__decap_8!x326600y54400 ( 
     .VPWR ( VDD ) , .VGND ( VSS ) ) ;
 sky130_fd_sc_hd__decap_12 \xofiller!sky130_fd_sc_hd__decap_12!x598000y54400 ( 
@@ -5504,8 +5506,6 @@ sky130_fd_sc_hd__decap_12 \xofiller!sky130_fd_sc_hd__decap_12!x55200y81600 (
     .VPWR ( VDD ) , .VGND ( VSS ) ) ;
 sky130_fd_sc_hd__decap_12 \xofiller!sky130_fd_sc_hd__decap_12!x110400y81600 ( 
     .VPWR ( VDD ) , .VGND ( VSS ) ) ;
-sky130_fd_sc_hd__buf_8 ropt_mt_inst_1280 ( .A ( ropt_net_136 ) , 
-    .X ( chany_top_out[8] ) , .VPWR ( VDD ) , .VGND ( VSS ) ) ;
 sky130_fd_sc_hd__decap_12 \xofiller!sky130_fd_sc_hd__decap_12!x225400y81600 ( 
     .VPWR ( VDD ) , .VGND ( VSS ) ) ;
 sky130_fd_sc_hd__decap_8 \xofiller!sky130_fd_sc_hd__decap_8!x322000y81600 ( 
@@ -17451,10 +17451,10 @@ sky130_fd_sc_hd__conb_1 optlc_162 ( .LO ( SYNOPSYS_UNCONNECTED_122 ) ,
     .HI ( optlc_net_154 ) , .VPWR ( VDD ) , .VGND ( VSS ) ) ;
 sky130_fd_sc_hd__conb_1 optlc_164 ( .LO ( SYNOPSYS_UNCONNECTED_123 ) , 
     .HI ( optlc_net_155 ) , .VPWR ( VDD ) , .VGND ( VSS ) ) ;
-sky130_fd_sc_hd__buf_8 ropt_mt_inst_1347 ( .A ( ropt_net_177 ) , 
-    .X ( chany_bottom_out[15] ) , .VPWR ( VDD ) , .VGND ( VSS ) ) ;
 sky130_fd_sc_hd__decap_6 \xofiller!sky130_fd_sc_hd__decap_6!x303600y0 ( 
     .VPWR ( VDD ) , .VGND ( VSS ) ) ;
+sky130_fd_sc_hd__buf_8 ropt_mt_inst_1347 ( .A ( ropt_net_177 ) , 
+    .X ( chany_bottom_out[15] ) , .VPWR ( VDD ) , .VGND ( VSS ) ) ;
 sky130_fd_sc_hd__decap_4 \xofiller!sky130_fd_sc_hd__decap_4!x377200y0 ( 
     .VPWR ( VDD ) , .VGND ( VSS ) ) ;
 sky130_fd_sc_hd__decap_6 \xofiller!sky130_fd_sc_hd__decap_6!x437000y0 ( 
@@ -44711,14 +44711,6 @@ sky130_fd_sc_hd__decap_3 \xofiller!sky130_fd_sc_hd__decap_3!x414000y0 (
     .VPWR ( VDD ) , .VGND ( VSS ) ) ;
 sky130_fd_sc_hd__decap_8 \xofiller!sky130_fd_sc_hd__decap_8!x524400y0 ( 
     .VPWR ( VDD ) , .VGND ( VSS ) ) ;
-sky130_fd_sc_hd__decap_12 \xofiller!sky130_fd_sc_hd__decap_12!x676200y0 ( 
-    .VPWR ( VDD ) , .VGND ( VSS ) ) ;
-sky130_fd_sc_hd__decap_12 \xofiller!sky130_fd_sc_hd__decap_12!x0y27200 ( 
-    .VPWR ( VDD ) , .VGND ( VSS ) ) ;
-sky130_fd_sc_hd__decap_12 \xofiller!sky130_fd_sc_hd__decap_12!x96600y27200 ( 
-    .VPWR ( VDD ) , .VGND ( VSS ) ) ;
-sky130_fd_sc_hd__decap_4 \xofiller!sky130_fd_sc_hd__decap_4!x202400y27200 ( 
-    .VPWR ( VDD ) , .VGND ( VSS ) ) ;
 sky130_fd_sc_hd__buf_8 ropt_mt_inst_1293 ( .A ( ropt_net_128 ) , 
     .X ( chany_bottom_out[4] ) , .VPWR ( VDD ) , .VGND ( VSS ) ) ;
 sky130_fd_sc_hd__buf_8 ropt_mt_inst_1294 ( .A ( ropt_net_129 ) , 
@@ -44727,6 +44719,14 @@ sky130_fd_sc_hd__buf_8 ropt_mt_inst_1295 ( .A ( ropt_net_130 ) ,
     .X ( chany_bottom_out[16] ) , .VPWR ( VDD ) , .VGND ( VSS ) ) ;
 sky130_fd_sc_hd__buf_8 ropt_mt_inst_1296 ( .A ( ropt_net_131 ) , 
     .X ( chany_bottom_out[13] ) , .VPWR ( VDD ) , .VGND ( VSS ) ) ;
+sky130_fd_sc_hd__decap_12 \xofiller!sky130_fd_sc_hd__decap_12!x676200y0 ( 
+    .VPWR ( VDD ) , .VGND ( VSS ) ) ;
+sky130_fd_sc_hd__decap_12 \xofiller!sky130_fd_sc_hd__decap_12!x0y27200 ( 
+    .VPWR ( VDD ) , .VGND ( VSS ) ) ;
+sky130_fd_sc_hd__decap_12 \xofiller!sky130_fd_sc_hd__decap_12!x96600y27200 ( 
+    .VPWR ( VDD ) , .VGND ( VSS ) ) ;
+sky130_fd_sc_hd__decap_4 \xofiller!sky130_fd_sc_hd__decap_4!x202400y27200 ( 
+    .VPWR ( VDD ) , .VGND ( VSS ) ) ;
 sky130_fd_sc_hd__decap_12 \xofiller!sky130_fd_sc_hd__decap_12!x225400y27200 ( 
     .VPWR ( VDD ) , .VGND ( VSS ) ) ;
 sky130_fd_sc_hd__decap_4 \xofiller!sky130_fd_sc_hd__decap_4!x280600y27200 ( 
@@ -52576,14 +52576,14 @@ sky130_fd_sc_hd__decap_12 \xofiller!sky130_fd_sc_hd__decap_12!x432400y0 (
     .VPWR ( VDD ) , .VGND ( VSS ) ) ;
 sky130_fd_sc_hd__decap_6 \xofiller!sky130_fd_sc_hd__decap_6!x487600y0 ( 
     .VPWR ( VDD ) , .VGND ( VSS ) ) ;
+sky130_fd_sc_hd__decap_12 \xofiller!sky130_fd_sc_hd__decap_12!x524400y0 ( 
+    .VPWR ( VDD ) , .VGND ( VSS ) ) ;
 sky130_fd_sc_hd__buf_8 ropt_mt_inst_1299 ( .A ( ropt_net_133 ) , 
     .X ( chany_top_out[4] ) , .VPWR ( VDD ) , .VGND ( VSS ) ) ;
 sky130_fd_sc_hd__buf_8 ropt_mt_inst_1300 ( .A ( ropt_net_134 ) , 
     .X ( chany_top_out[9] ) , .VPWR ( VDD ) , .VGND ( VSS ) ) ;
 sky130_fd_sc_hd__buf_8 ropt_mt_inst_1301 ( .A ( ropt_net_135 ) , 
     .X ( chany_top_out[12] ) , .VPWR ( VDD ) , .VGND ( VSS ) ) ;
-sky130_fd_sc_hd__decap_12 \xofiller!sky130_fd_sc_hd__decap_12!x524400y0 ( 
-    .VPWR ( VDD ) , .VGND ( VSS ) ) ;
 sky130_fd_sc_hd__decap_12 \xofiller!sky130_fd_sc_hd__decap_12!x579600y0 ( 
     .VPWR ( VDD ) , .VGND ( VSS ) ) ;
 sky130_fd_sc_hd__decap_8 \xofiller!sky130_fd_sc_hd__decap_8!x634800y0 ( 
@@ -52592,10 +52592,10 @@ sky130_fd_sc_hd__decap_12 \xofiller!sky130_fd_sc_hd__decap_12!x676200y0 (
     .VPWR ( VDD ) , .VGND ( VSS ) ) ;
 sky130_fd_sc_hd__decap_12 \xofiller!sky130_fd_sc_hd__decap_12!x731400y0 ( 
     .VPWR ( VDD ) , .VGND ( VSS ) ) ;
-sky130_fd_sc_hd__buf_8 ropt_mt_inst_1307 ( .A ( ropt_net_141 ) , 
-    .X ( chany_top_out[1] ) , .VPWR ( VDD ) , .VGND ( VSS ) ) ;
 sky130_fd_sc_hd__decap_6 \xofiller!sky130_fd_sc_hd__decap_6!x786600y0 ( 
     .VPWR ( VDD ) , .VGND ( VSS ) ) ;
+sky130_fd_sc_hd__buf_8 ropt_mt_inst_1307 ( .A ( ropt_net_141 ) , 
+    .X ( chany_top_out[1] ) , .VPWR ( VDD ) , .VGND ( VSS ) ) ;
 sky130_fd_sc_hd__decap_12 \xofiller!sky130_fd_sc_hd__decap_12!x823400y0 ( 
     .VPWR ( VDD ) , .VGND ( VSS ) ) ;
 sky130_fd_sc_hd__decap_12 \xofiller!sky130_fd_sc_hd__decap_12!x878600y0 ( 
diff --git a/FPGA1212_QLSOFA_HD_PNR/fpga_top/fpga_top_icv_in_design.nominal_25.spef.gz b/FPGA1212_QLSOFA_HD_PNR/fpga_top/fpga_top_icv_in_design.nominal_25.spef.gz
index 4965be8..e2c6913 100644
Binary files a/FPGA1212_QLSOFA_HD_PNR/fpga_top/fpga_top_icv_in_design.nominal_25.spef.gz and b/FPGA1212_QLSOFA_HD_PNR/fpga_top/fpga_top_icv_in_design.nominal_25.spef.gz differ