[GDS/RTL] Updated top/user_project_wrapper GDS
diff --git a/def/user_project_wrapper.def b/def/user_project_wrapper.def
index b8cf8ce..ea097e5 100644
--- a/def/user_project_wrapper.def
+++ b/def/user_project_wrapper.def
@@ -1580,7 +1580,7 @@
       + PORT
         + LAYER met3 ( -3600 -600 ) ( 3600 600 )
         + PLACED ( 2921200 2024700 ) N ;
-    - io_oeb[0] + NET one_ + DIRECTION OUTPUT + USE SIGNAL
+    - io_oeb[0] + NET zero_ + DIRECTION OUTPUT + USE SIGNAL
       + PORT
         + LAYER met3 ( -3600 -600 ) ( 3600 600 )
         + PLACED ( 2921200 165580 ) N ;
@@ -1624,7 +1624,7 @@
       + PORT
         + LAYER met2 ( -280 -3600 ) ( 280 3600 )
         + PLACED ( 1338370 3521200 ) N ;
-    - io_oeb[1] + NET one_ + DIRECTION OUTPUT + USE SIGNAL
+    - io_oeb[1] + NET zero_ + DIRECTION OUTPUT + USE SIGNAL
       + PORT
         + LAYER met3 ( -3600 -600 ) ( 3600 600 )
         + PLACED ( 2921200 364820 ) N ;
@@ -1680,27 +1680,27 @@
       + PORT
         + LAYER met3 ( -3600 -600 ) ( 3600 600 )
         + PLACED ( -1200 1465740 ) N ;
-    - io_oeb[32] + NET zero_ + DIRECTION OUTPUT + USE SIGNAL
+    - io_oeb[32] + NET one_ + DIRECTION OUTPUT + USE SIGNAL
       + PORT
         + LAYER met3 ( -3600 -600 ) ( 3600 600 )
         + PLACED ( -1200 1205300 ) N ;
-    - io_oeb[33] + NET zero_ + DIRECTION OUTPUT + USE SIGNAL
+    - io_oeb[33] + NET one_ + DIRECTION OUTPUT + USE SIGNAL
       + PORT
         + LAYER met3 ( -3600 -600 ) ( 3600 600 )
         + PLACED ( -1200 944180 ) N ;
-    - io_oeb[34] + NET zero_ + DIRECTION OUTPUT + USE SIGNAL
+    - io_oeb[34] + NET one_ + DIRECTION OUTPUT + USE SIGNAL
       + PORT
         + LAYER met3 ( -3600 -600 ) ( 3600 600 )
         + PLACED ( -1200 683740 ) N ;
-    - io_oeb[35] + NET zero_ + DIRECTION OUTPUT + USE SIGNAL
+    - io_oeb[35] + NET one_ + DIRECTION OUTPUT + USE SIGNAL
       + PORT
         + LAYER met3 ( -3600 -600 ) ( 3600 600 )
         + PLACED ( -1200 423300 ) N ;
-    - io_oeb[36] + NET zero_ + DIRECTION OUTPUT + USE SIGNAL
+    - io_oeb[36] + NET one_ + DIRECTION OUTPUT + USE SIGNAL
       + PORT
         + LAYER met3 ( -3600 -600 ) ( 3600 600 )
         + PLACED ( -1200 227460 ) N ;
-    - io_oeb[37] + NET zero_ + DIRECTION OUTPUT + USE SIGNAL
+    - io_oeb[37] + NET one_ + DIRECTION OUTPUT + USE SIGNAL
       + PORT
         + LAYER met3 ( -3600 -600 ) ( 3600 600 )
         + PLACED ( -1200 32300 ) N ;
@@ -1732,7 +1732,7 @@
       + PORT
         + LAYER met3 ( -3600 -600 ) ( 3600 600 )
         + PLACED ( 2921200 2157980 ) N ;
-    - io_out[0] + NET prog_we_o + DIRECTION OUTPUT + USE SIGNAL
+    - io_out[0] + NET io_out[0] + DIRECTION OUTPUT + USE SIGNAL
       + PORT
         + LAYER met3 ( -3600 -600 ) ( 3600 600 )
         + PLACED ( 2921200 98940 ) N ;
@@ -1776,7 +1776,7 @@
       + PORT
         + LAYER met2 ( -280 -3600 ) ( 280 3600 )
         + PLACED ( 1419330 3521200 ) N ;
-    - io_out[1] + NET prog_dout + DIRECTION OUTPUT + USE SIGNAL
+    - io_out[1] + NET io_out[1] + DIRECTION OUTPUT + USE SIGNAL
       + PORT
         + LAYER met3 ( -3600 -600 ) ( 3600 600 )
         + PLACED ( 2921200 298180 ) N ;
@@ -6878,7 +6878,7 @@
       NEW met2 ( 2684330 640900 ) M2M3_PR
       NEW met1 ( 2684330 641410 ) M1M2_PR
       NEW met1 ( 2777250 641410 ) M1M2_PR ;
-    - io_oeb[10] ( PIN io_oeb[10] ) ( dut oe_x9y5_1 ) + USE SIGNAL
+    - io_oeb[10] ( PIN io_oeb[10] ) ( dut oeb_x9y5_1 ) + USE SIGNAL
       + ROUTED met2 ( 2900990 2423180 ) ( * 2428790 )
       NEW met3 ( 2900990 2423180 ) ( 2917780 * 0 )
       NEW met1 ( 2687550 2428790 ) ( 2900990 * )
@@ -6889,7 +6889,7 @@
       NEW met2 ( 2900990 2423180 ) M2M3_PR
       NEW met1 ( 2687550 2428790 ) M1M2_PR
       NEW met2 ( 2687550 2838660 ) M2M3_PR ;
-    - io_oeb[11] ( PIN io_oeb[11] ) ( dut oe_x9y6_0 ) + USE SIGNAL
+    - io_oeb[11] ( PIN io_oeb[11] ) ( dut oeb_x9y6_0 ) + USE SIGNAL
       + ROUTED met2 ( 2899610 2689060 ) ( * 2690930 )
       NEW met3 ( 2899610 2689060 ) ( 2917780 * 0 )
       NEW met3 ( 2673980 2905300 ) ( * 2908020 0 )
@@ -6900,7 +6900,7 @@
       NEW met2 ( 2899610 2689060 ) M2M3_PR
       NEW met2 ( 2688010 2905300 ) M2M3_PR
       NEW met1 ( 2688010 2690930 ) M1M2_PR ;
-    - io_oeb[12] ( PIN io_oeb[12] ) ( dut oe_x9y7_0 ) + USE SIGNAL
+    - io_oeb[12] ( PIN io_oeb[12] ) ( dut oeb_x9y7_0 ) + USE SIGNAL
       + ROUTED met2 ( 2900990 2954940 ) ( * 2959870 )
       NEW met3 ( 2900990 2954940 ) ( 2917780 * 0 )
       NEW met3 ( 2673980 3038580 ) ( * 3041300 0 )
@@ -6911,7 +6911,7 @@
       NEW met2 ( 2900990 2954940 ) M2M3_PR
       NEW met1 ( 2687550 2959870 ) M1M2_PR
       NEW met2 ( 2687550 3038580 ) M2M3_PR ;
-    - io_oeb[13] ( PIN io_oeb[13] ) ( dut oe_x9y7_1 ) + USE SIGNAL
+    - io_oeb[13] ( PIN io_oeb[13] ) ( dut oeb_x9y7_1 ) + USE SIGNAL
       + ROUTED met2 ( 2900990 3215550 ) ( * 3220140 )
       NEW met3 ( 2900990 3220140 ) ( 2917780 * 0 )
       NEW met3 ( 2673980 3107940 0 ) ( * 3110660 )
@@ -6922,7 +6922,7 @@
       NEW met2 ( 2900990 3220140 ) M2M3_PR
       NEW met2 ( 2688010 3110660 ) M2M3_PR
       NEW met1 ( 2688010 3215550 ) M1M2_PR ;
-    - io_oeb[14] ( PIN io_oeb[14] ) ( dut oe_x9y8_0 ) + USE SIGNAL
+    - io_oeb[14] ( PIN io_oeb[14] ) ( dut oeb_x9y8_0 ) + USE SIGNAL
       + ROUTED met2 ( 2900990 3484830 ) ( * 3486020 )
       NEW met3 ( 2900990 3486020 ) ( 2917780 * 0 )
       NEW met3 ( 2673980 3174580 0 ) ( * 3177300 )
@@ -6933,7 +6933,7 @@
       NEW met2 ( 2900990 3486020 ) M2M3_PR
       NEW met2 ( 2687550 3177300 ) M2M3_PR
       NEW met1 ( 2687550 3484830 ) M1M2_PR ;
-    - io_oeb[15] ( PIN io_oeb[15] ) ( dut oe_x8y9_1 ) + USE SIGNAL
+    - io_oeb[15] ( PIN io_oeb[15] ) ( dut oeb_x8y9_1 ) + USE SIGNAL
       + ROUTED met2 ( 2636030 3498430 ) ( * 3517980 0 )
       NEW met2 ( 2645690 3274540 ) ( 2647530 * 0 )
       NEW met1 ( 2636030 3498430 ) ( 2642930 * )
@@ -6942,21 +6942,21 @@
       NEW met2 ( 2642930 3367200 ) ( * 3498430 )
       NEW met1 ( 2636030 3498430 ) M1M2_PR
       NEW met1 ( 2642930 3498430 ) M1M2_PR ;
-    - io_oeb[16] ( PIN io_oeb[16] ) ( dut oe_x7y9_0 ) + USE SIGNAL
+    - io_oeb[16] ( PIN io_oeb[16] ) ( dut oeb_x7y9_0 ) + USE SIGNAL
       + ROUTED met2 ( 2311730 3287970 ) ( * 3517980 0 )
       NEW met2 ( 2484230 3274540 ) ( 2485150 * 0 )
       NEW met2 ( 2484230 3274540 ) ( * 3287970 )
       NEW met1 ( 2311730 3287970 ) ( 2484230 * )
       NEW met1 ( 2311730 3287970 ) M1M2_PR
       NEW met1 ( 2484230 3287970 ) M1M2_PR ;
-    - io_oeb[17] ( PIN io_oeb[17] ) ( dut oe_x6y9_0 ) + USE SIGNAL
+    - io_oeb[17] ( PIN io_oeb[17] ) ( dut oeb_x6y9_0 ) + USE SIGNAL
       + ROUTED met2 ( 2374750 3274540 ) ( 2376590 * 0 )
       NEW met2 ( 2374750 3274540 ) ( * 3287630 )
       NEW met1 ( 1987430 3287630 ) ( 2374750 * )
       NEW met2 ( 1987430 3287630 ) ( * 3517980 0 )
       NEW met1 ( 1987430 3287630 ) M1M2_PR
       NEW met1 ( 2374750 3287630 ) M1M2_PR ;
-    - io_oeb[18] ( PIN io_oeb[18] ) ( dut oe_x5y9_0 ) + USE SIGNAL
+    - io_oeb[18] ( PIN io_oeb[18] ) ( dut oeb_x5y9_0 ) + USE SIGNAL
       + ROUTED met1 ( 1656230 3515090 ) ( 1662670 * )
       NEW met2 ( 1662670 3515090 ) ( * 3517980 0 )
       NEW met2 ( 1656230 3289330 ) ( * 3515090 )
@@ -6967,7 +6967,7 @@
       NEW met1 ( 1656230 3515090 ) M1M2_PR
       NEW met1 ( 1662670 3515090 ) M1M2_PR
       NEW met1 ( 2267110 3289330 ) M1M2_PR ;
-    - io_oeb[19] ( PIN io_oeb[19] ) ( dut oe_x4y9_0 ) + USE SIGNAL
+    - io_oeb[19] ( PIN io_oeb[19] ) ( dut oeb_x4y9_0 ) + USE SIGNAL
       + ROUTED met1 ( 1331930 3487890 ) ( 1338370 * )
       NEW met2 ( 2159930 3274540 0 ) ( 2160390 * )
       NEW met2 ( 2160390 3274540 ) ( * 3288990 )
@@ -6978,7 +6978,7 @@
       NEW met1 ( 1331930 3487890 ) M1M2_PR
       NEW met1 ( 1338370 3487890 ) M1M2_PR
       NEW met1 ( 2160390 3288990 ) M1M2_PR ;
-    - io_oeb[20] ( PIN io_oeb[20] ) ( dut oe_x3y9_0 ) + USE SIGNAL
+    - io_oeb[20] ( PIN io_oeb[20] ) ( dut oeb_x3y9_0 ) + USE SIGNAL
       + ROUTED met2 ( 2049990 3274540 ) ( 2051830 * 0 )
       NEW met2 ( 2049990 3274540 ) ( * 3288650 )
       NEW met1 ( 1007630 3288650 ) ( 2049990 * )
@@ -6989,7 +6989,7 @@
       NEW met1 ( 1007630 3288650 ) M1M2_PR
       NEW met1 ( 1007630 3515090 ) M1M2_PR
       NEW met1 ( 1014070 3515090 ) M1M2_PR ;
-    - io_oeb[21] ( PIN io_oeb[21] ) ( dut oe_x2y9_1 ) + USE SIGNAL
+    - io_oeb[21] ( PIN io_oeb[21] ) ( dut oeb_x2y9_1 ) + USE SIGNAL
       + ROUTED met2 ( 683330 3517980 ) ( 688390 * )
       NEW met2 ( 688390 3517300 ) ( * 3517980 )
       NEW met2 ( 688390 3517300 ) ( 689310 * )
@@ -7000,7 +7000,7 @@
       NEW met1 ( 683330 3288310 ) ( 1995710 * )
       NEW met1 ( 683330 3288310 ) M1M2_PR
       NEW met1 ( 1995710 3288310 ) M1M2_PR ;
-    - io_oeb[22] ( PIN io_oeb[22] ) ( dut oe_x2y9_0 ) + USE SIGNAL
+    - io_oeb[22] ( PIN io_oeb[22] ) ( dut oeb_x2y9_0 ) + USE SIGNAL
       + ROUTED met2 ( 1941430 3274540 ) ( 1943270 * 0 )
       NEW met2 ( 1941430 3274540 ) ( * 3287970 )
       NEW met1 ( 359030 3287970 ) ( 1941430 * )
@@ -7011,7 +7011,7 @@
       NEW met1 ( 359030 3287970 ) M1M2_PR
       NEW met1 ( 359030 3515090 ) M1M2_PR
       NEW met1 ( 365010 3515090 ) M1M2_PR ;
-    - io_oeb[23] ( PIN io_oeb[23] ) ( dut oe_x1y9_0 ) + USE SIGNAL
+    - io_oeb[23] ( PIN io_oeb[23] ) ( dut oeb_x1y9_0 ) + USE SIGNAL
       + ROUTED met2 ( 1833790 3274540 ) ( 1835170 * 0 )
       NEW met2 ( 1833790 3274540 ) ( * 3287630 )
       NEW met1 ( 34730 3287630 ) ( 1833790 * )
@@ -7022,7 +7022,7 @@
       NEW met2 ( 34730 3287630 ) ( * 3517980 )
       NEW met1 ( 1833790 3287630 ) M1M2_PR
       NEW met1 ( 34730 3287630 ) M1M2_PR ;
-    - io_oeb[24] ( PIN io_oeb[24] ) ( dut oe_x0y8_0 ) + USE SIGNAL
+    - io_oeb[24] ( PIN io_oeb[24] ) ( dut oeb_x0y8_0 ) + USE SIGNAL
       + ROUTED met3 ( 1380 3290860 0 ) ( 17250 * )
       NEW met2 ( 17250 3180870 ) ( * 3290860 )
       NEW met2 ( 62330 3177300 ) ( * 3180870 )
@@ -7033,7 +7033,7 @@
       NEW met2 ( 17250 3290860 ) M2M3_PR
       NEW met1 ( 62330 3180870 ) M1M2_PR
       NEW met2 ( 62330 3177300 ) M2M3_PR ;
-    - io_oeb[25] ( PIN io_oeb[25] ) ( dut oe_x0y7_0 ) + USE SIGNAL
+    - io_oeb[25] ( PIN io_oeb[25] ) ( dut oeb_x0y7_0 ) + USE SIGNAL
       + ROUTED met3 ( 1380 3030420 0 ) ( 17250 * )
       NEW met2 ( 17250 3030420 ) ( * 3035690 )
       NEW met2 ( 62330 3035690 ) ( * 3038580 )
@@ -7044,7 +7044,7 @@
       NEW met1 ( 17250 3035690 ) M1M2_PR
       NEW met1 ( 62330 3035690 ) M1M2_PR
       NEW met2 ( 62330 3038580 ) M2M3_PR ;
-    - io_oeb[26] ( PIN io_oeb[26] ) ( dut oe_x0y6_0 ) + USE SIGNAL
+    - io_oeb[26] ( PIN io_oeb[26] ) ( dut oeb_x0y6_0 ) + USE SIGNAL
       + ROUTED met3 ( 1380 2769300 0 ) ( 17710 * )
       NEW met2 ( 17710 2769300 ) ( * 2905130 )
       NEW met2 ( 62330 2905130 ) ( * 2906660 )
@@ -7055,7 +7055,7 @@
       NEW met2 ( 17710 2769300 ) M2M3_PR
       NEW met1 ( 62330 2905130 ) M1M2_PR
       NEW met2 ( 62330 2906660 ) M2M3_PR ;
-    - io_oeb[27] ( PIN io_oeb[27] ) ( dut oe_x0y5_0 ) + USE SIGNAL
+    - io_oeb[27] ( PIN io_oeb[27] ) ( dut oeb_x0y5_0 ) + USE SIGNAL
       + ROUTED met3 ( 1380 2508860 0 ) ( 18170 * )
       NEW met2 ( 18170 2508860 ) ( * 2773890 )
       NEW met2 ( 62330 2773890 ) ( * 2774060 )
@@ -7066,7 +7066,7 @@
       NEW met1 ( 18170 2773890 ) M1M2_PR
       NEW met1 ( 62330 2773890 ) M1M2_PR
       NEW met2 ( 62330 2774060 ) M2M3_PR ;
-    - io_oeb[28] ( PIN io_oeb[28] ) ( dut oe_x0y4_0 ) + USE SIGNAL
+    - io_oeb[28] ( PIN io_oeb[28] ) ( dut oeb_x0y4_0 ) + USE SIGNAL
       + ROUTED met3 ( 1380 2247740 0 ) ( 16790 * )
       NEW met2 ( 16790 2247740 ) ( * 2249270 )
       NEW met1 ( 16790 2249270 ) ( 66470 * )
@@ -7077,7 +7077,7 @@
       NEW met1 ( 16790 2249270 ) M1M2_PR
       NEW met1 ( 66470 2249270 ) M1M2_PR
       NEW met2 ( 66470 2638740 ) M2M3_PR ;
-    - io_oeb[29] ( PIN io_oeb[29] ) ( dut oe_x0y3_0 ) + USE SIGNAL
+    - io_oeb[29] ( PIN io_oeb[29] ) ( dut oeb_x0y3_0 ) + USE SIGNAL
       + ROUTED met3 ( 1380 1987300 0 ) ( 15410 * )
       NEW met2 ( 15410 1987300 ) ( * 1993930 )
       NEW met3 ( 66010 2505460 ) ( 75900 * )
@@ -7088,7 +7088,7 @@
       NEW met1 ( 15410 1993930 ) M1M2_PR
       NEW met2 ( 66010 2505460 ) M2M3_PR
       NEW met1 ( 66010 1993930 ) M1M2_PR ;
-    - io_oeb[2] ( PIN io_oeb[2] ) ( dut oe_x9y1_0 ) + USE SIGNAL
+    - io_oeb[2] ( PIN io_oeb[2] ) ( dut oeb_x9y1_0 ) + USE SIGNAL
       + ROUTED met2 ( 2900990 564060 ) ( * 565590 )
       NEW met3 ( 2900990 564060 ) ( 2917780 * 0 )
       NEW met3 ( 2673980 2238900 ) ( * 2241620 0 )
@@ -7103,7 +7103,7 @@
       NEW met1 ( 2684330 2235670 ) M1M2_PR
       NEW met1 ( 2784150 2235670 ) M1M2_PR
       NEW met1 ( 2784150 565590 ) M1M2_PR ;
-    - io_oeb[30] ( PIN io_oeb[30] ) ( dut oe_x0y2_0 ) + USE SIGNAL
+    - io_oeb[30] ( PIN io_oeb[30] ) ( dut oeb_x0y2_0 ) + USE SIGNAL
       + ROUTED met3 ( 1380 1726860 0 ) ( 16790 * )
       NEW met2 ( 16790 1726860 ) ( * 1729750 )
       NEW met1 ( 16790 1729750 ) ( 44850 * )
@@ -7118,7 +7118,7 @@
       NEW met1 ( 44850 2373710 ) M1M2_PR
       NEW met1 ( 62330 2373710 ) M1M2_PR
       NEW met2 ( 62330 2374220 ) M2M3_PR ;
-    - io_oeb[31] ( PIN io_oeb[31] ) ( dut oe_x0y1_1 ) + USE SIGNAL
+    - io_oeb[31] ( PIN io_oeb[31] ) ( dut oeb_x0y1_1 ) + USE SIGNAL
       + ROUTED met3 ( 1380 1465740 0 ) ( 17710 * )
       NEW met2 ( 17710 1465740 ) ( * 1469650 )
       NEW met1 ( 17710 1469650 ) ( 65550 * )
@@ -7129,7 +7129,7 @@
       NEW met1 ( 17710 1469650 ) M1M2_PR
       NEW met1 ( 65550 1469650 ) M1M2_PR
       NEW met2 ( 65550 2306220 ) M2M3_PR ;
-    - io_oeb[3] ( PIN io_oeb[3] ) ( dut oe_x9y1_1 ) + USE SIGNAL
+    - io_oeb[3] ( PIN io_oeb[3] ) ( dut oeb_x9y1_1 ) + USE SIGNAL
       + ROUTED met2 ( 2898230 763300 ) ( * 765850 )
       NEW met3 ( 2898230 763300 ) ( 2917780 * 0 )
       NEW met2 ( 2791050 765850 ) ( * 2304690 )
@@ -7144,7 +7144,7 @@
       NEW met2 ( 2898230 763300 ) M2M3_PR
       NEW met2 ( 2684330 2306220 ) M2M3_PR
       NEW met1 ( 2684330 2304690 ) M1M2_PR ;
-    - io_oeb[4] ( PIN io_oeb[4] ) ( dut oe_x9y2_0 ) + USE SIGNAL
+    - io_oeb[4] ( PIN io_oeb[4] ) ( dut oeb_x9y2_0 ) + USE SIGNAL
       + ROUTED met2 ( 2900990 962540 ) ( * 965770 )
       NEW met3 ( 2900990 962540 ) ( 2917780 * 0 )
       NEW met1 ( 2687550 965770 ) ( 2900990 * )
@@ -7155,7 +7155,7 @@
       NEW met2 ( 2900990 962540 ) M2M3_PR
       NEW met1 ( 2687550 965770 ) M1M2_PR
       NEW met2 ( 2687550 2374220 ) M2M3_PR ;
-    - io_oeb[5] ( PIN io_oeb[5] ) ( dut oe_x9y2_1 ) + USE SIGNAL
+    - io_oeb[5] ( PIN io_oeb[5] ) ( dut oeb_x9y2_1 ) + USE SIGNAL
       + ROUTED met2 ( 2900070 1161780 ) ( * 1166030 )
       NEW met3 ( 2900070 1161780 ) ( 2917780 * 0 )
       NEW met3 ( 2673980 2438820 ) ( * 2441540 0 )
@@ -7166,7 +7166,7 @@
       NEW met2 ( 2900070 1161780 ) M2M3_PR
       NEW met1 ( 2688010 1166030 ) M1M2_PR
       NEW met2 ( 2688010 2438820 ) M2M3_PR ;
-    - io_oeb[6] ( PIN io_oeb[6] ) ( dut oe_x9y3_0 ) + USE SIGNAL
+    - io_oeb[6] ( PIN io_oeb[6] ) ( dut oeb_x9y3_0 ) + USE SIGNAL
       + ROUTED met2 ( 2900990 1361020 ) ( * 1365950 )
       NEW met3 ( 2900990 1361020 ) ( 2917780 * 0 )
       NEW met3 ( 2673980 2506820 ) ( * 2508180 0 )
@@ -7181,7 +7181,7 @@
       NEW met1 ( 2684330 2504950 ) M1M2_PR
       NEW met1 ( 2742750 1365950 ) M1M2_PR
       NEW met1 ( 2742750 2504950 ) M1M2_PR ;
-    - io_oeb[7] ( PIN io_oeb[7] ) ( dut oe_x9y3_1 ) + USE SIGNAL
+    - io_oeb[7] ( PIN io_oeb[7] ) ( dut oeb_x9y3_1 ) + USE SIGNAL
       + ROUTED met2 ( 2899610 1626220 ) ( * 1628090 )
       NEW met3 ( 2899610 1626220 ) ( 2917780 * 0 )
       NEW met3 ( 2673980 2574140 ) ( * 2574820 0 )
@@ -7192,7 +7192,7 @@
       NEW met2 ( 2899610 1626220 ) M2M3_PR
       NEW met1 ( 2688470 1628090 ) M1M2_PR
       NEW met2 ( 2688470 2574140 ) M2M3_PR ;
-    - io_oeb[8] ( PIN io_oeb[8] ) ( dut oe_x9y4_0 ) + USE SIGNAL
+    - io_oeb[8] ( PIN io_oeb[8] ) ( dut oeb_x9y4_0 ) + USE SIGNAL
       + ROUTED met2 ( 2900990 1892100 ) ( * 1897370 )
       NEW met3 ( 2900990 1892100 ) ( 2917780 * 0 )
       NEW met3 ( 2673980 2638740 ) ( * 2641460 0 )
@@ -7203,7 +7203,7 @@
       NEW met2 ( 2900990 1892100 ) M2M3_PR
       NEW met2 ( 2688930 2638740 ) M2M3_PR
       NEW met1 ( 2688930 1897370 ) M1M2_PR ;
-    - io_oeb[9] ( PIN io_oeb[9] ) ( dut oe_x9y5_0 ) + USE SIGNAL
+    - io_oeb[9] ( PIN io_oeb[9] ) ( dut oeb_x9y5_0 ) + USE SIGNAL
       + ROUTED met2 ( 2898230 2157980 ) ( * 2159510 )
       NEW met3 ( 2898230 2157980 ) ( 2917780 * 0 )
       NEW met1 ( 2689390 2159510 ) ( 2898230 * )
@@ -7214,6 +7214,18 @@
       NEW met2 ( 2898230 2157980 ) M2M3_PR
       NEW met1 ( 2689390 2159510 ) M1M2_PR
       NEW met2 ( 2689390 2774060 ) M2M3_PR ;
+    - io_out[0] ( PIN io_out[0] ) ( dut prog_we_o ) + USE SIGNAL
+      + ROUTED met2 ( 2900990 96730 ) ( * 98940 )
+      NEW met3 ( 2900990 98940 ) ( 2917780 * 0 )
+      NEW met1 ( 2674210 96730 ) ( 2900990 * )
+      NEW met2 ( 2488830 68510 ) ( * 75140 0 )
+      NEW met1 ( 2488830 68510 ) ( 2674210 * )
+      NEW met2 ( 2674210 68510 ) ( * 96730 )
+      NEW met1 ( 2900990 96730 ) M1M2_PR
+      NEW met2 ( 2900990 98940 ) M2M3_PR
+      NEW met1 ( 2674210 96730 ) M1M2_PR
+      NEW met1 ( 2488830 68510 ) M1M2_PR
+      NEW met1 ( 2674210 68510 ) M1M2_PR ;
     - io_out[10] ( PIN io_out[10] ) ( dut opin_x9y5_1 ) + USE SIGNAL
       + ROUTED met3 ( 2901910 2357220 ) ( 2917780 * 0 )
       NEW met2 ( 2901910 1780070 ) ( * 2357220 )
@@ -7322,6 +7334,18 @@
       NEW met2 ( 1419330 3503190 ) ( * 3517980 0 )
       NEW met1 ( 1290530 3503190 ) M1M2_PR
       NEW met1 ( 1419330 3503190 ) M1M2_PR ;
+    - io_out[1] ( PIN io_out[1] ) ( dut prog_dout ) + USE SIGNAL
+      + ROUTED met2 ( 2898690 296990 ) ( * 298180 )
+      NEW met3 ( 2898690 298180 ) ( 2917780 * 0 )
+      NEW met2 ( 1374710 68850 ) ( * 75140 0 )
+      NEW met1 ( 2673750 296990 ) ( 2898690 * )
+      NEW met1 ( 1374710 68850 ) ( 2673750 * )
+      NEW met2 ( 2673750 68850 ) ( * 296990 )
+      NEW met1 ( 2898690 296990 ) M1M2_PR
+      NEW met2 ( 2898690 298180 ) M2M3_PR
+      NEW met1 ( 1374710 68850 ) M1M2_PR
+      NEW met1 ( 2673750 296990 ) M1M2_PR
+      NEW met1 ( 2673750 68850 ) M1M2_PR ;
     - io_out[20] ( PIN io_out[20] ) ( dut opin_x3y9_0 ) + USE SIGNAL
       + ROUTED met2 ( 1183350 3274540 ) ( 1185190 * 0 )
       NEW met2 ( 1183350 3274540 ) ( * 3288990 )
@@ -7802,27 +7826,7 @@
     - la_oenb[98] ( PIN la_oenb[98] ) + USE SIGNAL ;
     - la_oenb[99] ( PIN la_oenb[99] ) + USE SIGNAL ;
     - la_oenb[9] ( PIN la_oenb[9] ) + USE SIGNAL ;
-    - one_ ( PIN io_oeb[1] ) ( PIN io_oeb[0] ) + USE POWER ;
-    - prog_dout ( PIN io_out[1] ) ( dut prog_dout ) + USE SIGNAL
-      + ROUTED met2 ( 2898690 296990 ) ( * 298180 )
-      NEW met3 ( 2898690 298180 ) ( 2917780 * 0 )
-      NEW met2 ( 1374710 68850 ) ( * 75140 0 )
-      NEW met1 ( 2673750 296990 ) ( 2898690 * )
-      NEW met1 ( 1374710 68850 ) ( 2673750 * )
-      NEW met2 ( 2673750 68850 ) ( * 296990 )
-      NEW met1 ( 2898690 296990 ) M1M2_PR
-      NEW met2 ( 2898690 298180 ) M2M3_PR
-      NEW met1 ( 1374710 68850 ) M1M2_PR
-      NEW met1 ( 2673750 296990 ) M1M2_PR
-      NEW met1 ( 2673750 68850 ) M1M2_PR ;
-    - prog_we_o ( PIN io_out[0] ) ( dut prog_we_o ) + USE SIGNAL
-      + ROUTED met3 ( 2901450 98940 ) ( 2917780 * 0 )
-      NEW met2 ( 2901450 68510 ) ( * 98940 )
-      NEW met2 ( 2488830 68510 ) ( * 75140 0 )
-      NEW met1 ( 2488830 68510 ) ( 2901450 * )
-      NEW met2 ( 2901450 98940 ) M2M3_PR
-      NEW met1 ( 2901450 68510 ) M1M2_PR
-      NEW met1 ( 2488830 68510 ) M1M2_PR ;
+    - one_ ( PIN io_oeb[37] ) ( PIN io_oeb[36] ) ( PIN io_oeb[35] ) ( PIN io_oeb[34] ) ( PIN io_oeb[33] ) ( PIN io_oeb[32] ) + USE POWER ;
     - user_clock2 ( PIN user_clock2 ) + USE SIGNAL ;
     - wb_clk_i ( PIN wb_clk_i ) + USE SIGNAL ;
     - wb_rst_i ( PIN wb_rst_i ) + USE SIGNAL ;
@@ -7918,7 +7922,6 @@
       ( PIN la_data_out[118] ) ( PIN la_data_out[117] ) ( PIN la_data_out[116] ) ( PIN la_data_out[115] ) ( PIN la_data_out[114] ) ( PIN la_data_out[113] ) ( PIN la_data_out[112] ) ( PIN la_data_out[111] )
       ( PIN la_data_out[110] ) ( PIN la_data_out[10] ) ( PIN la_data_out[109] ) ( PIN la_data_out[108] ) ( PIN la_data_out[107] ) ( PIN la_data_out[106] ) ( PIN la_data_out[105] ) ( PIN la_data_out[104] )
       ( PIN la_data_out[103] ) ( PIN la_data_out[102] ) ( PIN la_data_out[101] ) ( PIN la_data_out[100] ) ( PIN la_data_out[0] ) ( PIN io_out[37] ) ( PIN io_out[36] ) ( PIN io_out[35] )
-      ( PIN io_out[34] ) ( PIN io_out[33] ) ( PIN io_out[32] ) ( PIN io_oeb[37] ) ( PIN io_oeb[36] ) ( PIN io_oeb[35] ) ( PIN io_oeb[34] ) ( PIN io_oeb[33] )
-      ( PIN io_oeb[32] ) + USE GROUND ;
+      ( PIN io_out[34] ) ( PIN io_out[33] ) ( PIN io_out[32] ) ( PIN io_oeb[1] ) ( PIN io_oeb[0] ) + USE GROUND ;
 END NETS
 END DESIGN
diff --git a/gds/top.gds.gz b/gds/top.gds.gz
index a4cf7e3..7b27454 100644
--- a/gds/top.gds.gz
+++ b/gds/top.gds.gz
Binary files differ
diff --git a/gds/user_project_wrapper.gds.gz b/gds/user_project_wrapper.gds.gz
index 6294679..a6d4087 100644
--- a/gds/user_project_wrapper.gds.gz
+++ b/gds/user_project_wrapper.gds.gz
Binary files differ
diff --git a/lef/top.lef b/lef/top.lef
index a844a72..28235ca 100644
--- a/lef/top.lef
+++ b/lef/top.lef
@@ -391,390 +391,390 @@
         RECT 2596.000 1032.960 2600.000 1033.560 ;
     END
   END ipin_x9y8_1
-  PIN oe_x0y1_0
+  PIN oeb_x0y1_0
     DIRECTION OUTPUT TRISTATE ;
     USE SIGNAL ;
     PORT
       LAYER met3 ;
         RECT 0.000 2166.520 4.000 2167.120 ;
     END
-  END oe_x0y1_0
-  PIN oe_x0y1_1
+  END oeb_x0y1_0
+  PIN oeb_x0y1_1
     DIRECTION OUTPUT TRISTATE ;
     USE SIGNAL ;
     PORT
       LAYER met3 ;
         RECT 0.000 2233.160 4.000 2233.760 ;
     END
-  END oe_x0y1_1
-  PIN oe_x0y2_0
+  END oeb_x0y1_1
+  PIN oeb_x0y2_0
     DIRECTION OUTPUT TRISTATE ;
     USE SIGNAL ;
     PORT
       LAYER met3 ;
         RECT 0.000 2299.800 4.000 2300.400 ;
     END
-  END oe_x0y2_0
-  PIN oe_x0y2_1
+  END oeb_x0y2_0
+  PIN oeb_x0y2_1
     DIRECTION OUTPUT TRISTATE ;
     USE SIGNAL ;
     PORT
       LAYER met3 ;
         RECT 0.000 2366.440 4.000 2367.040 ;
     END
-  END oe_x0y2_1
-  PIN oe_x0y3_0
+  END oeb_x0y2_1
+  PIN oeb_x0y3_0
     DIRECTION OUTPUT TRISTATE ;
     USE SIGNAL ;
     PORT
       LAYER met3 ;
         RECT 0.000 2433.080 4.000 2433.680 ;
     END
-  END oe_x0y3_0
-  PIN oe_x0y3_1
+  END oeb_x0y3_0
+  PIN oeb_x0y3_1
     DIRECTION OUTPUT TRISTATE ;
     USE SIGNAL ;
     PORT
       LAYER met3 ;
         RECT 0.000 2499.720 4.000 2500.320 ;
     END
-  END oe_x0y3_1
-  PIN oe_x0y4_0
+  END oeb_x0y3_1
+  PIN oeb_x0y4_0
     DIRECTION OUTPUT TRISTATE ;
     USE SIGNAL ;
     PORT
       LAYER met3 ;
         RECT 0.000 2566.360 4.000 2566.960 ;
     END
-  END oe_x0y4_0
-  PIN oe_x0y4_1
+  END oeb_x0y4_0
+  PIN oeb_x0y4_1
     DIRECTION OUTPUT TRISTATE ;
     USE SIGNAL ;
     PORT
       LAYER met3 ;
         RECT 0.000 2633.000 4.000 2633.600 ;
     END
-  END oe_x0y4_1
-  PIN oe_x0y5_0
+  END oeb_x0y4_1
+  PIN oeb_x0y5_0
     DIRECTION OUTPUT TRISTATE ;
     USE SIGNAL ;
     PORT
       LAYER met3 ;
         RECT 0.000 2699.640 4.000 2700.240 ;
     END
-  END oe_x0y5_0
-  PIN oe_x0y5_1
+  END oeb_x0y5_0
+  PIN oeb_x0y5_1
     DIRECTION OUTPUT TRISTATE ;
     USE SIGNAL ;
     PORT
       LAYER met3 ;
         RECT 0.000 2766.280 4.000 2766.880 ;
     END
-  END oe_x0y5_1
-  PIN oe_x0y6_0
+  END oeb_x0y5_1
+  PIN oeb_x0y6_0
     DIRECTION OUTPUT TRISTATE ;
     USE SIGNAL ;
     PORT
       LAYER met3 ;
         RECT 0.000 2832.920 4.000 2833.520 ;
     END
-  END oe_x0y6_0
-  PIN oe_x0y6_1
+  END oeb_x0y6_0
+  PIN oeb_x0y6_1
     DIRECTION OUTPUT TRISTATE ;
     USE SIGNAL ;
     PORT
       LAYER met3 ;
         RECT 0.000 2899.560 4.000 2900.160 ;
     END
-  END oe_x0y6_1
-  PIN oe_x0y7_0
+  END oeb_x0y6_1
+  PIN oeb_x0y7_0
     DIRECTION OUTPUT TRISTATE ;
     USE SIGNAL ;
     PORT
       LAYER met3 ;
         RECT 0.000 2966.200 4.000 2966.800 ;
     END
-  END oe_x0y7_0
-  PIN oe_x0y7_1
+  END oeb_x0y7_0
+  PIN oeb_x0y7_1
     DIRECTION OUTPUT TRISTATE ;
     USE SIGNAL ;
     PORT
       LAYER met3 ;
         RECT 0.000 3032.840 4.000 3033.440 ;
     END
-  END oe_x0y7_1
-  PIN oe_x0y8_0
+  END oeb_x0y7_1
+  PIN oeb_x0y8_0
     DIRECTION OUTPUT TRISTATE ;
     USE SIGNAL ;
     PORT
       LAYER met3 ;
         RECT 0.000 3099.480 4.000 3100.080 ;
     END
-  END oe_x0y8_0
-  PIN oe_x0y8_1
+  END oeb_x0y8_0
+  PIN oeb_x0y8_1
     DIRECTION OUTPUT TRISTATE ;
     USE SIGNAL ;
     PORT
       LAYER met3 ;
         RECT 0.000 3166.120 4.000 3166.720 ;
     END
-  END oe_x0y8_1
-  PIN oe_x1y9_0
+  END oeb_x0y8_1
+  PIN oeb_x1y9_0
     DIRECTION OUTPUT TRISTATE ;
     USE SIGNAL ;
     PORT
       LAYER met2 ;
         RECT 1760.050 3196.000 1760.330 3200.000 ;
     END
-  END oe_x1y9_0
-  PIN oe_x1y9_1
+  END oeb_x1y9_0
+  PIN oeb_x1y9_1
     DIRECTION OUTPUT TRISTATE ;
     USE SIGNAL ;
     PORT
       LAYER met2 ;
         RECT 1813.870 3196.000 1814.150 3200.000 ;
     END
-  END oe_x1y9_1
-  PIN oe_x2y9_0
+  END oeb_x1y9_1
+  PIN oeb_x2y9_0
     DIRECTION OUTPUT TRISTATE ;
     USE SIGNAL ;
     PORT
       LAYER met2 ;
         RECT 1868.150 3196.000 1868.430 3200.000 ;
     END
-  END oe_x2y9_0
-  PIN oe_x2y9_1
+  END oeb_x2y9_0
+  PIN oeb_x2y9_1
     DIRECTION OUTPUT TRISTATE ;
     USE SIGNAL ;
     PORT
       LAYER met2 ;
         RECT 1922.430 3196.000 1922.710 3200.000 ;
     END
-  END oe_x2y9_1
-  PIN oe_x3y9_0
+  END oeb_x2y9_1
+  PIN oeb_x3y9_0
     DIRECTION OUTPUT TRISTATE ;
     USE SIGNAL ;
     PORT
       LAYER met2 ;
         RECT 1976.710 3196.000 1976.990 3200.000 ;
     END
-  END oe_x3y9_0
-  PIN oe_x3y9_1
+  END oeb_x3y9_0
+  PIN oeb_x3y9_1
     DIRECTION OUTPUT TRISTATE ;
     USE SIGNAL ;
     PORT
       LAYER met2 ;
         RECT 2030.530 3196.000 2030.810 3200.000 ;
     END
-  END oe_x3y9_1
-  PIN oe_x4y9_0
+  END oeb_x3y9_1
+  PIN oeb_x4y9_0
     DIRECTION OUTPUT TRISTATE ;
     USE SIGNAL ;
     PORT
       LAYER met2 ;
         RECT 2084.810 3196.000 2085.090 3200.000 ;
     END
-  END oe_x4y9_0
-  PIN oe_x4y9_1
+  END oeb_x4y9_0
+  PIN oeb_x4y9_1
     DIRECTION OUTPUT TRISTATE ;
     USE SIGNAL ;
     PORT
       LAYER met2 ;
         RECT 2139.090 3196.000 2139.370 3200.000 ;
     END
-  END oe_x4y9_1
-  PIN oe_x5y9_0
+  END oeb_x4y9_1
+  PIN oeb_x5y9_0
     DIRECTION OUTPUT TRISTATE ;
     USE SIGNAL ;
     PORT
       LAYER met2 ;
         RECT 2193.370 3196.000 2193.650 3200.000 ;
     END
-  END oe_x5y9_0
-  PIN oe_x5y9_1
+  END oeb_x5y9_0
+  PIN oeb_x5y9_1
     DIRECTION OUTPUT TRISTATE ;
     USE SIGNAL ;
     PORT
       LAYER met2 ;
         RECT 2247.190 3196.000 2247.470 3200.000 ;
     END
-  END oe_x5y9_1
-  PIN oe_x6y9_0
+  END oeb_x5y9_1
+  PIN oeb_x6y9_0
     DIRECTION OUTPUT TRISTATE ;
     USE SIGNAL ;
     PORT
       LAYER met2 ;
         RECT 2301.470 3196.000 2301.750 3200.000 ;
     END
-  END oe_x6y9_0
-  PIN oe_x6y9_1
+  END oeb_x6y9_0
+  PIN oeb_x6y9_1
     DIRECTION OUTPUT TRISTATE ;
     USE SIGNAL ;
     PORT
       LAYER met2 ;
         RECT 2355.750 3196.000 2356.030 3200.000 ;
     END
-  END oe_x6y9_1
-  PIN oe_x7y9_0
+  END oeb_x6y9_1
+  PIN oeb_x7y9_0
     DIRECTION OUTPUT TRISTATE ;
     USE SIGNAL ;
     PORT
       LAYER met2 ;
         RECT 2410.030 3196.000 2410.310 3200.000 ;
     END
-  END oe_x7y9_0
-  PIN oe_x7y9_1
+  END oeb_x7y9_0
+  PIN oeb_x7y9_1
     DIRECTION OUTPUT TRISTATE ;
     USE SIGNAL ;
     PORT
       LAYER met2 ;
         RECT 2463.850 3196.000 2464.130 3200.000 ;
     END
-  END oe_x7y9_1
-  PIN oe_x8y9_0
+  END oeb_x7y9_1
+  PIN oeb_x8y9_0
     DIRECTION OUTPUT TRISTATE ;
     USE SIGNAL ;
     PORT
       LAYER met2 ;
         RECT 2518.130 3196.000 2518.410 3200.000 ;
     END
-  END oe_x8y9_0
-  PIN oe_x8y9_1
+  END oeb_x8y9_0
+  PIN oeb_x8y9_1
     DIRECTION OUTPUT TRISTATE ;
     USE SIGNAL ;
     PORT
       LAYER met2 ;
         RECT 2572.410 3196.000 2572.690 3200.000 ;
     END
-  END oe_x8y9_1
-  PIN oe_x9y1_0
+  END oeb_x8y9_1
+  PIN oeb_x9y1_0
     DIRECTION OUTPUT TRISTATE ;
     USE SIGNAL ;
     PORT
       LAYER met3 ;
         RECT 2596.000 2166.520 2600.000 2167.120 ;
     END
-  END oe_x9y1_0
-  PIN oe_x9y1_1
+  END oeb_x9y1_0
+  PIN oeb_x9y1_1
     DIRECTION OUTPUT TRISTATE ;
     USE SIGNAL ;
     PORT
       LAYER met3 ;
         RECT 2596.000 2233.160 2600.000 2233.760 ;
     END
-  END oe_x9y1_1
-  PIN oe_x9y2_0
+  END oeb_x9y1_1
+  PIN oeb_x9y2_0
     DIRECTION OUTPUT TRISTATE ;
     USE SIGNAL ;
     PORT
       LAYER met3 ;
         RECT 2596.000 2299.800 2600.000 2300.400 ;
     END
-  END oe_x9y2_0
-  PIN oe_x9y2_1
+  END oeb_x9y2_0
+  PIN oeb_x9y2_1
     DIRECTION OUTPUT TRISTATE ;
     USE SIGNAL ;
     PORT
       LAYER met3 ;
         RECT 2596.000 2366.440 2600.000 2367.040 ;
     END
-  END oe_x9y2_1
-  PIN oe_x9y3_0
+  END oeb_x9y2_1
+  PIN oeb_x9y3_0
     DIRECTION OUTPUT TRISTATE ;
     USE SIGNAL ;
     PORT
       LAYER met3 ;
         RECT 2596.000 2433.080 2600.000 2433.680 ;
     END
-  END oe_x9y3_0
-  PIN oe_x9y3_1
+  END oeb_x9y3_0
+  PIN oeb_x9y3_1
     DIRECTION OUTPUT TRISTATE ;
     USE SIGNAL ;
     PORT
       LAYER met3 ;
         RECT 2596.000 2499.720 2600.000 2500.320 ;
     END
-  END oe_x9y3_1
-  PIN oe_x9y4_0
+  END oeb_x9y3_1
+  PIN oeb_x9y4_0
     DIRECTION OUTPUT TRISTATE ;
     USE SIGNAL ;
     PORT
       LAYER met3 ;
         RECT 2596.000 2566.360 2600.000 2566.960 ;
     END
-  END oe_x9y4_0
-  PIN oe_x9y4_1
+  END oeb_x9y4_0
+  PIN oeb_x9y4_1
     DIRECTION OUTPUT TRISTATE ;
     USE SIGNAL ;
     PORT
       LAYER met3 ;
         RECT 2596.000 2633.000 2600.000 2633.600 ;
     END
-  END oe_x9y4_1
-  PIN oe_x9y5_0
+  END oeb_x9y4_1
+  PIN oeb_x9y5_0
     DIRECTION OUTPUT TRISTATE ;
     USE SIGNAL ;
     PORT
       LAYER met3 ;
         RECT 2596.000 2699.640 2600.000 2700.240 ;
     END
-  END oe_x9y5_0
-  PIN oe_x9y5_1
+  END oeb_x9y5_0
+  PIN oeb_x9y5_1
     DIRECTION OUTPUT TRISTATE ;
     USE SIGNAL ;
     PORT
       LAYER met3 ;
         RECT 2596.000 2766.280 2600.000 2766.880 ;
     END
-  END oe_x9y5_1
-  PIN oe_x9y6_0
+  END oeb_x9y5_1
+  PIN oeb_x9y6_0
     DIRECTION OUTPUT TRISTATE ;
     USE SIGNAL ;
     PORT
       LAYER met3 ;
         RECT 2596.000 2832.920 2600.000 2833.520 ;
     END
-  END oe_x9y6_0
-  PIN oe_x9y6_1
+  END oeb_x9y6_0
+  PIN oeb_x9y6_1
     DIRECTION OUTPUT TRISTATE ;
     USE SIGNAL ;
     PORT
       LAYER met3 ;
         RECT 2596.000 2899.560 2600.000 2900.160 ;
     END
-  END oe_x9y6_1
-  PIN oe_x9y7_0
+  END oeb_x9y6_1
+  PIN oeb_x9y7_0
     DIRECTION OUTPUT TRISTATE ;
     USE SIGNAL ;
     PORT
       LAYER met3 ;
         RECT 2596.000 2966.200 2600.000 2966.800 ;
     END
-  END oe_x9y7_0
-  PIN oe_x9y7_1
+  END oeb_x9y7_0
+  PIN oeb_x9y7_1
     DIRECTION OUTPUT TRISTATE ;
     USE SIGNAL ;
     PORT
       LAYER met3 ;
         RECT 2596.000 3032.840 2600.000 3033.440 ;
     END
-  END oe_x9y7_1
-  PIN oe_x9y8_0
+  END oeb_x9y7_1
+  PIN oeb_x9y8_0
     DIRECTION OUTPUT TRISTATE ;
     USE SIGNAL ;
     PORT
       LAYER met3 ;
         RECT 2596.000 3099.480 2600.000 3100.080 ;
     END
-  END oe_x9y8_0
-  PIN oe_x9y8_1
+  END oeb_x9y8_0
+  PIN oeb_x9y8_1
     DIRECTION OUTPUT TRISTATE ;
     USE SIGNAL ;
     PORT
       LAYER met3 ;
         RECT 2596.000 3166.120 2600.000 3166.720 ;
     END
-  END oe_x9y8_1
+  END oeb_x9y8_1
   PIN opin_x0y1_0
     DIRECTION OUTPUT TRISTATE ;
     USE SIGNAL ;
@@ -1363,7 +1363,7 @@
       LAYER li1 ;
         RECT 5.520 10.795 2594.400 3187.925 ;
       LAYER met1 ;
-        RECT 5.520 10.640 2596.630 3188.080 ;
+        RECT 5.520 10.640 2595.710 3188.080 ;
       LAYER met2 ;
         RECT 6.990 3195.720 26.490 3196.410 ;
         RECT 27.330 3195.720 80.310 3196.410 ;
@@ -1413,8 +1413,8 @@
         RECT 2410.590 3195.720 2463.570 3196.410 ;
         RECT 2464.410 3195.720 2517.850 3196.410 ;
         RECT 2518.690 3195.720 2572.130 3196.410 ;
-        RECT 2572.970 3195.720 2596.600 3196.410 ;
-        RECT 6.990 4.280 2596.600 3195.720 ;
+        RECT 2572.970 3195.720 2595.680 3196.410 ;
+        RECT 6.990 4.280 2595.680 3195.720 ;
         RECT 6.990 3.670 185.190 4.280 ;
         RECT 186.030 3.670 556.410 4.280 ;
         RECT 557.250 3.670 927.630 4.280 ;
@@ -1422,7 +1422,7 @@
         RECT 1300.150 3.670 1670.530 4.280 ;
         RECT 1671.370 3.670 2042.210 4.280 ;
         RECT 2043.050 3.670 2413.430 4.280 ;
-        RECT 2414.270 3.670 2596.600 4.280 ;
+        RECT 2414.270 3.670 2595.680 4.280 ;
       LAYER met3 ;
         RECT 4.000 3167.120 2596.000 3188.005 ;
         RECT 4.400 3165.720 2595.600 3167.120 ;
@@ -1522,39 +1522,40 @@
         RECT 4.400 32.960 2595.600 34.360 ;
         RECT 4.000 10.715 2596.000 32.960 ;
       LAYER met4 ;
-        RECT 40.775 102.855 97.440 3128.505 ;
-        RECT 99.840 102.855 174.240 3128.505 ;
-        RECT 176.640 102.855 251.040 3128.505 ;
-        RECT 253.440 102.855 327.840 3128.505 ;
-        RECT 330.240 102.855 404.640 3128.505 ;
-        RECT 407.040 102.855 481.440 3128.505 ;
-        RECT 483.840 102.855 558.240 3128.505 ;
-        RECT 560.640 102.855 635.040 3128.505 ;
-        RECT 637.440 102.855 711.840 3128.505 ;
-        RECT 714.240 102.855 788.640 3128.505 ;
-        RECT 791.040 102.855 865.440 3128.505 ;
-        RECT 867.840 102.855 942.240 3128.505 ;
-        RECT 944.640 102.855 1019.040 3128.505 ;
-        RECT 1021.440 102.855 1095.840 3128.505 ;
-        RECT 1098.240 102.855 1172.640 3128.505 ;
-        RECT 1175.040 102.855 1249.440 3128.505 ;
-        RECT 1251.840 102.855 1326.240 3128.505 ;
-        RECT 1328.640 102.855 1403.040 3128.505 ;
-        RECT 1405.440 102.855 1479.840 3128.505 ;
-        RECT 1482.240 102.855 1556.640 3128.505 ;
-        RECT 1559.040 102.855 1633.440 3128.505 ;
-        RECT 1635.840 102.855 1710.240 3128.505 ;
-        RECT 1712.640 102.855 1787.040 3128.505 ;
-        RECT 1789.440 102.855 1863.840 3128.505 ;
-        RECT 1866.240 102.855 1940.640 3128.505 ;
-        RECT 1943.040 102.855 2017.440 3128.505 ;
-        RECT 2019.840 102.855 2094.240 3128.505 ;
-        RECT 2096.640 102.855 2171.040 3128.505 ;
-        RECT 2173.440 102.855 2247.840 3128.505 ;
-        RECT 2250.240 102.855 2324.640 3128.505 ;
-        RECT 2327.040 102.855 2401.440 3128.505 ;
-        RECT 2403.840 102.855 2478.240 3128.505 ;
-        RECT 2480.640 102.855 2482.785 3128.505 ;
+        RECT 79.415 96.055 97.440 3112.185 ;
+        RECT 99.840 96.055 174.240 3112.185 ;
+        RECT 176.640 96.055 251.040 3112.185 ;
+        RECT 253.440 96.055 327.840 3112.185 ;
+        RECT 330.240 96.055 404.640 3112.185 ;
+        RECT 407.040 96.055 481.440 3112.185 ;
+        RECT 483.840 96.055 558.240 3112.185 ;
+        RECT 560.640 96.055 635.040 3112.185 ;
+        RECT 637.440 96.055 711.840 3112.185 ;
+        RECT 714.240 96.055 788.640 3112.185 ;
+        RECT 791.040 96.055 865.440 3112.185 ;
+        RECT 867.840 96.055 942.240 3112.185 ;
+        RECT 944.640 96.055 1019.040 3112.185 ;
+        RECT 1021.440 96.055 1095.840 3112.185 ;
+        RECT 1098.240 96.055 1172.640 3112.185 ;
+        RECT 1175.040 96.055 1249.440 3112.185 ;
+        RECT 1251.840 96.055 1326.240 3112.185 ;
+        RECT 1328.640 96.055 1403.040 3112.185 ;
+        RECT 1405.440 96.055 1479.840 3112.185 ;
+        RECT 1482.240 96.055 1556.640 3112.185 ;
+        RECT 1559.040 96.055 1633.440 3112.185 ;
+        RECT 1635.840 96.055 1710.240 3112.185 ;
+        RECT 1712.640 96.055 1787.040 3112.185 ;
+        RECT 1789.440 96.055 1863.840 3112.185 ;
+        RECT 1866.240 96.055 1940.640 3112.185 ;
+        RECT 1943.040 96.055 2017.440 3112.185 ;
+        RECT 2019.840 96.055 2094.240 3112.185 ;
+        RECT 2096.640 96.055 2171.040 3112.185 ;
+        RECT 2173.440 96.055 2247.840 3112.185 ;
+        RECT 2250.240 96.055 2324.640 3112.185 ;
+        RECT 2327.040 96.055 2401.440 3112.185 ;
+        RECT 2403.840 96.055 2478.240 3112.185 ;
+        RECT 2480.640 96.055 2555.040 3112.185 ;
+        RECT 2557.440 96.055 2558.225 3112.185 ;
   END
 END top
 END LIBRARY
diff --git a/lef/user_project_wrapper.lef b/lef/user_project_wrapper.lef
index ff0cdf1..024f4b6 100644
--- a/lef/user_project_wrapper.lef
+++ b/lef/user_project_wrapper.lef
@@ -7130,7 +7130,7 @@
         RECT 2.800 95.900 2917.600 97.900 ;
         RECT 2.400 85.715 2917.600 95.900 ;
       LAYER met4 ;
-        RECT 96.040 85.640 2632.040 3263.080 ;
+        RECT 96.040 85.640 2633.225 3263.080 ;
   END
 END user_project_wrapper
 END LIBRARY
diff --git a/mag/user_project_wrapper.mag b/mag/user_project_wrapper.mag
index 167fee9..c1680dd 100644
--- a/mag/user_project_wrapper.mag
+++ b/mag/user_project_wrapper.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1653014584
+timestamp 1653171570
 << metal1 >>
 rect 71774 702992 71780 703044
 rect 71832 703032 71838 703044
@@ -843,6 +843,13 @@
 rect 536892 22040 536898 22052
 rect 580534 22040 580540 22052
 rect 580592 22040 580598 22092
+rect 534810 19320 534816 19372
+rect 534868 19360 534874 19372
+rect 580166 19360 580172 19372
+rect 534868 19332 580172 19360
+rect 534868 19320 534874 19332
+rect 580166 19320 580172 19332
+rect 580224 19320 580230 19372
 rect 3418 13744 3424 13796
 rect 3476 13784 3482 13796
 rect 52086 13784 52092 13796
@@ -866,11 +873,11 @@
 rect 423548 13676 423554 13728
 rect 497734 13676 497740 13728
 rect 497792 13716 497798 13728
-rect 580258 13716 580264 13728
-rect 497792 13688 580264 13716
+rect 534810 13716 534816 13728
+rect 497792 13688 534816 13716
 rect 497792 13676 497798 13688
-rect 580258 13676 580264 13688
-rect 580316 13676 580322 13728
+rect 534810 13676 534816 13688
+rect 534868 13676 534874 13728
 rect 3602 13608 3608 13660
 rect 3660 13648 3666 13660
 rect 349154 13648 349160 13660
@@ -1133,6 +1140,8 @@
 rect 12440 22040 12492 22092
 rect 536840 22040 536892 22092
 rect 580540 22040 580592 22092
+rect 534816 19320 534868 19372
+rect 580172 19320 580224 19372
 rect 3424 13744 3476 13796
 rect 52092 13744 52144 13796
 rect 274916 13744 274968 13796
@@ -1140,7 +1149,7 @@
 rect 3516 13676 3568 13728
 rect 423496 13676 423548 13728
 rect 497740 13676 497792 13728
-rect 580264 13676 580316 13728
+rect 534816 13676 534868 13728
 rect 3608 13608 3660 13660
 rect 349160 13608 349212 13660
 rect 3700 13540 3752 13592
@@ -2231,17 +2240,22 @@
 rect 536852 22001 536880 22034
 rect 536838 21992 536894 22001
 rect 536838 21927 536894 21936
-rect 580262 19816 580318 19825
-rect 580262 19751 580318 19760
+rect 580170 19816 580226 19825
+rect 580170 19751 580226 19760
+rect 580184 19378 580212 19751
+rect 534816 19372 534868 19378
+rect 534816 19314 534868 19320
+rect 580172 19372 580224 19378
+rect 580172 19314 580224 19320
 rect 534724 13796 534776 13802
 rect 534724 13738 534776 13744
-rect 580276 13734 580304 19751
+rect 534828 13734 534856 19314
 rect 423496 13728 423548 13734
 rect 423496 13670 423548 13676
 rect 497740 13728 497792 13734
 rect 497740 13670 497792 13676
-rect 580264 13728 580316 13734
-rect 580264 13670 580316 13676
+rect 534816 13728 534868 13734
+rect 534816 13670 534868 13676
 rect 349160 13660 349212 13666
 rect 349160 13602 349212 13608
 rect 200580 13592 200632 13598
@@ -2903,7 +2917,7 @@
 rect 580538 86128 580594 86184
 rect 536838 35400 536894 35456
 rect 536838 21936 536894 21992
-rect 580262 19760 580318 19816
+rect 580170 19760 580226 19816
 << metal3 >>
 rect -960 697220 480 697460
 rect 580165 697234 580231 697237
@@ -3946,13 +3960,13 @@
 rect 534582 21934 536899 21936
 rect 534582 21692 534642 21934
 rect 536833 21931 536899 21934
-rect 580257 19818 580323 19821
+rect 580165 19818 580231 19821
 rect 583520 19818 584960 19908
-rect 580257 19816 584960 19818
-rect 580257 19760 580262 19816
-rect 580318 19760 584960 19816
-rect 580257 19758 584960 19760
-rect 580257 19755 580323 19758
+rect 580165 19816 584960 19818
+rect 580165 19760 580170 19816
+rect 580226 19760 584960 19816
+rect 580165 19758 584960 19760
+rect 580165 19755 580231 19758
 rect 583520 19668 584960 19758
 rect -960 19260 480 19500
 rect -960 6340 480 6580
diff --git a/maglef/user_project_wrapper.mag b/maglef/user_project_wrapper.mag
index 4f81eac..55ce65a 100644
--- a/maglef/user_project_wrapper.mag
+++ b/maglef/user_project_wrapper.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1653014745
+timestamp 1653171730
 << obsli1 >>
 rect 16104 17159 533880 652585
 << obsm1 >>
@@ -1159,7 +1159,7 @@
 rect 591070 -6694 591690 710630
 rect 592030 -7654 592650 711590
 << obsm4 >>
-rect 19208 17128 526408 652616
+rect 19208 17128 526645 652616
 << metal5 >>
 rect -8726 710970 592650 711590
 rect -7766 710010 591690 710630
@@ -3482,8 +3482,8 @@
 string FIXED_BBOX 0 0 584000 704000
 string LEFclass BLOCK
 string LEFview TRUE
-string GDS_END 289029062
+string GDS_END 289417552
 string GDS_FILE /home/angl/mpw6-prga/caravel/openlane/user_project_wrapper/runs/user_project_wrapper/results/finishing/user_project_wrapper.magic.gds
-string GDS_START 288312916
+string GDS_START 288700766
 << end >>
 
diff --git a/signoff/user_project_wrapper/final_summary_report.csv b/signoff/user_project_wrapper/final_summary_report.csv
index 425e398..1fbe2fa 100644
--- a/signoff/user_project_wrapper/final_summary_report.csv
+++ b/signoff/user_project_wrapper/final_summary_report.csv
@@ -1,2 +1,2 @@
 ,design,design_name,config,flow_status,total_runtime,routed_runtime,(Cell/mm^2)/Core_Util,DIEAREA_mm^2,CellPer_mm^2,OpenDP_Util,Peak_Memory_Usage_MB,cell_count,tritonRoute_violations,Short_violations,MetSpc_violations,OffGrid_violations,MinHole_violations,Other_violations,Magic_violations,antenna_violations,lvs_total_errors,cvc_total_errors,klayout_violations,wire_length,vias,wns,pl_wns,optimized_wns,fastroute_wns,spef_wns,tns,pl_tns,optimized_tns,fastroute_tns,spef_tns,HPWL,routing_layer1_pct,routing_layer2_pct,routing_layer3_pct,routing_layer4_pct,routing_layer5_pct,routing_layer6_pct,wires_count,wire_bits,public_wires_count,public_wire_bits,memories_count,memory_bits,processes_count,cells_pre_abc,AND,DFF,NAND,NOR,OR,XOR,XNOR,MUX,inputs,outputs,level,EndCaps,TapCells,Diodes,Total_Physical_Cells,suggested_clock_frequency,suggested_clock_period,CLOCK_PERIOD,SYNTH_STRATEGY,SYNTH_MAX_FANOUT,FP_CORE_UTIL,FP_ASPECT_RATIO,FP_PDN_VPITCH,FP_PDN_HPITCH,PL_TARGET_DENSITY,GLB_RT_ADJUSTMENT,STD_CELL_LIBRARY,CELL_PAD,DIODE_INSERTION_STRATEGY
-0,/home/angl/mpw6-prga/caravel/openlane/user_project_wrapper,user_project_wrapper,user_project_wrapper,flow completed,0h40m9s0ms,0h0m59s0ms,-2.0,-1,-1,-1,530.62,1,0,0,0,0,0,0,0,0,0,-1,-1,110758,389,0.0,-1,-1,0.0,0.0,0.0,-1,-1,0.0,0.0,-1,0.0,0.97,2.4,0.0,0.0,-1,35,653,35,653,0,0,0,1,0,0,0,0,0,0,0,0,-1,-1,-1,0,0,0,0,1.0,1000.0,1000,AREA 0,5,50,1,180,180,0.55,0.3,sky130_fd_sc_hd,4,0
+0,/home/angl/mpw6-prga/caravel/openlane/user_project_wrapper,user_project_wrapper,user_project_wrapper,flow completed,0h40m7s0ms,0h1m0s0ms,-2.0,-1,-1,-1,474.06,1,0,0,0,0,0,0,0,0,0,-1,-1,110758,391,0.0,-1,-1,0.0,0.0,0.0,-1,-1,0.0,0.0,-1,0.0,0.97,2.4,0.0,0.0,-1,27,645,27,645,0,0,0,1,0,0,0,0,0,0,0,0,-1,-1,-1,0,0,0,0,1.0,1000.0,1000,AREA 0,5,50,1,180,180,0.55,0.3,sky130_fd_sc_hd,4,0
diff --git a/spi/lvs/user_project_wrapper.spice b/spi/lvs/user_project_wrapper.spice
index 62ffb73..a85da93 100644
--- a/spi/lvs/user_project_wrapper.spice
+++ b/spi/lvs/user_project_wrapper.spice
@@ -8,12 +8,12 @@
 + ipin_x6y9_1 ipin_x7y9_0 ipin_x7y9_1 ipin_x8y9_0 ipin_x8y9_1 ipin_x9y1_0 ipin_x9y1_1
 + ipin_x9y2_0 ipin_x9y2_1 ipin_x9y3_0 ipin_x9y3_1 ipin_x9y4_0 ipin_x9y4_1 ipin_x9y5_0
 + ipin_x9y5_1 ipin_x9y6_0 ipin_x9y6_1 ipin_x9y7_0 ipin_x9y7_1 ipin_x9y8_0 ipin_x9y8_1
-+ oe_x0y1_0 oe_x0y1_1 oe_x0y2_0 oe_x0y2_1 oe_x0y3_0 oe_x0y3_1 oe_x0y4_0 oe_x0y4_1
-+ oe_x0y5_0 oe_x0y5_1 oe_x0y6_0 oe_x0y6_1 oe_x0y7_0 oe_x0y7_1 oe_x0y8_0 oe_x0y8_1
-+ oe_x1y9_0 oe_x1y9_1 oe_x2y9_0 oe_x2y9_1 oe_x3y9_0 oe_x3y9_1 oe_x4y9_0 oe_x4y9_1
-+ oe_x5y9_0 oe_x5y9_1 oe_x6y9_0 oe_x6y9_1 oe_x7y9_0 oe_x7y9_1 oe_x8y9_0 oe_x8y9_1
-+ oe_x9y1_0 oe_x9y1_1 oe_x9y2_0 oe_x9y2_1 oe_x9y3_0 oe_x9y3_1 oe_x9y4_0 oe_x9y4_1
-+ oe_x9y5_0 oe_x9y5_1 oe_x9y6_0 oe_x9y6_1 oe_x9y7_0 oe_x9y7_1 oe_x9y8_0 oe_x9y8_1
++ oeb_x0y1_0 oeb_x0y1_1 oeb_x0y2_0 oeb_x0y2_1 oeb_x0y3_0 oeb_x0y3_1 oeb_x0y4_0 oeb_x0y4_1
++ oeb_x0y5_0 oeb_x0y5_1 oeb_x0y6_0 oeb_x0y6_1 oeb_x0y7_0 oeb_x0y7_1 oeb_x0y8_0 oeb_x0y8_1
++ oeb_x1y9_0 oeb_x1y9_1 oeb_x2y9_0 oeb_x2y9_1 oeb_x3y9_0 oeb_x3y9_1 oeb_x4y9_0 oeb_x4y9_1
++ oeb_x5y9_0 oeb_x5y9_1 oeb_x6y9_0 oeb_x6y9_1 oeb_x7y9_0 oeb_x7y9_1 oeb_x8y9_0 oeb_x8y9_1
++ oeb_x9y1_0 oeb_x9y1_1 oeb_x9y2_0 oeb_x9y2_1 oeb_x9y3_0 oeb_x9y3_1 oeb_x9y4_0 oeb_x9y4_1
++ oeb_x9y5_0 oeb_x9y5_1 oeb_x9y6_0 oeb_x9y6_1 oeb_x9y7_0 oeb_x9y7_1 oeb_x9y8_0 oeb_x9y8_1
 + opin_x0y1_0 opin_x0y1_1 opin_x0y2_0 opin_x0y2_1 opin_x0y3_0 opin_x0y3_1 opin_x0y4_0
 + opin_x0y4_1 opin_x0y5_0 opin_x0y5_1 opin_x0y6_0 opin_x0y6_1 opin_x0y7_0 opin_x0y7_1
 + opin_x0y8_0 opin_x0y8_1 opin_x1y9_0 opin_x1y9_1 opin_x2y9_0 opin_x2y9_1 opin_x3y9_0
@@ -131,21 +131,21 @@
 + dut/ipin_x3y9_1 io_in[19] dut/ipin_x4y9_1 io_in[18] dut/ipin_x5y9_1 io_in[17] dut/ipin_x6y9_1
 + io_in[16] dut/ipin_x7y9_1 dut/ipin_x8y9_0 io_in[15] io_in[2] io_in[3] io_in[4] io_in[5]
 + io_in[6] io_in[7] io_in[8] dut/ipin_x9y4_1 io_in[9] io_in[10] io_in[11] dut/ipin_x9y6_1
-+ io_in[12] io_in[13] io_in[14] dut/ipin_x9y8_1 dut/oe_x0y1_0 io_oeb[31] io_oeb[30]
-+ dut/oe_x0y2_1 io_oeb[29] dut/oe_x0y3_1 io_oeb[28] dut/oe_x0y4_1 io_oeb[27] dut/oe_x0y5_1
-+ io_oeb[26] dut/oe_x0y6_1 io_oeb[25] dut/oe_x0y7_1 io_oeb[24] dut/oe_x0y8_1 io_oeb[23]
-+ dut/oe_x1y9_1 io_oeb[22] io_oeb[21] io_oeb[20] dut/oe_x3y9_1 io_oeb[19] dut/oe_x4y9_1
-+ io_oeb[18] dut/oe_x5y9_1 io_oeb[17] dut/oe_x6y9_1 io_oeb[16] dut/oe_x7y9_1 dut/oe_x8y9_0
++ io_in[12] io_in[13] io_in[14] dut/ipin_x9y8_1 dut/oeb_x0y1_0 io_oeb[31] io_oeb[30]
++ dut/oeb_x0y2_1 io_oeb[29] dut/oeb_x0y3_1 io_oeb[28] dut/oeb_x0y4_1 io_oeb[27] dut/oeb_x0y5_1
++ io_oeb[26] dut/oeb_x0y6_1 io_oeb[25] dut/oeb_x0y7_1 io_oeb[24] dut/oeb_x0y8_1 io_oeb[23]
++ dut/oeb_x1y9_1 io_oeb[22] io_oeb[21] io_oeb[20] dut/oeb_x3y9_1 io_oeb[19] dut/oeb_x4y9_1
++ io_oeb[18] dut/oeb_x5y9_1 io_oeb[17] dut/oeb_x6y9_1 io_oeb[16] dut/oeb_x7y9_1 dut/oeb_x8y9_0
 + io_oeb[15] io_oeb[2] io_oeb[3] io_oeb[4] io_oeb[5] io_oeb[6] io_oeb[7] io_oeb[8]
-+ dut/oe_x9y4_1 io_oeb[9] io_oeb[10] io_oeb[11] dut/oe_x9y6_1 io_oeb[12] io_oeb[13]
-+ io_oeb[14] dut/oe_x9y8_1 dut/opin_x0y1_0 io_out[31] io_out[30] dut/opin_x0y2_1 io_out[29]
-+ dut/opin_x0y3_1 io_out[28] dut/opin_x0y4_1 io_out[27] dut/opin_x0y5_1 io_out[26]
-+ dut/opin_x0y6_1 io_out[25] dut/opin_x0y7_1 io_out[24] dut/opin_x0y8_1 io_out[23]
-+ dut/opin_x1y9_1 io_out[22] io_out[21] io_out[20] dut/opin_x3y9_1 io_out[19] dut/opin_x4y9_1
-+ io_out[18] dut/opin_x5y9_1 io_out[17] dut/opin_x6y9_1 io_out[16] dut/opin_x7y9_1
-+ dut/opin_x8y9_0 io_out[15] io_out[2] io_out[3] io_out[4] io_out[5] io_out[6] io_out[7]
-+ io_out[8] dut/opin_x9y4_1 io_out[9] io_out[10] io_out[11] dut/opin_x9y6_1 io_out[12]
-+ io_out[13] io_out[14] dut/opin_x9y8_1 io_in[37] io_in[35] io_in[34] io_out[1] io_in[33]
-+ io_in[32] io_out[0] vccd1 vssd1 top
++ dut/oeb_x9y4_1 io_oeb[9] io_oeb[10] io_oeb[11] dut/oeb_x9y6_1 io_oeb[12] io_oeb[13]
++ io_oeb[14] dut/oeb_x9y8_1 dut/opin_x0y1_0 io_out[31] io_out[30] dut/opin_x0y2_1
++ io_out[29] dut/opin_x0y3_1 io_out[28] dut/opin_x0y4_1 io_out[27] dut/opin_x0y5_1
++ io_out[26] dut/opin_x0y6_1 io_out[25] dut/opin_x0y7_1 io_out[24] dut/opin_x0y8_1
++ io_out[23] dut/opin_x1y9_1 io_out[22] io_out[21] io_out[20] dut/opin_x3y9_1 io_out[19]
++ dut/opin_x4y9_1 io_out[18] dut/opin_x5y9_1 io_out[17] dut/opin_x6y9_1 io_out[16]
++ dut/opin_x7y9_1 dut/opin_x8y9_0 io_out[15] io_out[2] io_out[3] io_out[4] io_out[5]
++ io_out[6] io_out[7] io_out[8] dut/opin_x9y4_1 io_out[9] io_out[10] io_out[11] dut/opin_x9y6_1
++ io_out[12] io_out[13] io_out[14] dut/opin_x9y8_1 io_in[37] io_in[35] io_in[34] io_out[1]
++ io_in[33] io_in[32] io_out[0] vccd1 vssd1 top
 .ends
 
diff --git a/verilog/gl/top.v b/verilog/gl/top.v
index d128b5d..78ebc6c 100644
--- a/verilog/gl/top.v
+++ b/verilog/gl/top.v
Binary files differ
diff --git a/verilog/gl/user_project_wrapper.v b/verilog/gl/user_project_wrapper.v
index 057647f..6295c6e 100644
--- a/verilog/gl/user_project_wrapper.v
+++ b/verilog/gl/user_project_wrapper.v
@@ -53,10 +53,8 @@
  output [31:0] wbs_dat_o;
  input [3:0] wbs_sel_i;
 
- wire one_;
  wire zero_;
- wire prog_we_o;
- wire prog_dout;
+ wire one_;
 
  top dut (.ipin_x0y1_0(io_in[36]),
     .ipin_x0y1_1(io_in[31]),
@@ -89,36 +87,36 @@
     .ipin_x9y7_0(io_in[12]),
     .ipin_x9y7_1(io_in[13]),
     .ipin_x9y8_0(io_in[14]),
-    .oe_x0y1_1(io_oeb[31]),
-    .oe_x0y2_0(io_oeb[30]),
-    .oe_x0y3_0(io_oeb[29]),
-    .oe_x0y4_0(io_oeb[28]),
-    .oe_x0y5_0(io_oeb[27]),
-    .oe_x0y6_0(io_oeb[26]),
-    .oe_x0y7_0(io_oeb[25]),
-    .oe_x0y8_0(io_oeb[24]),
-    .oe_x1y9_0(io_oeb[23]),
-    .oe_x2y9_0(io_oeb[22]),
-    .oe_x2y9_1(io_oeb[21]),
-    .oe_x3y9_0(io_oeb[20]),
-    .oe_x4y9_0(io_oeb[19]),
-    .oe_x5y9_0(io_oeb[18]),
-    .oe_x6y9_0(io_oeb[17]),
-    .oe_x7y9_0(io_oeb[16]),
-    .oe_x8y9_1(io_oeb[15]),
-    .oe_x9y1_0(io_oeb[2]),
-    .oe_x9y1_1(io_oeb[3]),
-    .oe_x9y2_0(io_oeb[4]),
-    .oe_x9y2_1(io_oeb[5]),
-    .oe_x9y3_0(io_oeb[6]),
-    .oe_x9y3_1(io_oeb[7]),
-    .oe_x9y4_0(io_oeb[8]),
-    .oe_x9y5_0(io_oeb[9]),
-    .oe_x9y5_1(io_oeb[10]),
-    .oe_x9y6_0(io_oeb[11]),
-    .oe_x9y7_0(io_oeb[12]),
-    .oe_x9y7_1(io_oeb[13]),
-    .oe_x9y8_0(io_oeb[14]),
+    .oeb_x0y1_1(io_oeb[31]),
+    .oeb_x0y2_0(io_oeb[30]),
+    .oeb_x0y3_0(io_oeb[29]),
+    .oeb_x0y4_0(io_oeb[28]),
+    .oeb_x0y5_0(io_oeb[27]),
+    .oeb_x0y6_0(io_oeb[26]),
+    .oeb_x0y7_0(io_oeb[25]),
+    .oeb_x0y8_0(io_oeb[24]),
+    .oeb_x1y9_0(io_oeb[23]),
+    .oeb_x2y9_0(io_oeb[22]),
+    .oeb_x2y9_1(io_oeb[21]),
+    .oeb_x3y9_0(io_oeb[20]),
+    .oeb_x4y9_0(io_oeb[19]),
+    .oeb_x5y9_0(io_oeb[18]),
+    .oeb_x6y9_0(io_oeb[17]),
+    .oeb_x7y9_0(io_oeb[16]),
+    .oeb_x8y9_1(io_oeb[15]),
+    .oeb_x9y1_0(io_oeb[2]),
+    .oeb_x9y1_1(io_oeb[3]),
+    .oeb_x9y2_0(io_oeb[4]),
+    .oeb_x9y2_1(io_oeb[5]),
+    .oeb_x9y3_0(io_oeb[6]),
+    .oeb_x9y3_1(io_oeb[7]),
+    .oeb_x9y4_0(io_oeb[8]),
+    .oeb_x9y5_0(io_oeb[9]),
+    .oeb_x9y5_1(io_oeb[10]),
+    .oeb_x9y6_0(io_oeb[11]),
+    .oeb_x9y7_0(io_oeb[12]),
+    .oeb_x9y7_1(io_oeb[13]),
+    .oeb_x9y8_0(io_oeb[14]),
     .opin_x0y1_1(io_out[31]),
     .opin_x0y2_0(io_out[30]),
     .opin_x0y3_0(io_out[29]),
@@ -152,22 +150,20 @@
     .prog_clk(io_in[37]),
     .prog_din(io_in[35]),
     .prog_done(io_in[34]),
-    .prog_dout(prog_dout),
+    .prog_dout(io_out[1]),
     .prog_rst(io_in[33]),
     .prog_we(io_in[32]),
-    .prog_we_o(prog_we_o),
+    .prog_we_o(io_out[0]),
     .vccd1(vccd1),
     .vssd1(vssd1));
- assign io_oeb[0] = one_;
- assign io_oeb[1] = one_;
- assign io_oeb[32] = zero_;
- assign io_oeb[33] = zero_;
- assign io_oeb[34] = zero_;
- assign io_oeb[35] = zero_;
- assign io_oeb[36] = zero_;
- assign io_oeb[37] = zero_;
- assign io_out[0] = prog_we_o;
- assign io_out[1] = prog_dout;
+ assign io_oeb[0] = zero_;
+ assign io_oeb[1] = zero_;
+ assign io_oeb[32] = one_;
+ assign io_oeb[33] = one_;
+ assign io_oeb[34] = one_;
+ assign io_oeb[35] = one_;
+ assign io_oeb[36] = one_;
+ assign io_oeb[37] = one_;
  assign io_out[32] = zero_;
  assign io_out[33] = zero_;
  assign io_out[34] = zero_;
diff --git a/verilog/rtl/top.bb.v b/verilog/rtl/top.bb.v
index 8920b01..30992d0 100644
--- a/verilog/rtl/top.bb.v
+++ b/verilog/rtl/top.bb.v
@@ -35,148 +35,148 @@
 `endif
     input wire [0:0] ipin_x0y1_0
     , output wire [0:0] opin_x0y1_0
-    , output wire [0:0] oe_x0y1_0
+    , output wire [0:0] oeb_x0y1_0
     , input wire [0:0] ipin_x0y1_1
     , output wire [0:0] opin_x0y1_1
-    , output wire [0:0] oe_x0y1_1
+    , output wire [0:0] oeb_x0y1_1
     , input wire [0:0] ipin_x0y2_0
     , output wire [0:0] opin_x0y2_0
-    , output wire [0:0] oe_x0y2_0
+    , output wire [0:0] oeb_x0y2_0
     , input wire [0:0] ipin_x0y2_1
     , output wire [0:0] opin_x0y2_1
-    , output wire [0:0] oe_x0y2_1
+    , output wire [0:0] oeb_x0y2_1
     , input wire [0:0] ipin_x0y3_0
     , output wire [0:0] opin_x0y3_0
-    , output wire [0:0] oe_x0y3_0
+    , output wire [0:0] oeb_x0y3_0
     , input wire [0:0] ipin_x0y3_1
     , output wire [0:0] opin_x0y3_1
-    , output wire [0:0] oe_x0y3_1
+    , output wire [0:0] oeb_x0y3_1
     , input wire [0:0] ipin_x0y4_0
     , output wire [0:0] opin_x0y4_0
-    , output wire [0:0] oe_x0y4_0
+    , output wire [0:0] oeb_x0y4_0
     , input wire [0:0] ipin_x0y4_1
     , output wire [0:0] opin_x0y4_1
-    , output wire [0:0] oe_x0y4_1
+    , output wire [0:0] oeb_x0y4_1
     , input wire [0:0] ipin_x0y5_0
     , output wire [0:0] opin_x0y5_0
-    , output wire [0:0] oe_x0y5_0
+    , output wire [0:0] oeb_x0y5_0
     , input wire [0:0] ipin_x0y5_1
     , output wire [0:0] opin_x0y5_1
-    , output wire [0:0] oe_x0y5_1
+    , output wire [0:0] oeb_x0y5_1
     , input wire [0:0] ipin_x0y6_0
     , output wire [0:0] opin_x0y6_0
-    , output wire [0:0] oe_x0y6_0
+    , output wire [0:0] oeb_x0y6_0
     , input wire [0:0] ipin_x0y6_1
     , output wire [0:0] opin_x0y6_1
-    , output wire [0:0] oe_x0y6_1
+    , output wire [0:0] oeb_x0y6_1
     , input wire [0:0] ipin_x0y7_0
     , output wire [0:0] opin_x0y7_0
-    , output wire [0:0] oe_x0y7_0
+    , output wire [0:0] oeb_x0y7_0
     , input wire [0:0] ipin_x0y7_1
     , output wire [0:0] opin_x0y7_1
-    , output wire [0:0] oe_x0y7_1
+    , output wire [0:0] oeb_x0y7_1
     , input wire [0:0] ipin_x0y8_0
     , output wire [0:0] opin_x0y8_0
-    , output wire [0:0] oe_x0y8_0
+    , output wire [0:0] oeb_x0y8_0
     , input wire [0:0] ipin_x0y8_1
     , output wire [0:0] opin_x0y8_1
-    , output wire [0:0] oe_x0y8_1
+    , output wire [0:0] oeb_x0y8_1
     , input wire [0:0] ipin_x1y9_0
     , output wire [0:0] opin_x1y9_0
-    , output wire [0:0] oe_x1y9_0
+    , output wire [0:0] oeb_x1y9_0
     , input wire [0:0] ipin_x1y9_1
     , output wire [0:0] opin_x1y9_1
-    , output wire [0:0] oe_x1y9_1
+    , output wire [0:0] oeb_x1y9_1
     , input wire [0:0] ipin_x2y9_0
     , output wire [0:0] opin_x2y9_0
-    , output wire [0:0] oe_x2y9_0
+    , output wire [0:0] oeb_x2y9_0
     , input wire [0:0] ipin_x2y9_1
     , output wire [0:0] opin_x2y9_1
-    , output wire [0:0] oe_x2y9_1
+    , output wire [0:0] oeb_x2y9_1
     , input wire [0:0] ipin_x3y9_0
     , output wire [0:0] opin_x3y9_0
-    , output wire [0:0] oe_x3y9_0
+    , output wire [0:0] oeb_x3y9_0
     , input wire [0:0] ipin_x3y9_1
     , output wire [0:0] opin_x3y9_1
-    , output wire [0:0] oe_x3y9_1
+    , output wire [0:0] oeb_x3y9_1
     , input wire [0:0] ipin_x4y9_0
     , output wire [0:0] opin_x4y9_0
-    , output wire [0:0] oe_x4y9_0
+    , output wire [0:0] oeb_x4y9_0
     , input wire [0:0] ipin_x4y9_1
     , output wire [0:0] opin_x4y9_1
-    , output wire [0:0] oe_x4y9_1
+    , output wire [0:0] oeb_x4y9_1
     , input wire [0:0] ipin_x5y9_0
     , output wire [0:0] opin_x5y9_0
-    , output wire [0:0] oe_x5y9_0
+    , output wire [0:0] oeb_x5y9_0
     , input wire [0:0] ipin_x5y9_1
     , output wire [0:0] opin_x5y9_1
-    , output wire [0:0] oe_x5y9_1
+    , output wire [0:0] oeb_x5y9_1
     , input wire [0:0] ipin_x6y9_0
     , output wire [0:0] opin_x6y9_0
-    , output wire [0:0] oe_x6y9_0
+    , output wire [0:0] oeb_x6y9_0
     , input wire [0:0] ipin_x6y9_1
     , output wire [0:0] opin_x6y9_1
-    , output wire [0:0] oe_x6y9_1
+    , output wire [0:0] oeb_x6y9_1
     , input wire [0:0] ipin_x7y9_0
     , output wire [0:0] opin_x7y9_0
-    , output wire [0:0] oe_x7y9_0
+    , output wire [0:0] oeb_x7y9_0
     , input wire [0:0] ipin_x7y9_1
     , output wire [0:0] opin_x7y9_1
-    , output wire [0:0] oe_x7y9_1
+    , output wire [0:0] oeb_x7y9_1
     , input wire [0:0] ipin_x8y9_0
     , output wire [0:0] opin_x8y9_0
-    , output wire [0:0] oe_x8y9_0
+    , output wire [0:0] oeb_x8y9_0
     , input wire [0:0] ipin_x8y9_1
     , output wire [0:0] opin_x8y9_1
-    , output wire [0:0] oe_x8y9_1
+    , output wire [0:0] oeb_x8y9_1
     , input wire [0:0] ipin_x9y1_0
     , output wire [0:0] opin_x9y1_0
-    , output wire [0:0] oe_x9y1_0
+    , output wire [0:0] oeb_x9y1_0
     , input wire [0:0] ipin_x9y1_1
     , output wire [0:0] opin_x9y1_1
-    , output wire [0:0] oe_x9y1_1
+    , output wire [0:0] oeb_x9y1_1
     , input wire [0:0] ipin_x9y2_0
     , output wire [0:0] opin_x9y2_0
-    , output wire [0:0] oe_x9y2_0
+    , output wire [0:0] oeb_x9y2_0
     , input wire [0:0] ipin_x9y2_1
     , output wire [0:0] opin_x9y2_1
-    , output wire [0:0] oe_x9y2_1
+    , output wire [0:0] oeb_x9y2_1
     , input wire [0:0] ipin_x9y3_0
     , output wire [0:0] opin_x9y3_0
-    , output wire [0:0] oe_x9y3_0
+    , output wire [0:0] oeb_x9y3_0
     , input wire [0:0] ipin_x9y3_1
     , output wire [0:0] opin_x9y3_1
-    , output wire [0:0] oe_x9y3_1
+    , output wire [0:0] oeb_x9y3_1
     , input wire [0:0] ipin_x9y4_0
     , output wire [0:0] opin_x9y4_0
-    , output wire [0:0] oe_x9y4_0
+    , output wire [0:0] oeb_x9y4_0
     , input wire [0:0] ipin_x9y4_1
     , output wire [0:0] opin_x9y4_1
-    , output wire [0:0] oe_x9y4_1
+    , output wire [0:0] oeb_x9y4_1
     , input wire [0:0] ipin_x9y5_0
     , output wire [0:0] opin_x9y5_0
-    , output wire [0:0] oe_x9y5_0
+    , output wire [0:0] oeb_x9y5_0
     , input wire [0:0] ipin_x9y5_1
     , output wire [0:0] opin_x9y5_1
-    , output wire [0:0] oe_x9y5_1
+    , output wire [0:0] oeb_x9y5_1
     , input wire [0:0] ipin_x9y6_0
     , output wire [0:0] opin_x9y6_0
-    , output wire [0:0] oe_x9y6_0
+    , output wire [0:0] oeb_x9y6_0
     , input wire [0:0] ipin_x9y6_1
     , output wire [0:0] opin_x9y6_1
-    , output wire [0:0] oe_x9y6_1
+    , output wire [0:0] oeb_x9y6_1
     , input wire [0:0] ipin_x9y7_0
     , output wire [0:0] opin_x9y7_0
-    , output wire [0:0] oe_x9y7_0
+    , output wire [0:0] oeb_x9y7_0
     , input wire [0:0] ipin_x9y7_1
     , output wire [0:0] opin_x9y7_1
-    , output wire [0:0] oe_x9y7_1
+    , output wire [0:0] oeb_x9y7_1
     , input wire [0:0] ipin_x9y8_0
     , output wire [0:0] opin_x9y8_0
-    , output wire [0:0] oe_x9y8_0
+    , output wire [0:0] oeb_x9y8_0
     , input wire [0:0] ipin_x9y8_1
     , output wire [0:0] opin_x9y8_1
-    , output wire [0:0] oe_x9y8_1
+    , output wire [0:0] oeb_x9y8_1
     , input wire [0:0] prog_clk
     , input wire [0:0] prog_rst
     , input wire [0:0] prog_done